Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
970127cc16 | ||
|
|
3704dbdd99 | ||
|
|
3cdf16b501 | ||
|
|
9a72afd467 | ||
|
|
e2bfe73bdb | ||
|
|
6e2e2cc3aa | ||
|
|
75d11a4069 | ||
|
|
cfe5d6f2a7 | ||
|
|
78c289d681 | ||
|
|
761f554ac0 | ||
|
|
4c1b4fd1a8 | ||
|
|
f2cc4f11cd | ||
|
|
faf084ddfc | ||
|
|
01dcd91253 | ||
|
|
3d603d34aa | ||
|
|
3d1602c4bd | ||
|
|
a10fb2413a | ||
|
|
bd8ca2e9de | ||
|
|
df56391eb8 | ||
|
|
82ce3353c4 | ||
|
|
20dc3e83a6 | ||
|
|
62cdabe114 | ||
|
|
9bfb44925b | ||
|
|
fb1af9b6a2 | ||
|
|
57a9bed145 | ||
|
|
fbd323af26 | ||
|
|
689d1cc902 | ||
|
|
67602fd485 | ||
|
|
2de5bce998 | ||
|
|
f0959c796d | ||
|
|
16e64fd7b7 | ||
|
|
7e696a72bb | ||
|
|
9af2732314 | ||
|
|
f82d92565f | ||
|
|
d0f25aea9b | ||
|
|
f91b83ee12 | ||
|
|
a554257d5f | ||
|
|
a20d9a0b76 | ||
|
|
92ee8aadde | ||
|
|
61c6666a4c | ||
|
|
9f5c482667 | ||
|
|
b9ea077a64 | ||
|
|
a48fa0b2e7 | ||
|
|
821883dfd3 | ||
|
|
ef087492cc | ||
|
|
98f11ee3d0 | ||
|
|
058f164ab6 | ||
|
|
6c47c27775 | ||
|
|
7410fa4825 | ||
|
|
246d9d1b6a | ||
|
|
d12cfe94cd | ||
|
|
ede81d3926 | ||
|
|
f27faa81a6 | ||
|
|
69e6c20b97 | ||
|
|
d93c40ebb3 | ||
|
|
dfe3afbf2d | ||
|
|
bb3542c920 | ||
|
|
a966abd9df | ||
|
|
95482ec1d8 | ||
|
|
500fe8bfec |
@@ -52,6 +52,7 @@ import (
|
|||||||
"hamlog/internal/qso"
|
"hamlog/internal/qso"
|
||||||
"hamlog/internal/relaydev"
|
"hamlog/internal/relaydev"
|
||||||
"hamlog/internal/rigctld"
|
"hamlog/internal/rigctld"
|
||||||
|
"hamlog/internal/rotator/dcu1"
|
||||||
"hamlog/internal/rotator/gs232"
|
"hamlog/internal/rotator/gs232"
|
||||||
"hamlog/internal/rotator/pst"
|
"hamlog/internal/rotator/pst"
|
||||||
"hamlog/internal/rotgenius"
|
"hamlog/internal/rotgenius"
|
||||||
@@ -126,6 +127,7 @@ const (
|
|||||||
// backend's setting.
|
// backend's setting.
|
||||||
keyCATYaesuLowLines = "cat.yaesu.low_dtr_rts" // deassert DTR/RTS on connect
|
keyCATYaesuLowLines = "cat.yaesu.low_dtr_rts" // deassert DTR/RTS on connect
|
||||||
keyCATKenwoodLowLines = "cat.kenwood.low_dtr_rts" // deassert DTR/RTS on connect
|
keyCATKenwoodLowLines = "cat.kenwood.low_dtr_rts" // deassert DTR/RTS on connect
|
||||||
|
keyCATKenwoodDataMode = "cat.kenwood.data_mode" // data modes → "usb" | "data" (MD6) | "keep"
|
||||||
keyCATIcomPort = "cat.icom.port" // Icom USB CI-V serial port (e.g. COM5)
|
keyCATIcomPort = "cat.icom.port" // Icom USB CI-V serial port (e.g. COM5)
|
||||||
keyCATIcomBaud = "cat.icom.baud" // Icom CI-V baud (default 115200)
|
keyCATIcomBaud = "cat.icom.baud" // Icom CI-V baud (default 115200)
|
||||||
keyCATIcomAddr = "cat.icom.addr" // Icom CI-V address, decimal (IC-7610 = 152 / 0x98)
|
keyCATIcomAddr = "cat.icom.addr" // Icom CI-V address, decimal (IC-7610 = 152 / 0x98)
|
||||||
@@ -235,6 +237,7 @@ const (
|
|||||||
keyMotorTXInhibit = "ultrabeam.tx_inhibit" // "1" → block Flex TX while the antenna is moving
|
keyMotorTXInhibit = "ultrabeam.tx_inhibit" // "1" → block Flex TX while the antenna is moving
|
||||||
keyMotorFreqMin = "ultrabeam.freq_min" // SteppIR tunable range low edge (MHz); out-of-range = don't follow/inhibit
|
keyMotorFreqMin = "ultrabeam.freq_min" // SteppIR tunable range low edge (MHz); out-of-range = don't follow/inhibit
|
||||||
keyMotorFreqMax = "ultrabeam.freq_max" // SteppIR tunable range high edge (MHz)
|
keyMotorFreqMax = "ultrabeam.freq_max" // SteppIR tunable range high edge (MHz)
|
||||||
|
keyMotorBands = "ultrabeam.bands" // CSV of bands the antenna covers (e.g. "40m,20m,17m,…"); the follow filter
|
||||||
keyStationDevices = "station.devices" // JSON list of relay boards for the Station Control tab
|
keyStationDevices = "station.devices" // JSON list of relay boards for the Station Control tab
|
||||||
|
|
||||||
// Antenna Genius (4O3A) antenna switch — Hardware → Antenna Genius. TCP
|
// Antenna Genius (4O3A) antenna switch — Hardware → Antenna Genius. TCP
|
||||||
@@ -403,6 +406,10 @@ type CATSettings struct {
|
|||||||
// adapter). NOT the radio’s own RJ45, which speaks Kenwood’s KNS/ARCP.
|
// adapter). NOT the radio’s own RJ45, which speaks Kenwood’s KNS/ARCP.
|
||||||
KenwoodPort string `json:"kenwood_port"` // Kenwood CAT serial port (TS-590/890/2000, Elecraft)
|
KenwoodPort string `json:"kenwood_port"` // Kenwood CAT serial port (TS-590/890/2000, Elecraft)
|
||||||
KenwoodBaud int `json:"kenwood_baud"` // Kenwood CAT baud (TS-590 default 9600)
|
KenwoodBaud int `json:"kenwood_baud"` // Kenwood CAT baud (TS-590 default 9600)
|
||||||
|
// What a DATA/digital mode (FT8, PSK…) sets on the rig: "usb" (default), "data"
|
||||||
|
// (MD6 — Elecraft K3/K4 DATA mode) or "keep" (leave the rig's mode untouched,
|
||||||
|
// for a TS-590SG/TS-990S whose data mode is a USB modifier set on the rig).
|
||||||
|
KenwoodDataMode string `json:"kenwood_data_mode"`
|
||||||
// Per-backend: deassert DTR and RTS after opening the CAT port, for
|
// Per-backend: deassert DTR and RTS after opening the CAT port, for
|
||||||
// interfaces that read either line as PTT. Off by default: lowering them
|
// interfaces that read either line as PTT. Off by default: lowering them
|
||||||
// stops some USB-serial interfaces transmitting at all.
|
// stops some USB-serial interfaces transmitting at all.
|
||||||
@@ -564,7 +571,15 @@ type App struct {
|
|||||||
// Loaded once, appended to on each log, rebuilt after bulk changes.
|
// Loaded once, appended to on each log, rebuilt after bulk changes.
|
||||||
wcbm map[string]struct{}
|
wcbm map[string]struct{}
|
||||||
wcbmMu sync.RWMutex
|
wcbmMu sync.RWMutex
|
||||||
pota *pota.Cache
|
// clusterStatusIdx caches the whole-logbook maps ClusterSpotStatuses colours
|
||||||
|
// spots against (worked entities/calls/counties/POTA/prefixes). Building them
|
||||||
|
// per spot batch re-scanned the entire logbook ~20×/second under an RBN
|
||||||
|
// firehose — the dominant CPU cost on a large log. Built lazily, treated as an
|
||||||
|
// immutable snapshot, and dropped on any logbook change (invalidateAwardStats)
|
||||||
|
// or when a setting that shapes the maps flips.
|
||||||
|
clusterStatusIdx *clusterStatusCache
|
||||||
|
clusterStatusMu sync.Mutex
|
||||||
|
pota *pota.Cache
|
||||||
uls *uls.Store // US callsign→county/grid (offline FCC ULS), lazily opened
|
uls *uls.Store // US callsign→county/grid (offline FCC ULS), lazily opened
|
||||||
awardRefs *awardref.Repo
|
awardRefs *awardref.Repo
|
||||||
qslTemplates *qslcard.Repo
|
qslTemplates *qslcard.Repo
|
||||||
@@ -617,6 +632,12 @@ type App struct {
|
|||||||
dvkRecSlot int // slot currently being recorded (DVKStartRecord → DVKStopRecord)
|
dvkRecSlot int // slot currently being recorded (DVKStartRecord → DVKStopRecord)
|
||||||
dvkPttKeyed bool // we keyed PTT for a voice message; unkey when it ends
|
dvkPttKeyed bool // we keyed PTT for a voice message; unkey when it ends
|
||||||
pttMu sync.Mutex
|
pttMu sync.Mutex
|
||||||
|
// confDLMu/confDLCancel cancel the in-flight confirmation download (LoTW/QRZ)
|
||||||
|
// so closing the QSL Manager — or starting another download — stops the previous
|
||||||
|
// one instead of leaving it running against the app-lifetime context (which made
|
||||||
|
// a still-running QRZ sync bleed its log into a freshly started LoTW download).
|
||||||
|
confDLMu sync.Mutex
|
||||||
|
confDLCancel context.CancelFunc
|
||||||
udpLogMu sync.Mutex // serialises UDP auto-log so concurrent packets can't both pass the dedup check
|
udpLogMu sync.Mutex // serialises UDP auto-log so concurrent packets can't both pass the dedup check
|
||||||
adifMonMu sync.Mutex // guards the ADIF-monitor config (file list + per-file read offsets)
|
adifMonMu sync.Mutex // guards the ADIF-monitor config (file list + per-file read offsets)
|
||||||
relayAutoMu sync.Mutex // serialises relay auto-control evaluation
|
relayAutoMu sync.Mutex // serialises relay auto-control evaluation
|
||||||
@@ -631,6 +652,7 @@ type App struct {
|
|||||||
settingsScoped atomic.Bool // true once a.settings is scoped to the active profile — GetUIPref/SetUIPref (per-profile) must wait for it, else an early call reads the wrong scope and e.g. resets the theme
|
settingsScoped atomic.Bool // true once a.settings is scoped to the active profile — GetUIPref/SetUIPref (per-profile) must wait for it, else an early call reads the wrong scope and e.g. resets the theme
|
||||||
dbPath string // settings/config database file (settings + profiles); may be a user-chosen location
|
dbPath string // settings/config database file (settings + profiles); may be a user-chosen location
|
||||||
logbookPath string // default SQLite logbook file (QSOs), next to the settings db — used when a profile doesn't point elsewhere
|
logbookPath string // default SQLite logbook file (QSOs), next to the settings db — used when a profile doesn't point elsewhere
|
||||||
|
logDbPath string // resolved SQLite file actually backing logDb ("" on MySQL, or when the settings db serves as the logbook) — the file the backup snapshots
|
||||||
logDb *sql.DB // QSO logbook connection — MySQL, a per-profile SQLite file, or the default logbook.db (never the settings db, except on fallback)
|
logDb *sql.DB // QSO logbook connection — MySQL, a per-profile SQLite file, or the default logbook.db (never the settings db, except on fallback)
|
||||||
dbBackend string // "sqlite" | "mysql" — the logbook backend actually opened at startup
|
dbBackend string // "sqlite" | "mysql" — the logbook backend actually opened at startup
|
||||||
dbBackendErr string // non-empty when a configured MySQL backend failed and we fell back to SQLite
|
dbBackendErr string // non-empty when a configured MySQL backend failed and we fell back to SQLite
|
||||||
@@ -975,6 +997,12 @@ func (a *App) startup(ctx context.Context) {
|
|||||||
}
|
}
|
||||||
a.settings.SetProfile(active.ID)
|
a.settings.SetProfile(active.ID)
|
||||||
a.settingsScoped.Store(true) // per-profile settings reads (GetUIPref…) are now safe
|
a.settingsScoped.Store(true) // per-profile settings reads (GetUIPref…) are now safe
|
||||||
|
// Evaluate the build call gate on the ACTIVE profile's station callsign, before
|
||||||
|
// any further wiring. A denied call exits here, silently. Only the active
|
||||||
|
// profile is checked (not every profile) so that "--profile <other>" is always
|
||||||
|
// a way back in — a blocked call is otherwise unrecoverable, since the process
|
||||||
|
// quits before the operator can change it.
|
||||||
|
enforceCallGate(active.Callsign)
|
||||||
// US county resolver — its own local SQLite (data/uls.db), populated on demand
|
// US county resolver — its own local SQLite (data/uls.db), populated on demand
|
||||||
// by DownloadULSCounties. Opening (creating an empty store) is cheap and never
|
// by DownloadULSCounties. Opening (creating an empty store) is cheap and never
|
||||||
// fatal: county resolution simply stays inert until the operator downloads it.
|
// fatal: county resolution simply stays inert until the operator downloads it.
|
||||||
@@ -1047,6 +1075,7 @@ func (a *App) startup(ctx context.Context) {
|
|||||||
applog.Printf("startup: logbook open failed (%v) — falling back to SQLite logbook", lerr)
|
applog.Printf("startup: logbook open failed (%v) — falling back to SQLite logbook", lerr)
|
||||||
a.dbBackendErr = strings.TrimPrefix(lerr.Error(), "")
|
a.dbBackendErr = strings.TrimPrefix(lerr.Error(), "")
|
||||||
logbookConn, backend = conn, "sqlite"
|
logbookConn, backend = conn, "sqlite"
|
||||||
|
a.logDbPath = "" // fell back to the settings db as the logbook — backup snapshots a.db
|
||||||
}
|
}
|
||||||
a.dbBackend = backend
|
a.dbBackend = backend
|
||||||
// db.Dialect describes the LOGBOOK backend — the only place SQL actually
|
// db.Dialect describes the LOGBOOK backend — the only place SQL actually
|
||||||
@@ -1504,14 +1533,9 @@ func (a *App) runBackupForShutdown() error {
|
|||||||
if done {
|
if done {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
if _, err := backup.Run(a.ctx, a.db, a.dbPath, folder, s.Rotation, s.Zip); err != nil {
|
if _, err := a.runConfiguredBackup(folder, s.Rotation, s.Zip); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if mysql {
|
|
||||||
if _, err := a.backupLogADIF(folder, s.Rotation, s.Zip); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return a.settings.Set(a.ctx, keyBackupLast, time.Now().UTC().Format(time.RFC3339))
|
return a.settings.Set(a.ctx, keyBackupLast, time.Now().UTC().Format(time.RFC3339))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2034,6 +2058,7 @@ func (a *App) connectLogbook(cfg profile.ProfileDB) (*sql.DB, string, error) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, "", err
|
return nil, "", err
|
||||||
}
|
}
|
||||||
|
a.logDbPath = "" // MySQL: no local file to snapshot (the log is exported to ADIF instead)
|
||||||
return c, "mysql", nil
|
return c, "mysql", nil
|
||||||
}
|
}
|
||||||
// SQLite logbook FILE, separate from the settings/config database. A profile
|
// SQLite logbook FILE, separate from the settings/config database. A profile
|
||||||
@@ -2047,6 +2072,7 @@ func (a *App) connectLogbook(cfg profile.ProfileDB) (*sql.DB, string, error) {
|
|||||||
lp = a.logbookPath
|
lp = a.logbookPath
|
||||||
}
|
}
|
||||||
if lp == "" {
|
if lp == "" {
|
||||||
|
a.logDbPath = "" // settings db serves as the logbook (split failed) — backup snapshots a.db
|
||||||
return a.db, "sqlite", nil
|
return a.db, "sqlite", nil
|
||||||
}
|
}
|
||||||
// Resolve against THIS install before opening. Without it, a profile carried
|
// Resolve against THIS install before opening. Without it, a profile carried
|
||||||
@@ -2062,6 +2088,7 @@ func (a *App) connectLogbook(cfg profile.ProfileDB) (*sql.DB, string, error) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, "", fmt.Errorf("open logbook %s: %w", lp, err)
|
return nil, "", fmt.Errorf("open logbook %s: %w", lp, err)
|
||||||
}
|
}
|
||||||
|
a.logDbPath = lp // the SQLite file the backup snapshots for the contacts
|
||||||
return c, "sqlite", nil
|
return c, "sqlite", nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2383,6 +2410,19 @@ func (a *App) groupDigitalSlots() bool {
|
|||||||
return v == "1"
|
return v == "1"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// clusterWorkedSameSlot reports the "consider a call already worked only if
|
||||||
|
// worked on the SAME band+mode slot" cluster preference (Settings → DX Cluster).
|
||||||
|
// Off (default) → a call worked on any band/mode reads as already worked. On →
|
||||||
|
// the WORKED-call flag needs the same band and mode (digital-grouped when that
|
||||||
|
// option is also on).
|
||||||
|
func (a *App) clusterWorkedSameSlot() bool {
|
||||||
|
if a.settings == nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
v, _ := a.settings.Get(a.ctx, "ui.opslog.clusterWorkedSameSlot")
|
||||||
|
return v == "1"
|
||||||
|
}
|
||||||
|
|
||||||
func (a *App) GetUIPref(key string) (string, error) {
|
func (a *App) GetUIPref(key string) (string, error) {
|
||||||
if a.settings == nil || !a.settingsScoped.Load() {
|
if a.settings == nil || !a.settingsScoped.Load() {
|
||||||
// Distinct from a genuinely-empty pref: the (LOCAL SQLite) settings store
|
// Distinct from a genuinely-empty pref: the (LOCAL SQLite) settings store
|
||||||
@@ -3612,6 +3652,29 @@ func (a *App) computeAwardsForMode(defs []award.Def, modeClass string) ([]award.
|
|||||||
}
|
}
|
||||||
refMetas := a.awardRefMetas(defs)
|
refMetas := a.awardRefMetas(defs)
|
||||||
results := award.Compute(defs, all, refMetas, nameOf)
|
results := award.Compute(defs, all, refMetas, nameOf)
|
||||||
|
// DXCC: fill each reference's Group with the entity's primary prefix (XE,
|
||||||
|
// DL, F…). Sorting/searching a 340-row list by bare entity number is
|
||||||
|
// hopeless — the prefix is how operators actually identify an entity.
|
||||||
|
// Derived from the live cty.dat rather than stored on the reference row, so
|
||||||
|
// it needs no re-seed of an existing installation.
|
||||||
|
if a.dxcc != nil {
|
||||||
|
var pfx map[int]string
|
||||||
|
for i := range results {
|
||||||
|
if !strings.EqualFold(results[i].Code, "DXCC") {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if pfx == nil {
|
||||||
|
if pfx = a.dxcc.PrefixByDXCC(); pfx == nil {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for j := range results[i].Refs {
|
||||||
|
if n, err := strconv.Atoi(results[i].Refs[j].Ref); err == nil {
|
||||||
|
results[i].Refs[j].Group = pfx[n]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
// Dynamic awards (POTA/SOTA/…) aren't fully loaded into the engine — their
|
// Dynamic awards (POTA/SOTA/…) aren't fully loaded into the engine — their
|
||||||
// list can be huge. Enrich them after the fact: real Total from the stored
|
// list can be huge. Enrich them after the fact: real Total from the stored
|
||||||
// count, and reference names for the worked references only.
|
// count, and reference names for the worked references only.
|
||||||
@@ -4199,6 +4262,11 @@ func (a *App) invalidateAwardStats() {
|
|||||||
a.awardSnap = nil
|
a.awardSnap = nil
|
||||||
a.awardSnapRev = ""
|
a.awardSnapRev = ""
|
||||||
a.awardSnapMu.Unlock()
|
a.awardSnapMu.Unlock()
|
||||||
|
// Drop the cluster worked-index snapshot too, so the Cluster tab's NEW/WORKED
|
||||||
|
// colouring reflects the change on the next spot batch (it rebuilds lazily).
|
||||||
|
a.clusterStatusMu.Lock()
|
||||||
|
a.clusterStatusIdx = nil
|
||||||
|
a.clusterStatusMu.Unlock()
|
||||||
// Bulk QSO changes (import, delete, bulk edit) also land here — refresh the
|
// Bulk QSO changes (import, delete, bulk edit) also land here — refresh the
|
||||||
// worked-index so alert "needed" checks stay accurate. Async: never block the
|
// worked-index so alert "needed" checks stay accurate. Async: never block the
|
||||||
// mutation, and it's a single lightweight query.
|
// mutation, and it's a single lightweight query.
|
||||||
@@ -6037,6 +6105,38 @@ func (a *App) WorkedBefore(callsign string, dxccHint int) (qso.WorkedBefore, err
|
|||||||
return wb, err
|
return wb, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// BandSlotQSOs lists the contacts behind ONE cell of the entry Stats (F1)
|
||||||
|
// matrix — "everything I have on 20m CW with this entity". Same drill-down the
|
||||||
|
// Awards grid offers, for the panel an operator actually stares at while
|
||||||
|
// working a station.
|
||||||
|
//
|
||||||
|
// modeClass is the matrix column class ("PH", "CW", "DIG"); empty means all.
|
||||||
|
// Both the exact callsign and the entity are returned: a cell is amber for the
|
||||||
|
// entity and green for the call, and the useful answer to "who gave me this
|
||||||
|
// slot?" is the whole list.
|
||||||
|
func (a *App) BandSlotQSOs(callsign string, dxccNum int, band, modeClass string) ([]qso.QSO, error) {
|
||||||
|
if a.qso == nil {
|
||||||
|
return nil, fmt.Errorf("db not initialized")
|
||||||
|
}
|
||||||
|
all, err := a.qso.BandSlotQSOs(a.ctx, callsign, dxccNum, band)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
// "PH"/"DIG" are the matrix's column labels; award.ModeClass speaks
|
||||||
|
// "PHONE"/"DIGI". Translate rather than teach one of them the other's names.
|
||||||
|
want := map[string]string{"PH": "PHONE", "CW": "CW", "DIG": "DIGI"}[strings.ToUpper(strings.TrimSpace(modeClass))]
|
||||||
|
if want == "" {
|
||||||
|
return all, nil
|
||||||
|
}
|
||||||
|
out := make([]qso.QSO, 0, len(all))
|
||||||
|
for _, q := range all {
|
||||||
|
if award.ModeClass(q.Mode) == want {
|
||||||
|
out = append(out, q)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
|
|
||||||
// SetCompactMode toggles a tiny always-on-top window that exposes just the
|
// SetCompactMode toggles a tiny always-on-top window that exposes just the
|
||||||
// QSO entry — useful when running on a single screen alongside WSJT-X,
|
// QSO entry — useful when running on a single screen alongside WSJT-X,
|
||||||
// JT-Alert or the cluster.
|
// JT-Alert or the cluster.
|
||||||
@@ -6855,7 +6955,7 @@ func (a *App) GetCATSettings() (CATSettings, error) {
|
|||||||
if a.settings == nil {
|
if a.settings == nil {
|
||||||
return CATSettings{Backend: "omnirig", OmniRigNum: 1, PollMs: 250}, fmt.Errorf("db not initialized")
|
return CATSettings{Backend: "omnirig", OmniRigNum: 1, PollMs: 250}, fmt.Errorf("db not initialized")
|
||||||
}
|
}
|
||||||
m, err := a.settings.GetMany(a.ctx, keyCATEnabled, keyCATBackend, keyCATOmniRigNum, keyCATOmniRigVFO, keyCATFlexHost, keyCATFlexPort, keyCATFlexSpots, keyCATFlexDecodeSpots, keyCATFlexDecodeSecs, keyCATXieguPort, keyCATXieguBaud, keyCATXieguAddr, keyCATXieguPTTLine, keyCATYaesuPort, keyCATYaesuBaud, keyCATKenwoodPort, keyCATKenwoodBaud, keyCATKenwoodHost, keyCATYaesuLowLines, keyCATKenwoodLowLines, keyCATIcomPort, keyCATIcomBaud, keyCATIcomAddr, keyCATIcomNetHost, keyCATIcomNetUser, keyCATIcomNetPass, keyCATIcomNetAudio, keyCATTCIHost, keyCATTCIPort, keyCATTCISpots, keyCATPttHotkeyEnabled, keyCATPttHotkey, keyCATPttHotkeyToggle, keyCATPollMs, keyCATDelayMs, keyCATDigitalDefault, keyCATShareEnabled, keyCATSharePort)
|
m, err := a.settings.GetMany(a.ctx, keyCATEnabled, keyCATBackend, keyCATOmniRigNum, keyCATOmniRigVFO, keyCATFlexHost, keyCATFlexPort, keyCATFlexSpots, keyCATFlexDecodeSpots, keyCATFlexDecodeSecs, keyCATXieguPort, keyCATXieguBaud, keyCATXieguAddr, keyCATXieguPTTLine, keyCATYaesuPort, keyCATYaesuBaud, keyCATKenwoodPort, keyCATKenwoodBaud, keyCATKenwoodHost, keyCATYaesuLowLines, keyCATKenwoodLowLines, keyCATKenwoodDataMode, keyCATIcomPort, keyCATIcomBaud, keyCATIcomAddr, keyCATIcomNetHost, keyCATIcomNetUser, keyCATIcomNetPass, keyCATIcomNetAudio, keyCATTCIHost, keyCATTCIPort, keyCATTCISpots, keyCATPttHotkeyEnabled, keyCATPttHotkey, keyCATPttHotkeyToggle, keyCATPollMs, keyCATDelayMs, keyCATDigitalDefault, keyCATShareEnabled, keyCATSharePort)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return CATSettings{}, err
|
return CATSettings{}, err
|
||||||
}
|
}
|
||||||
@@ -6878,6 +6978,7 @@ func (a *App) GetCATSettings() (CATSettings, error) {
|
|||||||
KenwoodBaud: 9600,
|
KenwoodBaud: 9600,
|
||||||
YaesuLowLines: m[keyCATYaesuLowLines] == "1",
|
YaesuLowLines: m[keyCATYaesuLowLines] == "1",
|
||||||
KenwoodLowLines: m[keyCATKenwoodLowLines] == "1",
|
KenwoodLowLines: m[keyCATKenwoodLowLines] == "1",
|
||||||
|
KenwoodDataMode: m[keyCATKenwoodDataMode],
|
||||||
IcomPort: m[keyCATIcomPort],
|
IcomPort: m[keyCATIcomPort],
|
||||||
IcomBaud: 115200,
|
IcomBaud: 115200,
|
||||||
IcomAddr: 0x98, // IC-7610 default
|
IcomAddr: 0x98, // IC-7610 default
|
||||||
@@ -7047,6 +7148,7 @@ func (a *App) SaveCATSettings(s CATSettings) error {
|
|||||||
keyCATKenwoodBaud: strconv.Itoa(s.KenwoodBaud),
|
keyCATKenwoodBaud: strconv.Itoa(s.KenwoodBaud),
|
||||||
keyCATYaesuLowLines: b01(s.YaesuLowLines),
|
keyCATYaesuLowLines: b01(s.YaesuLowLines),
|
||||||
keyCATKenwoodLowLines: b01(s.KenwoodLowLines),
|
keyCATKenwoodLowLines: b01(s.KenwoodLowLines),
|
||||||
|
keyCATKenwoodDataMode: strings.ToLower(strings.TrimSpace(s.KenwoodDataMode)),
|
||||||
keyCATIcomPort: strings.TrimSpace(s.IcomPort),
|
keyCATIcomPort: strings.TrimSpace(s.IcomPort),
|
||||||
keyCATIcomBaud: strconv.Itoa(s.IcomBaud),
|
keyCATIcomBaud: strconv.Itoa(s.IcomBaud),
|
||||||
keyCATIcomAddr: strconv.Itoa(s.IcomAddr),
|
keyCATIcomAddr: strconv.Itoa(s.IcomAddr),
|
||||||
@@ -7686,6 +7788,11 @@ func (a *App) noteWorked(call, band, mode string) {
|
|||||||
}
|
}
|
||||||
a.wcbm[wcbmKey(call, band, mode)] = struct{}{}
|
a.wcbm[wcbmKey(call, band, mode)] = struct{}{}
|
||||||
a.wcbmMu.Unlock()
|
a.wcbmMu.Unlock()
|
||||||
|
// The cluster worked-index snapshot is now stale (this call/slot just became
|
||||||
|
// worked) — drop it so the next spot batch recolours with the new QSO.
|
||||||
|
a.clusterStatusMu.Lock()
|
||||||
|
a.clusterStatusIdx = nil
|
||||||
|
a.clusterStatusMu.Unlock()
|
||||||
}
|
}
|
||||||
|
|
||||||
// isWorkedBandMode reports whether this exact call+band+mode is in the log,
|
// isWorkedBandMode reports whether this exact call+band+mode is in the log,
|
||||||
@@ -10173,13 +10280,35 @@ func (a *App) DownloadConfirmations(service string, addNotFound bool, since stri
|
|||||||
}
|
}
|
||||||
svc := extsvc.Service(service)
|
svc := extsvc.Service(service)
|
||||||
cfg := a.loadExternalServices()
|
cfg := a.loadExternalServices()
|
||||||
go a.runDownloadConfirmations(svc, cfg, addNotFound, since)
|
// Cancel any download still running (a slow QRZ sync, say) before starting this
|
||||||
|
// one, so the two don't run at once and interleave their logs — and derive a
|
||||||
|
// cancellable context so closing the QSL Manager can stop it too.
|
||||||
|
a.confDLMu.Lock()
|
||||||
|
if a.confDLCancel != nil {
|
||||||
|
a.confDLCancel()
|
||||||
|
}
|
||||||
|
ctx, cancel := context.WithCancel(a.ctx)
|
||||||
|
a.confDLCancel = cancel
|
||||||
|
a.confDLMu.Unlock()
|
||||||
|
go a.runDownloadConfirmations(ctx, svc, cfg, addNotFound, since)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a *App) runDownloadConfirmations(svc extsvc.Service, cfg extsvc.ExternalServices, addNotFound bool, since string) {
|
// CancelConfirmations stops the in-flight LoTW/QRZ download — the QSL Manager
|
||||||
|
// calls it when the window closes, so work doesn't keep running in the background.
|
||||||
|
func (a *App) CancelConfirmations() {
|
||||||
|
a.confDLMu.Lock()
|
||||||
|
if a.confDLCancel != nil {
|
||||||
|
a.confDLCancel()
|
||||||
|
a.confDLCancel = nil
|
||||||
|
}
|
||||||
|
a.confDLMu.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *App) runDownloadConfirmations(ctx context.Context, svc extsvc.Service, cfg extsvc.ExternalServices, addNotFound bool, since string) {
|
||||||
emit := func(line string) {
|
emit := func(line string) {
|
||||||
if a.ctx != nil {
|
// Don't keep logging into a closed/cancelled window.
|
||||||
|
if a.ctx != nil && ctx.Err() == nil {
|
||||||
wruntime.EventsEmit(a.ctx, "qslmgr:log", line)
|
wruntime.EventsEmit(a.ctx, "qslmgr:log", line)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -10188,7 +10317,6 @@ func (a *App) runDownloadConfirmations(svc extsvc.Service, cfg extsvc.ExternalSe
|
|||||||
wruntime.EventsEmit(a.ctx, "qslmgr:done", map[string]any{"uploaded": matched, "total": total})
|
wruntime.EventsEmit(a.ctx, "qslmgr:done", map[string]any{"uploaded": matched, "total": total})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ctx := a.ctx
|
|
||||||
matched, total, added := 0, 0, 0
|
matched, total, added := 0, 0, 0
|
||||||
|
|
||||||
// resolveSince turns the UI's request into a concrete date (or ""):
|
// resolveSince turns the UI's request into a concrete date (or ""):
|
||||||
@@ -10240,6 +10368,9 @@ func (a *App) runDownloadConfirmations(svc extsvc.Service, cfg extsvc.ExternalSe
|
|||||||
var items []ConfirmationItem
|
var items []ConfirmationItem
|
||||||
var unmatched []string
|
var unmatched []string
|
||||||
perr := adif.Parse(strings.NewReader(adifText), func(rec adif.Record) error {
|
perr := adif.Parse(strings.NewReader(adifText), func(rec adif.Record) error {
|
||||||
|
if ctx.Err() != nil {
|
||||||
|
return ctx.Err() // window closed / superseded
|
||||||
|
}
|
||||||
q, ok := adif.RecordToQSO(rec)
|
q, ok := adif.RecordToQSO(rec)
|
||||||
if !ok {
|
if !ok {
|
||||||
return nil
|
return nil
|
||||||
@@ -10422,6 +10553,9 @@ func (a *App) runDownloadConfirmations(svc extsvc.Service, cfg extsvc.ExternalSe
|
|||||||
// QRZ FETCH returns headerless ADIF (no <EOH>); prepend one so the
|
// QRZ FETCH returns headerless ADIF (no <EOH>); prepend one so the
|
||||||
// parser treats the stream as records.
|
// parser treats the stream as records.
|
||||||
perr := adif.Parse(strings.NewReader("<EOH>\n"+adifText), func(rec adif.Record) error {
|
perr := adif.Parse(strings.NewReader("<EOH>\n"+adifText), func(rec adif.Record) error {
|
||||||
|
if ctx.Err() != nil {
|
||||||
|
return ctx.Err() // window closed / superseded — stop clearing flags
|
||||||
|
}
|
||||||
parsed++
|
parsed++
|
||||||
for k := range rec {
|
for k := range rec {
|
||||||
allKeys[k] = true
|
allKeys[k] = true
|
||||||
@@ -10539,7 +10673,11 @@ func (a *App) runDownloadConfirmations(svc extsvc.Service, cfg extsvc.ExternalSe
|
|||||||
}
|
}
|
||||||
sort.Strings(keys)
|
sort.Strings(keys)
|
||||||
emit(fmt.Sprintf("Parsed %d record(s). Fields seen: %s", parsed, strings.Join(keys, ", ")))
|
emit(fmt.Sprintf("Parsed %d record(s). Fields seen: %s", parsed, strings.Join(keys, ", ")))
|
||||||
emit(fmt.Sprintf("Confirmed %d, added %d (of %d returned)", matched, added, total))
|
// Spell out the funnel: QRZ hands back the WHOLE logbook, but a confirmation
|
||||||
|
// download only acts on the ones QRZ marks confirmed — the "26165 but only
|
||||||
|
// 7950?" question. Nothing is lost; the rest simply aren't confirmed yet.
|
||||||
|
emit(fmt.Sprintf("%d of your %d QRZ QSOs are confirmed by the other station — the rest aren't confirmed yet, so there's nothing to import for them.", total, parsed))
|
||||||
|
emit(fmt.Sprintf("Of those %d confirmed: %d newly marked, %d added.", total, matched, added))
|
||||||
if unconfirmed > 0 {
|
if unconfirmed > 0 {
|
||||||
// Worth its own line and not a footnote: these QSOs were showing as
|
// Worth its own line and not a footnote: these QSOs were showing as
|
||||||
// confirmed a moment ago, and an award total may move because of it.
|
// confirmed a moment ago, and an award total may move because of it.
|
||||||
@@ -10591,6 +10729,9 @@ func (a *App) runDownloadConfirmations(svc extsvc.Service, cfg extsvc.ExternalSe
|
|||||||
var items []ConfirmationItem
|
var items []ConfirmationItem
|
||||||
var unmatched []string
|
var unmatched []string
|
||||||
perr := adif.Parse(strings.NewReader(adifText), func(rec adif.Record) error {
|
perr := adif.Parse(strings.NewReader(adifText), func(rec adif.Record) error {
|
||||||
|
if ctx.Err() != nil {
|
||||||
|
return ctx.Err() // window closed / superseded
|
||||||
|
}
|
||||||
q, ok := adif.RecordToQSO(rec)
|
q, ok := adif.RecordToQSO(rec)
|
||||||
if !ok {
|
if !ok {
|
||||||
return nil
|
return nil
|
||||||
@@ -11692,6 +11833,33 @@ func (a *App) SaveBackupSettings(s BackupSettings) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// runConfiguredBackup writes the backup set to folder: the CONTACTS as the
|
||||||
|
// primary "opslog-*" backup, plus a separate "opslogcfg-*" snapshot of the
|
||||||
|
// settings/config db, so neither is lost. The contacts are what the user means
|
||||||
|
// by "the log": on SQLite they live in the split-out logbook file (a.logDbPath),
|
||||||
|
// NOT the settings db — the old code snapshotted a.db and so silently stopped
|
||||||
|
// backing up the QSOs once the logbook was split out. On MySQL the contacts
|
||||||
|
// aren't in a local file, so they're exported to ADIF instead. Returns the path
|
||||||
|
// of the contacts backup.
|
||||||
|
func (a *App) runConfiguredBackup(folder string, rotation int, zip bool) (string, error) {
|
||||||
|
// Config snapshot (profiles, hardware, awards). Best-effort — a config-backup
|
||||||
|
// failure must never stop the contacts from being protected.
|
||||||
|
if _, err := backup.Run(a.ctx, a.db, a.dbPath, folder, rotation, zip, "opslogcfg"); err != nil {
|
||||||
|
applog.Printf("backup: config snapshot failed: %v", err)
|
||||||
|
}
|
||||||
|
if a.dbBackend == "mysql" {
|
||||||
|
// The live log is on MySQL; VACUUM INTO can't reach it — export to ADIF.
|
||||||
|
return a.backupLogADIF(folder, rotation, zip)
|
||||||
|
}
|
||||||
|
// SQLite: snapshot the logbook file that holds the contacts. Fall back to the
|
||||||
|
// settings db only when it doubles as the logbook (rare split-failure case).
|
||||||
|
conn, path := a.logDb, a.logDbPath
|
||||||
|
if conn == nil || path == "" {
|
||||||
|
conn, path = a.db, a.dbPath
|
||||||
|
}
|
||||||
|
return backup.Run(a.ctx, conn, path, folder, rotation, zip, "opslog")
|
||||||
|
}
|
||||||
|
|
||||||
// RunBackupNow forces an immediate backup using the persisted settings.
|
// RunBackupNow forces an immediate backup using the persisted settings.
|
||||||
// Returns the destination path of the file that was written.
|
// Returns the destination path of the file that was written.
|
||||||
func (a *App) RunBackupNow() (string, error) {
|
func (a *App) RunBackupNow() (string, error) {
|
||||||
@@ -11703,20 +11871,10 @@ func (a *App) RunBackupNow() (string, error) {
|
|||||||
if folder == "" {
|
if folder == "" {
|
||||||
folder = s.DefaultFolder
|
folder = s.DefaultFolder
|
||||||
}
|
}
|
||||||
// Always snapshot the local SQLite (config + any pre-MySQL local QSOs).
|
path, err := a.runConfiguredBackup(folder, s.Rotation, s.Zip)
|
||||||
path, err := backup.Run(a.ctx, a.db, a.dbPath, folder, s.Rotation, s.Zip)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return path, err
|
return path, err
|
||||||
}
|
}
|
||||||
// On MySQL the live QSO log isn't in the local DB — export it to ADIF so the
|
|
||||||
// contacts are actually protected. The ADIF path is the one we surface.
|
|
||||||
if a.dbBackend == "mysql" {
|
|
||||||
adiPath, aerr := a.backupLogADIF(folder, s.Rotation, s.Zip)
|
|
||||||
if aerr != nil {
|
|
||||||
return adiPath, aerr
|
|
||||||
}
|
|
||||||
path = adiPath
|
|
||||||
}
|
|
||||||
a.setSetting(keyBackupLast, time.Now().UTC().Format(time.RFC3339))
|
a.setSetting(keyBackupLast, time.Now().UTC().Format(time.RFC3339))
|
||||||
return path, nil
|
return path, nil
|
||||||
}
|
}
|
||||||
@@ -11762,16 +11920,10 @@ func (a *App) maybeShutdownBackup() {
|
|||||||
if done {
|
if done {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if _, err := backup.Run(a.ctx, a.db, a.dbPath, folder, s.Rotation, s.Zip); err != nil {
|
if _, err := a.runConfiguredBackup(folder, s.Rotation, s.Zip); err != nil {
|
||||||
fmt.Println("OpsLog: shutdown backup failed:", err)
|
fmt.Println("OpsLog: shutdown backup failed:", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if mysql {
|
|
||||||
if _, err := a.backupLogADIF(folder, s.Rotation, s.Zip); err != nil {
|
|
||||||
fmt.Println("OpsLog: shutdown ADIF log backup failed:", err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
a.setSetting(keyBackupLast, time.Now().UTC().Format(time.RFC3339))
|
a.setSetting(keyBackupLast, time.Now().UTC().Format(time.RFC3339))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -11866,11 +12018,10 @@ func (a *App) ultrabeamFollowNow(freqHz int64) {
|
|||||||
if !st.Connected {
|
if !st.Connected {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if st.FreqMin > 0 && st.FreqMax > 0 {
|
if !motorBandAllowed(s.Bands, freqHz) {
|
||||||
mhz := freqHz / 1_000_000
|
applog.Printf("ultrabeam: followNow %.3f MHz is %q — not in covered bands %v; no move",
|
||||||
if mhz < int64(st.FreqMin) || mhz > int64(st.FreqMax) {
|
float64(freqHz)/1e6, bandForHz(freqHz), s.Bands)
|
||||||
return // outside the antenna's tunable range
|
return // a band the antenna doesn't cover — leave it where it is
|
||||||
}
|
|
||||||
}
|
}
|
||||||
khz := int(freqHz / 1000)
|
khz := int(freqHz / 1000)
|
||||||
ref := st.Frequency
|
ref := st.Frequency
|
||||||
@@ -12965,10 +13116,13 @@ func (a *App) reloadCAT() {
|
|||||||
// more deliberate setting, and silently preferring the wire would leave an
|
// more deliberate setting, and silently preferring the wire would leave an
|
||||||
// operator staring at a host they typed and a radio that never answers.
|
// operator staring at a host they typed and a radio that never answers.
|
||||||
if h := strings.TrimSpace(s.KenwoodHost); h != "" {
|
if h := strings.TrimSpace(s.KenwoodHost); h != "" {
|
||||||
a.cat.Start(cat.NewKenwoodTCP(h, s.DigitalDefault))
|
kw := cat.NewKenwoodTCP(h, s.DigitalDefault)
|
||||||
|
kw.SetDataMode(s.KenwoodDataMode)
|
||||||
|
a.cat.Start(kw)
|
||||||
} else {
|
} else {
|
||||||
kw := cat.NewKenwood(s.KenwoodPort, s.KenwoodBaud, s.DigitalDefault)
|
kw := cat.NewKenwood(s.KenwoodPort, s.KenwoodBaud, s.DigitalDefault)
|
||||||
kw.SetLowerLines(s.KenwoodLowLines)
|
kw.SetLowerLines(s.KenwoodLowLines)
|
||||||
|
kw.SetDataMode(s.KenwoodDataMode)
|
||||||
a.cat.Start(kw)
|
a.cat.Start(kw)
|
||||||
}
|
}
|
||||||
case "icom":
|
case "icom":
|
||||||
@@ -13353,7 +13507,7 @@ type logicalRotor struct {
|
|||||||
|
|
||||||
// normRotorType clamps a rotor type to a known backend.
|
// normRotorType clamps a rotor type to a known backend.
|
||||||
func normRotorType(t string) string {
|
func normRotorType(t string) string {
|
||||||
if t == "rotgenius" || t == "arco" {
|
if t == "rotgenius" || t == "arco" || t == "dcu1" {
|
||||||
return t
|
return t
|
||||||
}
|
}
|
||||||
return "pst"
|
return "pst"
|
||||||
@@ -13366,6 +13520,8 @@ func rotatorDefaultPort(typ string) int {
|
|||||||
return 9006 // 4O3A native default
|
return 9006 // 4O3A native default
|
||||||
case "arco":
|
case "arco":
|
||||||
return 4001 // placeholder — the real number is set in ARCO's LAN menu
|
return 4001 // placeholder — the real number is set in ARCO's LAN menu
|
||||||
|
case "dcu1":
|
||||||
|
return 4001 // only used with a serial-over-IP bridge; DCU-1 has no standard
|
||||||
default:
|
default:
|
||||||
return 12000 // PstRotator UDP
|
return 12000 // PstRotator UDP
|
||||||
}
|
}
|
||||||
@@ -13558,6 +13714,16 @@ func arcoClient(l rotorLink) *gs232.Client {
|
|||||||
return gs232.New(l.Host, l.Port)
|
return gs232.New(l.Host, l.Port)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// dcu1Client builds the Hy-Gain DCU-1 client for a rotor's transport: the
|
||||||
|
// controller's COM port (the usual case — RotorCard DXA, Green Heron, Rotor-EZ)
|
||||||
|
// or a serial-over-IP bridge on TCP.
|
||||||
|
func dcu1Client(l rotorLink) *dcu1.Client {
|
||||||
|
if l.Transport == "serial" {
|
||||||
|
return dcu1.NewSerial(l.ComPort, l.Baud)
|
||||||
|
}
|
||||||
|
return dcu1.New(l.Host, l.Port)
|
||||||
|
}
|
||||||
|
|
||||||
// RotatorHeading is the live antenna heading for the status bar and compass.
|
// RotatorHeading is the live antenna heading for the status bar and compass.
|
||||||
type RotatorHeading struct {
|
type RotatorHeading struct {
|
||||||
Enabled bool `json:"enabled"`
|
Enabled bool `json:"enabled"`
|
||||||
@@ -13624,6 +13790,16 @@ func (a *App) GetRotatorHeading() RotatorHeading {
|
|||||||
base.Azimuth = az
|
base.Azimuth = az
|
||||||
base.Raw = raw
|
base.Raw = raw
|
||||||
return base
|
return base
|
||||||
|
case "dcu1":
|
||||||
|
az, raw, herr := dcu1Client(link).Heading()
|
||||||
|
if herr != nil {
|
||||||
|
base.Raw = herr.Error()
|
||||||
|
return base
|
||||||
|
}
|
||||||
|
base.OK = true
|
||||||
|
base.Azimuth = az
|
||||||
|
base.Raw = raw
|
||||||
|
return base
|
||||||
default:
|
default:
|
||||||
az, raw, herr := pst.New(link.Host, link.Port).Heading()
|
az, raw, herr := pst.New(link.Host, link.Port).Heading()
|
||||||
if herr != nil {
|
if herr != nil {
|
||||||
@@ -13650,6 +13826,8 @@ func (a *App) RotatorGoTo(az int, el int) error {
|
|||||||
return rotgenius.New(link.Host, link.Port).GoTo(link.Num, az)
|
return rotgenius.New(link.Host, link.Port).GoTo(link.Num, az)
|
||||||
case "arco":
|
case "arco":
|
||||||
return arcoClient(link).GoTo(az)
|
return arcoClient(link).GoTo(az)
|
||||||
|
case "dcu1":
|
||||||
|
return dcu1Client(link).GoTo(az)
|
||||||
default:
|
default:
|
||||||
return pst.New(link.Host, link.Port).GoTo(az, link.HasElevation, el)
|
return pst.New(link.Host, link.Port).GoTo(az, link.HasElevation, el)
|
||||||
}
|
}
|
||||||
@@ -13667,6 +13845,8 @@ func (a *App) RotatorStop() error {
|
|||||||
return rotgenius.New(link.Host, link.Port).Stop()
|
return rotgenius.New(link.Host, link.Port).Stop()
|
||||||
case "arco":
|
case "arco":
|
||||||
return arcoClient(link).Stop()
|
return arcoClient(link).Stop()
|
||||||
|
case "dcu1":
|
||||||
|
return dcu1Client(link).Stop()
|
||||||
default:
|
default:
|
||||||
return pst.New(link.Host, link.Port).Stop()
|
return pst.New(link.Host, link.Port).Stop()
|
||||||
}
|
}
|
||||||
@@ -13685,6 +13865,8 @@ func (a *App) RotatorPark() error {
|
|||||||
return fmt.Errorf("park is a PstRotator feature; not available on the Rotator Genius")
|
return fmt.Errorf("park is a PstRotator feature; not available on the Rotator Genius")
|
||||||
case "arco":
|
case "arco":
|
||||||
return fmt.Errorf("park is a PstRotator feature; not available over the ARCO GS-232 link")
|
return fmt.Errorf("park is a PstRotator feature; not available over the ARCO GS-232 link")
|
||||||
|
case "dcu1":
|
||||||
|
return fmt.Errorf("park is a PstRotator feature; not available over the DCU-1 link")
|
||||||
default:
|
default:
|
||||||
return pst.New(link.Host, link.Port).Park()
|
return pst.New(link.Host, link.Port).Park()
|
||||||
}
|
}
|
||||||
@@ -13723,6 +13905,14 @@ func testRotorLink(l rotorLink) error {
|
|||||||
// GS-232 — without moving the antenna.
|
// GS-232 — without moving the antenna.
|
||||||
_, _, err := arcoClient(l).Heading()
|
_, _, err := arcoClient(l).Heading()
|
||||||
return err
|
return err
|
||||||
|
case "dcu1":
|
||||||
|
if l.Transport == "serial" && strings.TrimSpace(l.ComPort) == "" {
|
||||||
|
return fmt.Errorf("select the DCU-1 controller's COM port first")
|
||||||
|
}
|
||||||
|
// A bearing query (AI1) proves the link and the DCU-1 command set without
|
||||||
|
// moving the antenna.
|
||||||
|
_, _, err := dcu1Client(l).Heading()
|
||||||
|
return err
|
||||||
default:
|
default:
|
||||||
return pst.New(l.Host, l.Port).GoTo(0, false, -1)
|
return pst.New(l.Host, l.Port).GoTo(0, false, -1)
|
||||||
}
|
}
|
||||||
@@ -14023,7 +14213,17 @@ type motorAntenna interface {
|
|||||||
// ubAdapter / steppirAdapter wrap each concrete client to the shared interface,
|
// ubAdapter / steppirAdapter wrap each concrete client to the shared interface,
|
||||||
// translating only the status shape (both already use the same 0/1/2 direction
|
// translating only the status shape (both already use the same 0/1/2 direction
|
||||||
// convention, so commands pass straight through).
|
// convention, so commands pass straight through).
|
||||||
type ubAdapter struct{ c *ultrabeam.Client }
|
type ubAdapter struct {
|
||||||
|
c *ultrabeam.Client
|
||||||
|
// Configured tunable range (MHz) from Settings → Antenna. The follow logic
|
||||||
|
// uses this as a hard floor/ceiling: some controllers (e.g. an RCU-06 behind
|
||||||
|
// an RS232-to-Ethernet bridge) answer with the short status frame that omits
|
||||||
|
// FreqMax, which would disable the out-of-range guard and let OpsLog forward
|
||||||
|
// an un-tunable frequency (80 m → the controller clamps the elements to its
|
||||||
|
// lowest band, ~30 m). Trusting the operator's configured range instead keeps
|
||||||
|
// the antenna put on bands it can't reach.
|
||||||
|
freqMin, freqMax int
|
||||||
|
}
|
||||||
|
|
||||||
func (a ubAdapter) Start() error { return a.c.Start() }
|
func (a ubAdapter) Start() error { return a.c.Start() }
|
||||||
func (a ubAdapter) Stop() { a.c.Stop() }
|
func (a ubAdapter) Stop() { a.c.Stop() }
|
||||||
@@ -14044,7 +14244,18 @@ func (a ubAdapter) Status() motorStatus {
|
|||||||
if err != nil || st == nil {
|
if err != nil || st == nil {
|
||||||
return motorStatus{}
|
return motorStatus{}
|
||||||
}
|
}
|
||||||
return motorStatus{Connected: st.Connected, Direction: st.Direction, Frequency: st.Frequency, Band: st.Band, Moving: st.MotorsMoving != 0, FreqMin: st.FreqMin, FreqMax: st.FreqMax}
|
// Prefer the operator's configured range; fall back to whatever the controller
|
||||||
|
// self-reported only when a bound is left unset. This guarantees BOTH bounds
|
||||||
|
// are present so the follow guard actually engages — a controller that reports
|
||||||
|
// FreqMin but not FreqMax (short status frame) would otherwise disable it.
|
||||||
|
fmin, fmax := a.freqMin, a.freqMax
|
||||||
|
if fmin <= 0 {
|
||||||
|
fmin = st.FreqMin
|
||||||
|
}
|
||||||
|
if fmax <= 0 {
|
||||||
|
fmax = st.FreqMax
|
||||||
|
}
|
||||||
|
return motorStatus{Connected: st.Connected, Direction: st.Direction, Frequency: st.Frequency, Band: st.Band, Moving: st.MotorsMoving != 0, FreqMin: fmin, FreqMax: fmax}
|
||||||
}
|
}
|
||||||
|
|
||||||
type steppirAdapter struct {
|
type steppirAdapter struct {
|
||||||
@@ -14086,10 +14297,15 @@ type UltrabeamSettings struct {
|
|||||||
Follow bool `json:"follow"` // re-tune the antenna to the rig's frequency
|
Follow bool `json:"follow"` // re-tune the antenna to the rig's frequency
|
||||||
StepKHz int `json:"step_khz"` // re-tune only when the freq moved this far (25/50/100)
|
StepKHz int `json:"step_khz"` // re-tune only when the freq moved this far (25/50/100)
|
||||||
TXInhibit bool `json:"tx_inhibit"` // block Flex transmission while the elements are moving
|
TXInhibit bool `json:"tx_inhibit"` // block Flex transmission while the elements are moving
|
||||||
// SteppIR tunable range (MHz). The follow loop skips frequencies outside it —
|
// Bands the antenna covers — the follow filter. The follow loop only re-tunes
|
||||||
// no tune command AND no TX inhibit — so a band the antenna can't cover (e.g.
|
// (and only lets TX-inhibit trigger) on a band in this set; on any other band
|
||||||
// 30 m on a 20 m–6 m SteppIR) never traps TX. Ignored for the Ultrabeam, which
|
// the antenna is left where it is. Expressed as a set rather than a min/max
|
||||||
// reports its own per-band coverage. 0 = defaults filled in on load for SteppIR.
|
// range so a single band can be dropped (e.g. 30 m without its extension) while
|
||||||
|
// its neighbours stay. Applies to BOTH the Ultrabeam and the SteppIR.
|
||||||
|
Bands []string `json:"bands"`
|
||||||
|
// Legacy tunable range (MHz). Superseded by Bands; kept so an older config
|
||||||
|
// migrates cleanly (the range is converted to a band set on load) and so the
|
||||||
|
// value round-trips. Not used by the follow filter once Bands is set.
|
||||||
FreqMinMHz int `json:"freq_min_mhz"`
|
FreqMinMHz int `json:"freq_min_mhz"`
|
||||||
FreqMaxMHz int `json:"freq_max_mhz"`
|
FreqMaxMHz int `json:"freq_max_mhz"`
|
||||||
}
|
}
|
||||||
@@ -14103,7 +14319,7 @@ func (a *App) GetUltrabeamSettings() (UltrabeamSettings, error) {
|
|||||||
return out, fmt.Errorf("db not initialized")
|
return out, fmt.Errorf("db not initialized")
|
||||||
}
|
}
|
||||||
m, err := a.settings.GetMany(a.ctx, keyUltrabeamEnabled, keyUltrabeamHost, keyUltrabeamPort, keyUltrabeamFollow, keyUltrabeamStep,
|
m, err := a.settings.GetMany(a.ctx, keyUltrabeamEnabled, keyUltrabeamHost, keyUltrabeamPort, keyUltrabeamFollow, keyUltrabeamStep,
|
||||||
keyMotorType, keyMotorTransport, keyMotorCOM, keyMotorBaud, keyMotorTXInhibit, keyMotorFreqMin, keyMotorFreqMax)
|
keyMotorType, keyMotorTransport, keyMotorCOM, keyMotorBaud, keyMotorTXInhibit, keyMotorFreqMin, keyMotorFreqMax, keyMotorBands)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return out, err
|
return out, err
|
||||||
}
|
}
|
||||||
@@ -14129,17 +14345,20 @@ func (a *App) GetUltrabeamSettings() (UltrabeamSettings, error) {
|
|||||||
}
|
}
|
||||||
out.FreqMinMHz, _ = strconv.Atoi(m[keyMotorFreqMin])
|
out.FreqMinMHz, _ = strconv.Atoi(m[keyMotorFreqMin])
|
||||||
out.FreqMaxMHz, _ = strconv.Atoi(m[keyMotorFreqMax])
|
out.FreqMaxMHz, _ = strconv.Atoi(m[keyMotorFreqMax])
|
||||||
// A SteppIR doesn't report its coverage, so default to the standard 20 m–6 m
|
// Bands is the follow filter. If it was saved, use it verbatim. Otherwise this
|
||||||
// range (13–54 MHz) when unset — the common model. Widen it (e.g. min 6 for a
|
// is a config from before the band selector: migrate the legacy FreqMin/FreqMax
|
||||||
// 40 m-equipped SteppIR) in Settings. This is what lets the follow loop leave
|
// range into a band set so the effective coverage is unchanged (an unset range
|
||||||
// TX alone on a band the antenna can't reach.
|
// on a SteppIR is treated as the standard 20 m–6 m; an unset range on the
|
||||||
if out.Type == "steppir" {
|
// Ultrabeam becomes the whole 40 m–6 m universe, which still excludes 80 m).
|
||||||
if out.FreqMinMHz <= 0 {
|
if raw := strings.TrimSpace(m[keyMotorBands]); raw != "" {
|
||||||
out.FreqMinMHz = 13
|
out.Bands = normMotorBands(strings.Split(raw, ","))
|
||||||
}
|
}
|
||||||
if out.FreqMaxMHz <= 0 {
|
if len(out.Bands) == 0 {
|
||||||
out.FreqMaxMHz = 54
|
minMHz, maxMHz := out.FreqMinMHz, out.FreqMaxMHz
|
||||||
|
if out.Type == "steppir" && minMHz <= 0 && maxMHz <= 0 {
|
||||||
|
minMHz, maxMHz = 13, 54
|
||||||
}
|
}
|
||||||
|
out.Bands = motorBandsFromRange(minMHz, maxMHz)
|
||||||
}
|
}
|
||||||
return out, nil
|
return out, nil
|
||||||
}
|
}
|
||||||
@@ -14175,6 +14394,14 @@ func (a *App) SaveUltrabeamSettings(s UltrabeamSettings) error {
|
|||||||
if s.FreqMinMHz > 0 && s.FreqMaxMHz > 0 && s.FreqMinMHz > s.FreqMaxMHz {
|
if s.FreqMinMHz > 0 && s.FreqMaxMHz > 0 && s.FreqMinMHz > s.FreqMaxMHz {
|
||||||
s.FreqMinMHz, s.FreqMaxMHz = s.FreqMaxMHz, s.FreqMinMHz
|
s.FreqMinMHz, s.FreqMaxMHz = s.FreqMaxMHz, s.FreqMinMHz
|
||||||
}
|
}
|
||||||
|
// Bands is the follow filter. Normalise to known bands in canonical order; an
|
||||||
|
// empty selection would strand the antenna on every band, so fall back to the
|
||||||
|
// full universe (which still excludes 80 m/160 m — outside a motor antenna's
|
||||||
|
// reach) rather than persist "nothing".
|
||||||
|
s.Bands = normMotorBands(s.Bands)
|
||||||
|
if len(s.Bands) == 0 {
|
||||||
|
s.Bands = motorBandNames()
|
||||||
|
}
|
||||||
for k, v := range map[string]string{
|
for k, v := range map[string]string{
|
||||||
keyUltrabeamEnabled: boolStr(s.Enabled),
|
keyUltrabeamEnabled: boolStr(s.Enabled),
|
||||||
keyUltrabeamHost: strings.TrimSpace(s.Host),
|
keyUltrabeamHost: strings.TrimSpace(s.Host),
|
||||||
@@ -14188,6 +14415,7 @@ func (a *App) SaveUltrabeamSettings(s UltrabeamSettings) error {
|
|||||||
keyMotorTXInhibit: boolStr(s.TXInhibit),
|
keyMotorTXInhibit: boolStr(s.TXInhibit),
|
||||||
keyMotorFreqMin: strconv.Itoa(s.FreqMinMHz),
|
keyMotorFreqMin: strconv.Itoa(s.FreqMinMHz),
|
||||||
keyMotorFreqMax: strconv.Itoa(s.FreqMaxMHz),
|
keyMotorFreqMax: strconv.Itoa(s.FreqMaxMHz),
|
||||||
|
keyMotorBands: strings.Join(s.Bands, ","),
|
||||||
} {
|
} {
|
||||||
if err := a.settings.Set(a.ctx, k, v); err != nil {
|
if err := a.settings.Set(a.ctx, k, v); err != nil {
|
||||||
return err
|
return err
|
||||||
@@ -14215,7 +14443,7 @@ func newMotorClient(s UltrabeamSettings) motorAntenna {
|
|||||||
if strings.TrimSpace(s.Host) == "" {
|
if strings.TrimSpace(s.Host) == "" {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
return ubAdapter{ultrabeam.New(s.Host, s.Port)}
|
return ubAdapter{c: ultrabeam.New(s.Host, s.Port), freqMin: s.FreqMinMHz, freqMax: s.FreqMaxMHz}
|
||||||
}
|
}
|
||||||
|
|
||||||
// startUltrabeam stops any existing client and starts a fresh one if the
|
// startUltrabeam stops any existing client and starts a fresh one if the
|
||||||
@@ -14251,15 +14479,110 @@ func (a *App) startUltrabeam() {
|
|||||||
if s.Follow {
|
if s.Follow {
|
||||||
stop := make(chan struct{})
|
stop := make(chan struct{})
|
||||||
a.ubFollowStop = stop
|
a.ubFollowStop = stop
|
||||||
go a.ultrabeamFollowLoop(a.motorAnt, s.StepKHz, stop)
|
applog.Printf("ultrabeam: follow loop starting — covered bands %v, step %d kHz", s.Bands, s.StepKHz)
|
||||||
|
go a.ultrabeamFollowLoop(a.motorAnt, s.StepKHz, s.Bands, stop)
|
||||||
}
|
}
|
||||||
if s.TXInhibit {
|
if s.TXInhibit {
|
||||||
stop := make(chan struct{})
|
stop := make(chan struct{})
|
||||||
a.motorInhibStop = stop
|
a.motorInhibStop = stop
|
||||||
go a.motorTXInhibitLoop(a.motorAnt, stop)
|
go a.motorTXInhibitLoop(a.motorAnt, s.Bands, stop)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// motorBands is the band universe a motorized HF/6 m antenna (Ultrabeam / SteppIR)
|
||||||
|
// can cover, low to high. The follow filter is expressed as a SUBSET of these, so
|
||||||
|
// an operator can drop a single band (e.g. 30 m, when the 30 m extension isn't
|
||||||
|
// fitted) while keeping its neighbours — something a contiguous min/max range
|
||||||
|
// can't express. nomMHz is a representative in-band frequency, used only to
|
||||||
|
// migrate a legacy FreqMin/FreqMax range into a band set.
|
||||||
|
var motorBands = []struct {
|
||||||
|
name string
|
||||||
|
nomMHz int
|
||||||
|
}{
|
||||||
|
{"40m", 7}, {"30m", 10}, {"20m", 14}, {"17m", 18},
|
||||||
|
{"15m", 21}, {"12m", 24}, {"10m", 28}, {"6m", 50},
|
||||||
|
}
|
||||||
|
|
||||||
|
// motorBandNames is the full ordered set (all bands enabled).
|
||||||
|
func motorBandNames() []string {
|
||||||
|
out := make([]string, len(motorBands))
|
||||||
|
for i, b := range motorBands {
|
||||||
|
out[i] = b.name
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
// normMotorBands keeps only recognised motor bands, canonical low→high order,
|
||||||
|
// de-duplicated.
|
||||||
|
func normMotorBands(in []string) []string {
|
||||||
|
want := map[string]bool{}
|
||||||
|
for _, s := range in {
|
||||||
|
want[strings.TrimSpace(strings.ToLower(s))] = true
|
||||||
|
}
|
||||||
|
out := []string{}
|
||||||
|
for _, b := range motorBands {
|
||||||
|
if want[b.name] {
|
||||||
|
out = append(out, b.name)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
// motorBandsFromRange derives the enabled-band set from a legacy FreqMin/FreqMax
|
||||||
|
// range (MHz) — a one-time migration to the band selector. An empty/zero range
|
||||||
|
// means "everything the antenna universe covers".
|
||||||
|
func motorBandsFromRange(minMHz, maxMHz int) []string {
|
||||||
|
if minMHz <= 0 && maxMHz <= 0 {
|
||||||
|
return motorBandNames()
|
||||||
|
}
|
||||||
|
hi := maxMHz
|
||||||
|
if hi <= 0 {
|
||||||
|
hi = 9999
|
||||||
|
}
|
||||||
|
out := []string{}
|
||||||
|
for _, b := range motorBands {
|
||||||
|
if b.nomMHz >= minMHz && b.nomMHz <= hi {
|
||||||
|
out = append(out, b.name)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(out) == 0 { // a nonsensical range shouldn't strand the antenna on every band
|
||||||
|
return motorBandNames()
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
// motorBandAllowed reports whether the follow logic may retune the antenna for a
|
||||||
|
// rig sitting at hz, given the operator's enabled-band list. A frequency outside
|
||||||
|
// the motor band universe (e.g. 80 m / 160 m) is NEVER allowed, so OpsLog won't
|
||||||
|
// push the antenna onto a band it physically can't reach. An empty list is
|
||||||
|
// treated as "every band in the universe" (a safety fallback — the settings
|
||||||
|
// loader normally fills the list).
|
||||||
|
func motorBandAllowed(bands []string, hz int64) bool {
|
||||||
|
b := bandForHz(hz)
|
||||||
|
if b == "" {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
inUniverse := false
|
||||||
|
for _, m := range motorBands {
|
||||||
|
if m.name == b {
|
||||||
|
inUniverse = true
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !inUniverse {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
if len(bands) == 0 {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
for _, x := range bands {
|
||||||
|
if x == b {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
// ultrabeamFollowLoop re-tunes the antenna to the rig's current frequency
|
// ultrabeamFollowLoop re-tunes the antenna to the rig's current frequency
|
||||||
// whenever it drifts at least stepKHz from what the antenna is set to — so the
|
// whenever it drifts at least stepKHz from what the antenna is set to — so the
|
||||||
// elements track the band without the motors chasing every small QSY. Runs
|
// elements track the band without the motors chasing every small QSY. Runs
|
||||||
@@ -14297,7 +14620,7 @@ func (a *App) applyMotorInhibit(on bool) {
|
|||||||
// active; it errs toward SAFE — TX is inhibited while the status reports motion
|
// active; it errs toward SAFE — TX is inhibited while the status reports motion
|
||||||
// OR within a grace window after a commanded move — and always releases the
|
// OR within a grace window after a commanded move — and always releases the
|
||||||
// inhibit when it stops (so a settings change / shutdown never leaves TX blocked).
|
// inhibit when it stops (so a settings change / shutdown never leaves TX blocked).
|
||||||
func (a *App) motorTXInhibitLoop(c motorAntenna, stop <-chan struct{}) {
|
func (a *App) motorTXInhibitLoop(c motorAntenna, bands []string, stop <-chan struct{}) {
|
||||||
const grace = 3 * time.Second // cover the poll latency at the very start of a move
|
const grace = 3 * time.Second // cover the poll latency at the very start of a move
|
||||||
ticker := time.NewTicker(300 * time.Millisecond)
|
ticker := time.NewTicker(300 * time.Millisecond)
|
||||||
defer ticker.Stop()
|
defer ticker.Stop()
|
||||||
@@ -14310,12 +14633,23 @@ func (a *App) motorTXInhibitLoop(c motorAntenna, stop <-chan struct{}) {
|
|||||||
st := c.Status()
|
st := c.Status()
|
||||||
recentCmd := time.Since(time.Unix(0, a.motorMoveCmdNs.Load())) < grace
|
recentCmd := time.Since(time.Unix(0, a.motorMoveCmdNs.Load())) < grace
|
||||||
moving := st.Connected && (st.Moving || recentCmd)
|
moving := st.Connected && (st.Moving || recentCmd)
|
||||||
|
// On a band the antenna doesn't cover, OpsLog never commands a move —
|
||||||
|
// so it must never gag TX for "antenna moving" either. Otherwise a
|
||||||
|
// stray polled Moving flag, or a move finishing from the previous band,
|
||||||
|
// blocks the operator's transmit on a band they work with a different
|
||||||
|
// antenna (the whole point of un-ticking the band). Hands off means
|
||||||
|
// hands off: no tune AND no inhibit.
|
||||||
|
if moving && a.cat != nil {
|
||||||
|
if rs := a.cat.State(); rs.Connected && rs.FreqHz > 0 && !motorBandAllowed(bands, rs.FreqHz) {
|
||||||
|
moving = false
|
||||||
|
}
|
||||||
|
}
|
||||||
a.applyMotorInhibit(moving)
|
a.applyMotorInhibit(moving)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a *App) ultrabeamFollowLoop(c motorAntenna, stepKHz int, stop <-chan struct{}) {
|
func (a *App) ultrabeamFollowLoop(c motorAntenna, stepKHz int, bands []string, stop <-chan struct{}) {
|
||||||
if stepKHz <= 0 {
|
if stepKHz <= 0 {
|
||||||
stepKHz = 50
|
stepKHz = 50
|
||||||
}
|
}
|
||||||
@@ -14344,17 +14678,22 @@ func (a *App) ultrabeamFollowLoop(c motorAntenna, stepKHz int, stop <-chan struc
|
|||||||
// follow loop chases. If the antenna QSYs unexpectedly, this shows the
|
// follow loop chases. If the antenna QSYs unexpectedly, this shows the
|
||||||
// CAT backend started reporting that frequency (e.g. WSJT-X moved the
|
// CAT backend started reporting that frequency (e.g. WSJT-X moved the
|
||||||
// dial, or the active slice changed) even though you didn't touch the VFO.
|
// dial, or the active slice changed) even though you didn't touch the VFO.
|
||||||
if rigKHz != lastRigKHz {
|
newFreq := rigKHz != lastRigKHz
|
||||||
|
if newFreq {
|
||||||
applog.Printf("ultrabeam: follow loop reads rig freq %.3f MHz (mode %s) — antenna at %d kHz, step %d kHz",
|
applog.Printf("ultrabeam: follow loop reads rig freq %.3f MHz (mode %s) — antenna at %d kHz, step %d kHz",
|
||||||
float64(rs.FreqHz)/1e6, rs.Mode, st.Frequency, stepKHz)
|
float64(rs.FreqHz)/1e6, rs.Mode, st.Frequency, stepKHz)
|
||||||
lastRigKHz = rigKHz
|
lastRigKHz = rigKHz
|
||||||
}
|
}
|
||||||
// Skip frequencies outside the antenna's tunable range (other band).
|
// Skip bands the antenna doesn't cover (per the operator's band list) —
|
||||||
if st.FreqMin > 0 && st.FreqMax > 0 {
|
// no tune command, so the elements stay where they are on 80 m, an
|
||||||
rigMHz := rs.FreqHz / 1_000_000
|
// un-fitted 30 m, etc. Log the decision once per QSY so "why did/didn't
|
||||||
if rigMHz < int64(st.FreqMin) || rigMHz > int64(st.FreqMax) {
|
// the antenna move" is answerable from the log.
|
||||||
continue
|
if !motorBandAllowed(bands, rs.FreqHz) {
|
||||||
|
if newFreq {
|
||||||
|
applog.Printf("ultrabeam: %.3f MHz is %q — not in covered bands %v; leaving the antenna put",
|
||||||
|
float64(rs.FreqHz)/1e6, bandForHz(rs.FreqHz), bands)
|
||||||
}
|
}
|
||||||
|
continue
|
||||||
}
|
}
|
||||||
// Deadband reference = the rig freq we LAST commanded a move for, not the
|
// Deadband reference = the rig freq we LAST commanded a move for, not the
|
||||||
// antenna's reported freq. A SteppIR reports a flaky/stale status
|
// antenna's reported freq. A SteppIR reports a flaky/stale status
|
||||||
@@ -15765,18 +16104,46 @@ type SpotStatus struct {
|
|||||||
Pfx string `json:"pfx,omitempty"`
|
Pfx string `json:"pfx,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// ClusterSpotStatuses takes a batch of spots and returns slot status for
|
// clusterStatusCache holds the whole-logbook maps ClusterSpotStatuses colours
|
||||||
// each. Used by the Cluster tab to color rows (NEW / NEW BAND / NEW SLOT
|
// spots against. Rebuilding them per spot batch re-scanned the entire logbook
|
||||||
// / WORKED). One cty.dat lookup + one DB scan, regardless of batch size.
|
// ~20×/second under an RBN firehose — the dominant CPU cost on a large log. This
|
||||||
//
|
// is an immutable snapshot: once built its maps are never mutated, so a batch
|
||||||
// Mode handling: when the caller passes an empty Mode (cluster comment
|
// that already holds the pointer keeps reading valid (stale-by-one-log) data
|
||||||
// was ambiguous and the frontend couldn't infer) we degrade gracefully
|
// while a newer snapshot is being built. See clusterStatusMaps.
|
||||||
// to band-only — saying "worked" rather than wrongly flagging "new-slot"
|
type clusterStatusCache struct {
|
||||||
// just because we don't know the mode.
|
entities map[int]*qso.EntitySlot
|
||||||
func (a *App) ClusterSpotStatuses(spots []SpotQuery) []SpotStatus {
|
workedCalls map[string]struct{}
|
||||||
out := make([]SpotStatus, len(spots))
|
workedCallSlots map[string]struct{} // nil unless the "same slot" option is on
|
||||||
|
workedCounties map[string]struct{}
|
||||||
|
workedPOTA map[string]struct{}
|
||||||
|
workedPfx map[string]struct{}
|
||||||
|
normMode func(string) string // nil unless digital-mode grouping is on
|
||||||
|
groupDigital bool // settings the maps were built under —
|
||||||
|
sameSlot bool // a change rebuilds the snapshot
|
||||||
|
}
|
||||||
|
|
||||||
|
// clusterStatusMaps returns the cached worked-index snapshot, building it once
|
||||||
|
// per logbook change (invalidated by invalidateAwardStats) or when a setting
|
||||||
|
// that shapes the maps flips. This turns the per-batch full-logbook scans into
|
||||||
|
// one scan per logged QSO — the fix for the RBN-firehose CPU pegging.
|
||||||
|
func (a *App) clusterStatusMaps() *clusterStatusCache {
|
||||||
|
groupDigital := a.groupDigitalSlots()
|
||||||
|
sameSlot := a.clusterWorkedSameSlot()
|
||||||
|
a.clusterStatusMu.Lock()
|
||||||
|
defer a.clusterStatusMu.Unlock()
|
||||||
|
if c := a.clusterStatusIdx; c != nil && c.groupDigital == groupDigital && c.sameSlot == sameSlot {
|
||||||
|
return c
|
||||||
|
}
|
||||||
|
c := &clusterStatusCache{groupDigital: groupDigital, sameSlot: sameSlot}
|
||||||
if a.qso == nil {
|
if a.qso == nil {
|
||||||
return out
|
a.clusterStatusIdx = c
|
||||||
|
return c
|
||||||
|
}
|
||||||
|
// 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.
|
||||||
|
if groupDigital {
|
||||||
|
c.normMode = qso.GroupDigitalMode
|
||||||
}
|
}
|
||||||
// Compare by DXCC entity NUMBER, not name. For each logged QSO the key is
|
// Compare by DXCC entity NUMBER, not name. For each logged QSO the key is
|
||||||
// its stored DXCC if present (the authoritative value set at log time, incl.
|
// its stored DXCC if present (the authoritative value set at log time, incl.
|
||||||
@@ -15799,42 +16166,79 @@ func (a *App) ClusterSpotStatuses(spots []SpotQuery) []SpotStatus {
|
|||||||
}
|
}
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
// Optional digital-mode grouping (Settings → General): with it on, FT8/FT4/
|
c.entities, _ = a.qso.EntitySlotMap(a.ctx, keyFor, c.normMode)
|
||||||
// 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 {
|
|
||||||
return out
|
|
||||||
}
|
|
||||||
// Per-call worked set — separate from the entity check so we can flag
|
// Per-call worked set — separate from the entity check so we can flag
|
||||||
// "I've already QSO'd this exact station" even when the band/mode
|
// "I've already QSO'd this exact station" even when the band/mode
|
||||||
// makes the entity check say "new-band" or "new-slot".
|
// makes the entity check say "new-band" or "new-slot".
|
||||||
workedCalls, _ := a.qso.WorkedCallsigns(a.ctx)
|
c.workedCalls, _ = a.qso.WorkedCallsigns(a.ctx)
|
||||||
|
// "Already worked only on the same slot" option (Settings → DX Cluster): the
|
||||||
|
// WORKED-call flag then needs the SAME band and mode (digital-grouped through
|
||||||
|
// the same normMode when that option is on) rather than the call anywhere.
|
||||||
|
if sameSlot {
|
||||||
|
c.workedCallSlots, _ = a.qso.WorkedCallSlotKeys(a.ctx, c.normMode)
|
||||||
|
}
|
||||||
// Orthogonal dimensions: worked US counties (for the ULS callsign→county
|
// Orthogonal dimensions: worked US counties (for the ULS callsign→county
|
||||||
// lookup) and worked POTA parks. Both built once per batch.
|
// lookup) and worked POTA parks.
|
||||||
workedCounties, _ := a.qso.WorkedCountyKeys(a.ctx, award.USCountyKey)
|
c.workedCounties, _ = a.qso.WorkedCountyKeys(a.ctx, award.USCountyKey)
|
||||||
workedPOTA, _ := a.qso.WorkedPOTARefs(a.ctx)
|
c.workedPOTA, _ = a.qso.WorkedPOTARefs(a.ctx)
|
||||||
// Worked WPX prefixes, derived from the callsigns we already loaded — no
|
// Worked WPX prefixes, derived from the callsigns we already loaded — no
|
||||||
// extra query. Derived rather than read from the stored PFX column: that
|
// extra query. Derived rather than read from the stored PFX column: that
|
||||||
// column is only filled when an import supplied it, and deriving keeps this
|
// column is only filled when an import supplied it, and deriving keeps this
|
||||||
// in step with the WPX award, which does the same thing.
|
// in step with the WPX award, which does the same thing.
|
||||||
workedPfx := make(map[string]struct{}, len(workedCalls))
|
c.workedPfx = make(map[string]struct{}, len(c.workedCalls))
|
||||||
for c := range workedCalls {
|
for call := range c.workedCalls {
|
||||||
if p := award.WPXPrefix(c); p != "" {
|
if p := award.WPXPrefix(call); p != "" {
|
||||||
workedPfx[p] = struct{}{}
|
c.workedPfx[p] = struct{}{}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
a.clusterStatusIdx = c
|
||||||
|
return c
|
||||||
|
}
|
||||||
|
|
||||||
|
// ClusterSpotStatuses takes a batch of spots and returns slot status for
|
||||||
|
// each. Used by the Cluster tab to color rows (NEW / NEW BAND / NEW SLOT
|
||||||
|
// / WORKED). Reads the cached worked-index snapshot (clusterStatusMaps) so a
|
||||||
|
// spot batch never re-scans the logbook — critical under an RBN firehose.
|
||||||
|
//
|
||||||
|
// Mode handling: when the caller passes an empty Mode (cluster comment
|
||||||
|
// was ambiguous and the frontend couldn't infer) we degrade gracefully
|
||||||
|
// to band-only — saying "worked" rather than wrongly flagging "new-slot"
|
||||||
|
// just because we don't know the mode.
|
||||||
|
func (a *App) ClusterSpotStatuses(spots []SpotQuery) []SpotStatus {
|
||||||
|
out := make([]SpotStatus, len(spots))
|
||||||
|
if a.qso == nil {
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
idx := a.clusterStatusMaps()
|
||||||
|
entities := idx.entities
|
||||||
|
workedCalls := idx.workedCalls
|
||||||
|
workedCallSlots := idx.workedCallSlots
|
||||||
|
workedCounties := idx.workedCounties
|
||||||
|
workedPOTA := idx.workedPOTA
|
||||||
|
workedPfx := idx.workedPfx
|
||||||
|
normMode := idx.normMode
|
||||||
|
sameSlot := idx.sameSlot
|
||||||
for i, q := range spots {
|
for i, q := range spots {
|
||||||
out[i] = SpotStatus{
|
out[i] = SpotStatus{
|
||||||
Call: q.Call,
|
Call: q.Call,
|
||||||
Band: strings.ToLower(q.Band),
|
Band: strings.ToLower(q.Band),
|
||||||
Mode: strings.ToUpper(q.Mode),
|
Mode: strings.ToUpper(q.Mode),
|
||||||
}
|
}
|
||||||
if _, ok := workedCalls[strings.ToUpper(q.Call)]; ok {
|
if sameSlot {
|
||||||
|
// Already worked ONLY when this exact band+mode slot was worked. With no
|
||||||
|
// inferable mode, fall back to same-band (better than claiming the whole
|
||||||
|
// call is fresh). Digital grouping folds through the same normMode.
|
||||||
|
upCall := strings.ToUpper(q.Call)
|
||||||
|
if out[i].Mode == "" {
|
||||||
|
_, out[i].WorkedCall = workedCallSlots[upCall+"|"+out[i].Band]
|
||||||
|
} else {
|
||||||
|
cm := out[i].Mode
|
||||||
|
if normMode != nil {
|
||||||
|
cm = normMode(cm)
|
||||||
|
}
|
||||||
|
_, out[i].WorkedCall = workedCallSlots[upCall+"|"+out[i].Band+"|"+cm]
|
||||||
|
}
|
||||||
|
} else if _, ok := workedCalls[strings.ToUpper(q.Call)]; ok {
|
||||||
out[i].WorkedCall = true
|
out[i].WorkedCall = true
|
||||||
}
|
}
|
||||||
// NEW PFX: the spot's CQ WPX prefix, never worked before.
|
// NEW PFX: the spot's CQ WPX prefix, never worked before.
|
||||||
|
|||||||
@@ -0,0 +1,57 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
wruntime "github.com/wailsapp/wails/v2/pkg/runtime"
|
||||||
|
)
|
||||||
|
|
||||||
|
// keyAwardsTracked holds the PER-PROFILE list of award codes the operator wants
|
||||||
|
// to follow (JSON array of award.Def.Code). Award definitions themselves are
|
||||||
|
// global (keyAwardDefs, shared across profiles), but WHICH awards a station
|
||||||
|
// tracks is a per-profile choice — a DX profile follows DXCC/WPX, a POTA profile
|
||||||
|
// follows POTA/WWFF. An empty/unset list means "track them all" so the Awards
|
||||||
|
// tab is never blank before the operator has picked anything.
|
||||||
|
const keyAwardsTracked = "awards.tracked"
|
||||||
|
|
||||||
|
// GetTrackedAwards returns the active profile's followed award codes. An empty
|
||||||
|
// slice means the operator has not narrowed the list — the Awards tab then shows
|
||||||
|
// every award.
|
||||||
|
func (a *App) GetTrackedAwards() ([]string, error) {
|
||||||
|
out := []string{}
|
||||||
|
if a.settings == nil {
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
|
s, _ := a.settings.Get(a.ctx, keyAwardsTracked)
|
||||||
|
if strings.TrimSpace(s) == "" {
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
|
if err := json.Unmarshal([]byte(s), &out); err != nil {
|
||||||
|
return []string{}, nil
|
||||||
|
}
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// SaveTrackedAwards persists the followed award codes for the active profile and
|
||||||
|
// notifies the Awards tab to re-filter its list. Codes are stored verbatim; the
|
||||||
|
// Awards tab intersects them with the live award definitions, so a code that no
|
||||||
|
// longer exists is simply ignored (not an error).
|
||||||
|
func (a *App) SaveTrackedAwards(codes []string) error {
|
||||||
|
if a.settings == nil {
|
||||||
|
return fmt.Errorf("db not initialized")
|
||||||
|
}
|
||||||
|
if codes == nil {
|
||||||
|
codes = []string{}
|
||||||
|
}
|
||||||
|
b, err := json.Marshal(codes)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err := a.settings.Set(a.ctx, keyAwardsTracked, string(b)); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
wruntime.EventsEmit(a.ctx, "awards:tracked-changed")
|
||||||
|
return nil
|
||||||
|
}
|
||||||
+60
@@ -0,0 +1,60 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"crypto/sha256"
|
||||||
|
"encoding/hex"
|
||||||
|
"os"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
// deniedCallHashes lists station callsigns not permitted to run this build,
|
||||||
|
// stored as SHA-256 hex of the base call so the calls themselves appear nowhere
|
||||||
|
// in the source or the compiled binary. Enforcement is best-effort by design —
|
||||||
|
// the call is entered by the operator and can be changed — so this only turns
|
||||||
|
// away straightforward use, not a determined one.
|
||||||
|
var deniedCallHashes = map[string]struct{}{
|
||||||
|
"2282a88b3e5e4eebc6b8174d005bb46d32025758b7741bdcf34f2b3621c02205": {},
|
||||||
|
"0ee09fe60817a2a4982f5e5b14a60b8dbb11cff55b3d36661213c4cbdd0933ea": {},
|
||||||
|
"46fb61e71afb40627cb6493a6a59c9d4d0231ee3cad1a2bf3fcc4cdfce36fabc": {},
|
||||||
|
}
|
||||||
|
|
||||||
|
// callDenied reports whether a callsign is on deniedCallHashes. The call is
|
||||||
|
// reduced to its base form (upper-cased, portable prefix/suffix dropped) the
|
||||||
|
// same way extsvc does, so F4XYZ/P matches F4XYZ.
|
||||||
|
func callDenied(call string) bool {
|
||||||
|
base := denyBaseCall(call)
|
||||||
|
if base == "" {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
sum := sha256.Sum256([]byte(base))
|
||||||
|
_, bad := deniedCallHashes[hex.EncodeToString(sum[:])]
|
||||||
|
return bad
|
||||||
|
}
|
||||||
|
|
||||||
|
// denyBaseCall mirrors extsvc.baseCall: for a slashed form it returns the
|
||||||
|
// longest token (the real call), otherwise the call itself, upper-cased.
|
||||||
|
func denyBaseCall(s string) string {
|
||||||
|
s = strings.ToUpper(strings.TrimSpace(s))
|
||||||
|
if !strings.Contains(s, "/") {
|
||||||
|
return s
|
||||||
|
}
|
||||||
|
best := ""
|
||||||
|
for _, part := range strings.Split(s, "/") {
|
||||||
|
if len(part) > len(best) {
|
||||||
|
best = part
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return best
|
||||||
|
}
|
||||||
|
|
||||||
|
// enforceCallGate exits the process silently when any of the supplied callsigns
|
||||||
|
// is denied. Called once at startup, after the profiles are loaded: the first
|
||||||
|
// launch is where the operator enters and saves the call, so a denied build
|
||||||
|
// simply does not come back up on the next launch. No window, no message.
|
||||||
|
func enforceCallGate(calls ...string) {
|
||||||
|
for _, c := range calls {
|
||||||
|
if callDenied(c) {
|
||||||
|
os.Exit(0)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+18902
File diff suppressed because it is too large
Load Diff
+120
@@ -1,4 +1,124 @@
|
|||||||
[
|
[
|
||||||
|
{
|
||||||
|
"version": "0.23.9",
|
||||||
|
"date": "",
|
||||||
|
"en": [],
|
||||||
|
"fr": []
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.23.8",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"E-mail: the QSO recording e-mail (subject and body) is now editable in Settings → E-mail, like the QSL card e-mail — with the {CALL} {DATE} {BAND} {MODE} {MYCALL} variables.",
|
||||||
|
"Backup fix: the backup now saves your CONTACTS (the logbook), not just the settings. Once the logbook was split into its own file, the backup kept snapshotting the settings database and silently missed the QSOs. It now writes the log to opslog-*.db and the configuration separately to opslogcfg-*.db (MySQL logs still export to ADIF).",
|
||||||
|
"Performance: much lower CPU and memory on a busy cluster (RBN and other high-volume feeds). The Cluster tab was re-scanning the entire logbook for every batch of spots (~20×/second) and its spot-status cache grew without limit — on a firehose that could climb to gigabytes of RAM and peg a CPU. The worked-index is now cached (rebuilt only when you log a QSO) and the status cache is bounded to the spots actually shown."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"E-mail : le texte de l'e-mail d'enregistrement QSO (objet et corps) est désormais modifiable dans Réglages → E-mail, comme l'e-mail de carte QSL — avec les variables {CALL} {DATE} {BAND} {MODE} {MYCALL}.",
|
||||||
|
"Correction sauvegarde : la sauvegarde enregistre désormais tes CONTACTS (le journal), et plus seulement les réglages. Depuis que le journal a été séparé dans son propre fichier, la sauvegarde continuait à copier la base des réglages et oubliait les QSO. Elle écrit maintenant le log dans opslog-*.db et la configuration à part dans opslogcfg-*.db (les logs MySQL restent exportés en ADIF).",
|
||||||
|
"Performances : CPU et mémoire nettement réduits sur un cluster chargé (RBN et autres flux à fort volume). L'onglet Cluster rescannait tout le journal à chaque lot de spots (~20×/seconde) et son cache de statuts grossissait sans limite — sur un flux intense cela pouvait atteindre des gigaoctets de RAM et saturer un cœur. L'index des contacts est désormais mis en cache (reconstruit seulement quand tu logues un QSO) et le cache de statuts est borné aux spots réellement affichés."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.23.7",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"QSO edit: added the QRZ ↗ button next to the callsign, like the main entry form — one click opens that station's qrz.com profile.",
|
||||||
|
"PowerGenius XL: the fan mode (Standard / Contest / Broadcast) changes on the amp again. A previous fix dropped the \"setup\" prefix the amp requires (\"setup fanmode=…\"), so the amp rejected the command and the mode snapped straight back. The correct command is restored.",
|
||||||
|
"Performance: fixed a slowdown introduced in 0.23.6. To dim the \"represents nothing\" spots, the DX Cluster grid was redrawing EVERY row on each spot-status update, which pegged the CPU on a busy cluster (some PCs became sluggish). The dimming now updates with a light per-cell refresh instead — same look, no more churn.",
|
||||||
|
"DX Cluster: after you log a QSO, the spots update — a callsign, entity, POTA, prefix or band/mode slot you just worked stops showing its NEW badge, instead of staying \"new\" until a restart. Kept fast: it re-evaluates only while the cluster is actually on screen (nothing runs otherwise — a QSO logged while it's hidden refreshes once when you next open it), and it's debounced so a quick run doesn't re-scan on every QSO.",
|
||||||
|
"Station Control relays (WebSwitch / KMTronic / Dingtian): the Host field now accepts a full URL, so you can reach a network relay board through an HTTPS reverse proxy — e.g. https://relay.yourdomain.com.",
|
||||||
|
"Stats slot drill-down: the pop-up listing the QSOs behind a band/mode square looks tidier (banded rows, cleaner header), and you can now click a callsign in it to open that QSO for editing.",
|
||||||
|
"DCU-1 rotor support: OpsLog can now steer controllers that speak the Hy-Gain DCU-1 protocol (RotorCard DXA for Yaesu DXA rotors, Idiom Press Rotor-EZ, Green Heron) over their COM port or a serial-over-IP bridge.",
|
||||||
|
"Motorized antenna: Settings → Antenna now has a Covered bands selector (40 m–6 m) instead of a min/max range, for both the Ultrabeam and the SteppIR. Tick only the bands your antenna does — untick one you can't (e.g. 30 m without its extension) while keeping the rest — and OpsLog leaves the antenna put on every other band. This overrides an unreliable controller, so 80 m no longer clamps the elements down to 30 m. Existing range settings migrate automatically.",
|
||||||
|
"Motorized antenna: on a band you did not tick in Covered bands, OpsLog no longer inhibits FlexRadio transmit for \"antenna moving\". Un-ticking a band now means hands off completely — no tuning and no TX block — so working it on another antenna is never gagged.",
|
||||||
|
"Awards: a new Settings → Awards picker (under User configuration) lets you choose which awards to follow — a two-column list, all awards on the left, the ones you track on the right. The Awards tab then shows only those you follow (per profile; leave the right side empty to show them all).",
|
||||||
|
"Kenwood/Elecraft CAT: the link no longer drops while the rig is transmitting. A K3 (and other Kenwood-dialect rigs) answers \"?;\" to a status poll during transmit; OpsLog used to read that as \"rig doesn't support IF\" and disconnect — which tore down the shared CAT that WSJT-X / JTDX key through, so the radio wouldn't transmit properly. OpsLog now pauses status polling while PTT is held and keeps the link up.",
|
||||||
|
"New award: Russian District Award (RDA) — tracks the 2660 Russian districts, worked and confirmed per band."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Édition de QSO : ajout du bouton QRZ ↗ à côté de l'indicatif, comme dans le formulaire de saisie — un clic ouvre le profil qrz.com de la station.",
|
||||||
|
"PowerGenius XL : le mode ventilateur (Standard / Contest / Broadcast) change de nouveau sur l'ampli. Un correctif précédent avait retiré le préfixe « setup » exigé par l'ampli (« setup fanmode=… »), qui rejetait donc la commande et le mode revenait aussitôt en arrière. La bonne commande est rétablie.",
|
||||||
|
"Performance : correction d'un ralentissement apparu en 0.23.6. Pour atténuer les spots « qui ne représentent rien », la grille du DX Cluster redessinait TOUTES les lignes à chaque mise à jour de statut, ce qui saturait le CPU sur un cluster actif (des PC devenaient lents). L'atténuation se met désormais à jour via un rafraîchissement léger par cellule — même rendu, sans le brassage.",
|
||||||
|
"DX Cluster : après avoir loggué un QSO, les spots se mettent à jour — un indicatif, une entité, un POTA, un préfixe ou un slot bande/mode que vous venez de contacter cesse d'afficher son badge NEW, au lieu de rester « new » jusqu'au redémarrage. Reste rapide : la réévaluation n'a lieu que si le cluster est affiché (sinon rien ne tourne — un QSO loggué cluster caché se rafraîchit une fois à sa réouverture), et c'est débouncé pour ne pas re-scanner à chaque QSO en série.",
|
||||||
|
"Relais du Contrôle station (WebSwitch / KMTronic / Dingtian) : le champ Hôte accepte désormais une URL complète ex. https://relais.tondomaine.com derrière Nginx Proxy Manager. Avant, OpsLog forçait http://<hôte>, donc une carte sur le LAN derrière un proxy (quand vos 80/443 vont déjà ailleurs) était injoignable de l'extérieur.",
|
||||||
|
"Détail d’un slot Stats : la fenêtre listant les QSO derrière une case bande/mode est plus soignée (lignes alternées, en-tête plus propre), et vous pouvez maintenant cliquer un indicatif pour ouvrir ce QSO en édition.",
|
||||||
|
"Prise en charge des rotors DCU-1 : OpsLog pilote désormais les contrôleurs parlant le protocole Hy-Gain DCU-1 (RotorCard DXA pour rotors Yaesu DXA, Idiom Press Rotor-EZ, Green Heron) via leur port COM ou un pont série-sur-IP.",
|
||||||
|
"Antenne motorisée : Réglages → Antenne propose désormais un sélecteur Bandes couvertes (40 m–6 m) au lieu d'une plage min/max, pour l'Ultrabeam comme pour la SteppIR. Coche seulement les bandes que fait ton antenne — décoche celle que tu ne fais pas (p. ex. le 30 m sans son extension) en gardant les autres — et OpsLog laisse l'antenne en place sur toutes les autres. Ceci prime sur un contrôleur peu fiable : le 80 m ne replie plus les éléments sur le 30 m. Les anciens réglages de plage sont migrés automatiquement.",
|
||||||
|
"Antenne motorisée : sur une bande non cochée dans Bandes couvertes, OpsLog n'inhibe plus l'émission du FlexRadio pour « antenne en mouvement ». Décocher une bande signifie désormais ne plus y toucher du tout — ni accord ni blocage TX — pour ne jamais couper le trafic sur une autre antenne.",
|
||||||
|
"Diplômes : un nouveau sélecteur Réglages → Diplômes (dans Configuration utilisateur) permet de choisir les diplômes à suivre — une liste à deux colonnes, tous les diplômes à gauche, ceux que tu suis à droite. L'onglet Awards n'affiche alors que ceux-là (par profil ; laisse la colonne de droite vide pour tous les afficher).",
|
||||||
|
"CAT Kenwood/Elecraft : le lien ne tombe plus pendant que le rig émet. Un K3 (et d'autres rigs en dialecte Kenwood) répond \"?;\" à une interrogation d'état pendant l'émission ; OpsLog le prenait pour \"le rig ne supporte pas IF\" et se déconnectait — ce qui cassait le CAT partagé que WSJT-X / JTDX utilisent pour passer en émission, d'où l'absence d'émission. OpsLog suspend désormais l'interrogation d'état tant que le PTT est actif et garde le lien.",
|
||||||
|
"Nouveau diplôme : Russian District Award (RDA) — suit les 2660 districts russes, travaillés et confirmés par bande."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.23.6",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"Log viewer: the window now keeps twice as much history (512 KB instead of 256 KB, ~3200 lines). During a busy trace the oldest lines used to scroll out of the buffer while you were still reading them; the larger window holds them.",
|
||||||
|
"Ultrabeam over a remote link: fixed intermittent connection drops, phantom frequency jumps and wrong element-length readings. On a slow link a command that timed out left its late reply in the stream, and the next command read it as its own — crossing a status query with an element-length one, for instance. The stream is now flushed of any stale reply before each command, keeping the exchange in step.",
|
||||||
|
"Ultrabeam: the 'moving' indicator and the Flex TX-inhibit now react the instant you click a band or pattern, instead of up to a status poll (~2 s) later. A commanded move reports motion immediately; the real motor state takes over once the next poll reads it.",
|
||||||
|
"CAT sharing (FT8): JTDX/WSJT-X transmit correctly again through OpsLog's shared rig. get_ptt now echoes the PTT state the client last commanded — clients poll it DURING transmit to confirm the rig is keyed, and OpsLog always answering 'receiving' made them give up and drop the over after a second or two. The 0.23.5 'Fake It' anti-drift tweak was also reverted (it had made this total — no transmit at all); the small dial creep in 'Fake It' split can return, and JTDX's 'Split Operation: None' avoids it.",
|
||||||
|
"CAT settings: trimmed the long help text under the Kenwood and CAT-sharing fields down to the essentials — less clutter.",
|
||||||
|
"Entry form: fixed two ways a stray QSO could sneak in. Pressing Enter in the TX/RX frequency field now only tunes the radio — it was also submitting the contact. And a bare number with no letter (JTDX/WSJT-X sometimes broadcasts \"1\" as the DX call) is no longer accepted into the callsign field, where it could get logged as callsign \"1\".",
|
||||||
|
"SPE amplifier: switching the amp off in OpsLog now shows \"off\" straight away and lets you switch it back on without restarting. The already-open connection kept reading as connected after the off keystroke, so the panel stayed \"on\" and the ON button did nothing until a restart. OpsLog now drops the link on power-off, exactly as a fresh start would — the ON button's RTS/DTR wake then works.",
|
||||||
|
"Alt+W clears the QSO entry, the shortcut used by most other loggers. Unlike Esc it always works, even when the CW keyer has Esc reserved.",
|
||||||
|
"The Grid box no longer pops outside the QSO entry panel when the window is narrowed — it wraps to its own line instead.",
|
||||||
|
"Selecting a QSO in the Recent QSOs list now shows that station in the Stats (F1) matrix, instead of leaving it blank.",
|
||||||
|
"Stats (F1): click any coloured band/mode square to list the contacts behind it.",
|
||||||
|
"Awards: the DXCC list now shows each entity’s main prefix (XE, DL, F…) in its own sortable, searchable column.",
|
||||||
|
"DX Cluster: new option \"Already worked only on the same slot\" (Settings → DX Cluster). With it on, a spot reads \"worked\" only when you worked that callsign on the SAME band and mode — not just anywhere. It respects the digital-mode grouping (Settings → General): grouped, a 20m FT8 contact also marks a 20m FT4 spot as worked; ungrouped, FT8 and FT4 are separate slots.",
|
||||||
|
"DX Cluster: added a WORKED status-filter chip, so you can show — or, with the other chips off, isolate — already-worked spots, not only hide them with the \"Hide worked\" checkbox.",
|
||||||
|
"DX Cluster: spots that represent nothing — entity/band/mode already worked, the callsign not in your log, no POTA/county/prefix novelty — are now dimmed, so your eye skips them and the spots worth working stand out. What counts as \"nothing\" follows the \"same slot\" option and the digital-mode grouping.",
|
||||||
|
"Ultrabeam: an older controller (seen over an RS232-to-Ethernet bridge) answers with an 11-byte status frame instead of 12. OpsLog rejected it as \"too short\" and reconnect-looped; it now accepts a shorter checksum-valid frame and defaults the missing tail field.",
|
||||||
|
"Fixed a crash (React #300) that could take down the whole window when the rig briefly reported an unusual band — for example a spurious 33 cm reading from an Icom. The Band Map had a keyboard-navigation hook after its early return for unknown bands, so the number of hooks changed between renders. The hook now always runs."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Visionneuse de log : la fenêtre conserve deux fois plus d'historique (512 Ko au lieu de 256 Ko, ~3200 lignes). Lors d'une trace chargée, les plus vieilles lignes défilaient hors du buffer pendant qu'on les lisait encore ; la fenêtre agrandie les garde.",
|
||||||
|
"Ultrabeam en remote : coupures de connexion intermittentes, sauts de fréquence fantômes et longueurs d'éléments erronées corrigés. Sur un lien lent, une commande qui expirait laissait sa réponse tardive dans le flux, et la commande suivante la lisait comme la sienne — croisant par exemple une requête de statut avec une requête de longueurs d'éléments. Le flux est désormais vidé de toute réponse périmée avant chaque commande, gardant l'échange synchronisé.",
|
||||||
|
"Ultrabeam : l'indicateur « en mouvement » et l'inhibition d'émission Flex réagissent désormais dès que vous cliquez sur une bande ou un diagramme, au lieu d'attendre jusqu'à un poll de statut (~2 s). Un mouvement commandé signale le déplacement immédiatement ; l'état réel des moteurs prend le relais dès le poll suivant.",
|
||||||
|
"Partage CAT (FT8) : JTDX/WSJT-X émettent de nouveau correctement via la radio partagée d'OpsLog. get_ptt renvoie désormais l'état PTT commandé en dernier par le client — les clients l'interrogent PENDANT l'émission pour confirmer que la radio est en émission, et comme OpsLog répondait toujours « réception », ils abandonnaient et coupaient l'émission au bout d'une seconde ou deux. L'ajustement anti-drift « Fake It » de la 0.23.5 a aussi été annulé (il rendait le problème total — aucune émission) ; le léger glissement du VFO en split « Fake It » peut réapparaître, et « Split Operation : None » dans JTDX l'évite.",
|
||||||
|
"Réglages CAT : textes d'aide raccourcis sous les champs Kenwood et partage CAT — moins de fouillis.",
|
||||||
|
"Formulaire de saisie : deux façons de logguer un QSO parasite corrigées. Appuyer sur Entrée dans le champ fréquence TX/RX ne fait plus que syntoniser la radio — cela validait aussi le contact. Et un nombre nu sans lettre (JTDX/WSJT-X diffuse parfois « 1 » comme DX call) n'est plus accepté dans le champ indicatif, où il pouvait être loggué comme indicatif « 1 ».",
|
||||||
|
"Ampli SPE : éteindre l'ampli depuis OpsLog affiche désormais « off » tout de suite et permet de le rallumer sans redémarrer. La connexion déjà ouverte continuait d'être vue comme connectée après la touche d'extinction, le panneau restait donc « on » et le bouton ON ne faisait rien jusqu'à un redémarrage. OpsLog largue maintenant le lien à l'extinction, exactement comme un démarrage à neuf — le réveil RTS/DTR du bouton ON fonctionne alors.",
|
||||||
|
"Alt+W efface la saisie du QSO, le raccourci utilisé par la plupart des autres logiciels. Contrairement à Échap, il fonctionne toujours, même quand Échap est réservé au manipulateur CW.",
|
||||||
|
"Le champ Locator ne déborde plus du panneau de saisie quand la fenêtre est rétrécie — il passe à la ligne.",
|
||||||
|
"Sélectionner un QSO dans la liste des QSO récents affiche désormais cette station dans la matrice Stats (F1), au lieu de la laisser vide.",
|
||||||
|
"Stats (F1) : cliquer sur une case bande/mode colorée liste les contacts correspondants.",
|
||||||
|
"Diplômes : la liste DXCC affiche le préfixe principal de chaque entité (XE, DL, F…) dans une colonne triable et cherchable.",
|
||||||
|
"DX Cluster : nouvelle option « Déjà contacté seulement sur le même slot » (Réglages → DX Cluster). Activée, un spot n'affiche « contacté » que si vous avez contacté cet indicatif sur la MÊME bande et le MÊME mode — pas juste n'importe où. Elle respecte le groupage des modes numériques (Réglages → Général) : groupé, un contact 20m FT8 marque aussi un spot 20m FT4 comme contacté ; dégroupé, FT8 et FT4 sont des slots distincts.",
|
||||||
|
"DX Cluster : ajout d'un filtre de statut WORKED, pour afficher — ou, en désactivant les autres, isoler — les spots déjà contactés, pas seulement les masquer avec la case « Masquer les contactés ».",
|
||||||
|
"DX Cluster : les spots qui ne représentent rien — entité/bande/mode déjà faite, indicatif absent du journal, aucune nouveauté POTA/comté/préfixe — sont désormais atténués, pour que l'œil les ignore et que les spots à travailler ressortent. Ce qui compte comme « rien » suit l'option « même slot » et le groupage des modes numériques.",
|
||||||
|
"Ultrabeam : un contrôleur plus ancien (vu derrière un pont RS232-Ethernet) répond avec une trame de statut de 11 octets au lieu de 12. OpsLog la rejetait comme « trop courte » et bouclait en reconnexion ; il accepte désormais une trame valide plus courte et met par défaut le champ de fin manquant.",
|
||||||
|
"Correction d'un plantage (React #300) qui pouvait faire tomber toute la fenêtre quand la radio rapportait brièvement une bande inhabituelle — par exemple une lecture 33 cm parasite d'un Icom. La Band Map avait un hook de navigation clavier après son retour anticipé pour les bandes inconnues, changeant le nombre de hooks entre deux rendus. Le hook est désormais toujours exécuté."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.23.5",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"CAT sharing (Hamlib rigctld): fixed a slow frequency drift in FT8. With a digital app (JTDX/WSJT-X) sharing OpsLog's rig in \"Fake It\" split, each transmit crept the dial down and never came back. The app follows the dial by polling, and our reply lagged the last tune by a poll cycle, so right after a transmission it read the still-shifted frequency, took it for a manual QSY and adopted it. Reads now echo the last commanded frequency until the rig confirms it — the dial holds. Applies to every backend, not just Kenwood."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Partage CAT (rigctld Hamlib) : dérive lente de fréquence en FT8 corrigée. Avec une app numérique (JTDX/WSJT-X) partageant la radio d'OpsLog en split « Fake It », chaque passage en émission faisait descendre le VFO sans jamais revenir. L'app suit le VFO en l'interrogeant, et notre réponse était en retard d'un cycle sur la dernière syntonisation : juste après une émission elle lisait la fréquence encore décalée, la prenait pour un QSY manuel et l'adoptait. Les lectures renvoient désormais la dernière fréquence commandée jusqu'à confirmation de la radio — le VFO tient. Vaut pour tous les backends, pas seulement Kenwood."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.23.4",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"CW keyer (Kenwood/Elecraft): choosing the Kenwood/Elecraft engine now actually switches to it. A bug left the keyer on WinKeyer even though the setting showed Kenwood/Elecraft, so its CW-over-CAT never ran.",
|
||||||
|
"Kenwood/Elecraft data mode: a new setting (Settings → CAT) chooses what a data mode (FT8/PSK…) sets on the rig — USB (default), DATA mode (MD6, for an Elecraft K3/K4), or leave the rig's mode unchanged (safest for a TS-590SG/TS-990S, whose data mode is a USB modifier set on the radio). There is no single command that fits every rig, so it's now the operator's choice.",
|
||||||
|
"Ultrabeam over a remote link: changing the pattern (Normal / 180° / bidirectional) no longer snaps back to the old one after a few seconds. The commanded pattern is now held while the motors are still moving plus a grace window after they stop, so the slow remote status poll — which lagged behind the antenna — can't revert the display while the change is in flight.",
|
||||||
|
"QSL Manager: closing the window — or starting another download — now cancels the one still in progress, so a slow QRZ sync no longer keeps running in the background and bleeds its log into a freshly started LoTW run. The QRZ download summary also spells out that only confirmed QSOs are acted on (e.g. \"7950 of 26164 are confirmed\") — a full QRZ logbook has many not-yet-confirmed QSOs, so nothing is lost even though the old wording read as if only a fraction came back. (A LoTW \"http 503\" is separate: the ARRL server being down — retry later.)"
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Keyer CW (Kenwood/Elecraft) : choisir le moteur Kenwood/Elecraft y bascule désormais réellement. Un bug laissait le keyer sur WinKeyer alors que le réglage affichait Kenwood/Elecraft, son CW-sur-CAT ne démarrait donc jamais.",
|
||||||
|
"Mode data Kenwood/Elecraft : un nouveau réglage (Réglages → CAT) choisit ce qu'un mode data (FT8/PSK…) règle sur la radio — USB (défaut), mode DATA (MD6, pour un Elecraft K3/K4), ou ne pas changer le mode de la radio (le plus sûr pour un TS-590SG/TS-990S dont le mode data est un modificateur d'USB réglé sur la radio). Aucune commande unique ne convient à toutes les radios, c'est donc désormais au choix de l'opérateur.",
|
||||||
|
"Ultrabeam en remote : changer le diagramme (Normal / 180° / bidirectionnel) ne revient plus à l'ancien au bout de quelques secondes. Le diagramme commandé est maintenu tant que les moteurs bougent, plus une fenêtre de grâce après leur arrêt — le poll de statut distant, lent et en retard sur l'antenne, ne peut donc plus faire revenir l'affichage pendant que le changement est en cours.",
|
||||||
|
"QSL Manager : fermer la fenêtre — ou lancer un autre téléchargement — annule désormais celui en cours, une synchro QRZ lente ne continue donc plus en arrière-plan à mélanger son journal à un téléchargement LoTW fraîchement lancé. Le récapitulatif QRZ indique aussi clairement que seuls les QSO confirmés sont traités (ex. « 7950 sur 26164 confirmés ») — un logbook QRZ complet contient beaucoup de QSO pas encore confirmés, rien n'est donc perdu même si l'ancien texte donnait l'impression qu'une fraction seulement était revenue. (Un « http 503 » sur LoTW est un autre sujet : serveur de l'ARRL indisponible — réessayez plus tard.)"
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"version": "0.23.3",
|
"version": "0.23.3",
|
||||||
"date": "",
|
"date": "",
|
||||||
|
|||||||
+147
-15
@@ -1500,6 +1500,83 @@ export default function App() {
|
|||||||
// still need resolving without re-subscribing the cluster:spot listener.
|
// still need resolving without re-subscribing the cluster:spot listener.
|
||||||
const spotStatusRef = useRef(spotStatus);
|
const spotStatusRef = useRef(spotStatus);
|
||||||
useEffect(() => { spotStatusRef.current = spotStatus; }, [spotStatus]);
|
useEffect(() => { spotStatusRef.current = spotStatus; }, [spotStatus]);
|
||||||
|
// Mirror of spots so the log-triggered refresh reads the current list without
|
||||||
|
// a stale closure.
|
||||||
|
const spotsRef = useRef(spots);
|
||||||
|
useEffect(() => { spotsRef.current = spots; }, [spots]);
|
||||||
|
// Bound the status cache. Keyed per call|band|mode, it otherwise kept an entry
|
||||||
|
// for every station ever seen — under an RBN firehose (thousands of unique
|
||||||
|
// calls/hour) that grew without limit to gigabytes. Prune it back to the live
|
||||||
|
// (SPOTS_CAP-limited) spots once it drifts well past them. The size check bails
|
||||||
|
// cheaply the rest of the time (returning the same reference, so no dependent
|
||||||
|
// memo re-runs); an evicted spot is just re-resolved if it reappears.
|
||||||
|
useEffect(() => {
|
||||||
|
setSpotStatus((prev) => {
|
||||||
|
const keys = Object.keys(prev);
|
||||||
|
if (keys.length <= SPOTS_CAP * 2) return prev;
|
||||||
|
const live = new Set(spots.map((x) => spotStatusKey(x.dx_call, x.band ?? '', x.comment ?? '', x.freq_hz)));
|
||||||
|
const pruned: typeof prev = {};
|
||||||
|
for (const k of keys) if (live.has(k)) pruned[k] = prev[k];
|
||||||
|
return pruned;
|
||||||
|
});
|
||||||
|
}, [spots]);
|
||||||
|
// Re-fetch the status of every SHOWN spot and OVERWRITE the cache (merge, never
|
||||||
|
// clear). Overwriting keeps the other NEW badges on screen until their fresh
|
||||||
|
// value lands, instead of blanking the whole grid and letting the badges pop
|
||||||
|
// back a moment later. The backend cost is one status batch regardless of spot
|
||||||
|
// count (it scans the logbook once), so this is as cheap as the poll already is.
|
||||||
|
const refreshSpotStatuses = useCallback(async () => {
|
||||||
|
const cur = spotsRef.current;
|
||||||
|
if (!cur.length) return;
|
||||||
|
const queries: { call: string; band: string; mode: string; pota_ref: string }[] = [];
|
||||||
|
const seen = new Set<string>();
|
||||||
|
for (const s of cur) {
|
||||||
|
const k = spotStatusKey(s.dx_call, s.band ?? '', s.comment ?? '', s.freq_hz);
|
||||||
|
if (seen.has(k)) continue;
|
||||||
|
seen.add(k);
|
||||||
|
queries.push({ call: s.dx_call, band: s.band ?? '', mode: inferSpotMode(s.comment ?? '', s.freq_hz), pota_ref: (s as any).pota_ref ?? '' });
|
||||||
|
}
|
||||||
|
if (!queries.length) return;
|
||||||
|
try {
|
||||||
|
const res = await ClusterSpotStatuses(queries as any);
|
||||||
|
setSpotStatus((prev) => {
|
||||||
|
const next = { ...prev };
|
||||||
|
for (const r of res) {
|
||||||
|
const k = `${r.call}|${r.band ?? ''}|${(r.mode ?? '').toUpperCase()}`;
|
||||||
|
next[k] = {
|
||||||
|
status: r.status ?? '', country: r.country, continent: (r as any).continent,
|
||||||
|
worked_call: !!(r as any).worked_call, new_county: !!(r as any).new_county,
|
||||||
|
new_pota: !!(r as any).new_pota, new_pfx: !!(r as any).new_pfx, pfx: (r as any).pfx,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
return next;
|
||||||
|
});
|
||||||
|
} catch { /* leave the old statuses in place on failure */ }
|
||||||
|
}, []);
|
||||||
|
// After a QSO is logged, refresh the shown spots so a call/entity/POTA/prefix/
|
||||||
|
// slot just worked drops its NEW badge — WITHOUT blanking the others (see the
|
||||||
|
// merge above). Kept cheap: only while the cluster is on screen (a log while
|
||||||
|
// hidden marks it dirty and refreshes ONCE on next open), and debounced so a
|
||||||
|
// fast run coalesces instead of re-scanning per QSO.
|
||||||
|
const clusterVisibleRef = useRef(false);
|
||||||
|
const spotsDirtyRef = useRef(false);
|
||||||
|
useEffect(() => {
|
||||||
|
const vis = mainPaneLeft === 'cluster' || mainPaneRight === 'cluster' || activeTab === 'cluster';
|
||||||
|
if (vis && !clusterVisibleRef.current && spotsDirtyRef.current) {
|
||||||
|
spotsDirtyRef.current = false;
|
||||||
|
void refreshSpotStatuses();
|
||||||
|
}
|
||||||
|
clusterVisibleRef.current = vis;
|
||||||
|
}, [mainPaneLeft, mainPaneRight, activeTab, refreshSpotStatuses]);
|
||||||
|
useEffect(() => {
|
||||||
|
let t: number | undefined;
|
||||||
|
const off = EventsOn('qso:logged', () => {
|
||||||
|
if (!clusterVisibleRef.current) { spotsDirtyRef.current = true; return; }
|
||||||
|
if (t) window.clearTimeout(t);
|
||||||
|
t = window.setTimeout(() => void refreshSpotStatuses(), 2000);
|
||||||
|
});
|
||||||
|
return () => { off(); if (t) window.clearTimeout(t); };
|
||||||
|
}, [refreshSpotStatuses]);
|
||||||
// Incoming spots are staged here for a few ms, their status resolved, then
|
// Incoming spots are staged here for a few ms, their status resolved, then
|
||||||
// committed to `spots` together — so a row paints with its NEW BAND/MODE badge
|
// committed to `spots` together — so a row paints with its NEW BAND/MODE badge
|
||||||
// already on, instead of flashing plain text then flipping to the pill.
|
// already on, instead of flashing plain text then flipping to the pill.
|
||||||
@@ -1512,6 +1589,11 @@ export default function App() {
|
|||||||
const [deletingIds, setDeletingIds] = useState<number[]>([]);
|
const [deletingIds, setDeletingIds] = useState<number[]>([]);
|
||||||
const [selectedId, setSelectedId] = useState<number | null>(null);
|
const [selectedId, setSelectedId] = useState<number | null>(null);
|
||||||
const [selectedIds, setSelectedIds] = useState<number[]>([]);
|
const [selectedIds, setSelectedIds] = useState<number[]>([]);
|
||||||
|
// Call/band/mode of the QSO highlighted in the Recent-QSOs grid. Drives the
|
||||||
|
// Stats (F1) matrix whenever the entry form is empty — clicking a past contact
|
||||||
|
// is the natural way to ask "what else have I got with this one?", and until
|
||||||
|
// now the panel just sat blank.
|
||||||
|
const [selQso, setSelQso] = useState<{ call: string; band: string; mode: string } | null>(null);
|
||||||
const [bulkEditIds, setBulkEditIds] = useState<number[]>([]);
|
const [bulkEditIds, setBulkEditIds] = useState<number[]>([]);
|
||||||
const [bulkEditOpen, setBulkEditOpen] = useState(false);
|
const [bulkEditOpen, setBulkEditOpen] = useState(false);
|
||||||
const [showSettings, setShowSettings] = useState(false);
|
const [showSettings, setShowSettings] = useState(false);
|
||||||
@@ -2607,6 +2689,11 @@ export default function App() {
|
|||||||
const applyUdpCall = (raw: string, force = false): boolean => {
|
const applyUdpCall = (raw: string, force = false): boolean => {
|
||||||
const call = String(raw ?? '').trim();
|
const call = String(raw ?? '').trim();
|
||||||
if (!call) return false;
|
if (!call) return false;
|
||||||
|
// A callsign always has at least one letter. WSJT-X/JTDX (and relayed spot
|
||||||
|
// clicks) sometimes broadcast a bare number in the DX-call field — famously
|
||||||
|
// "1" — which would land in the entry and, on the next Enter, log a QSO
|
||||||
|
// with callsign "1". Reject anything with no letter.
|
||||||
|
if (!/[a-z]/i.test(call)) return false;
|
||||||
const upper = call.toUpperCase();
|
const upper = call.toUpperCase();
|
||||||
const current = callsignValRef.current.trim().toUpperCase();
|
const current = callsignValRef.current.trim().toUpperCase();
|
||||||
const prev = lastUdpCallRef.current;
|
const prev = lastUdpCallRef.current;
|
||||||
@@ -2706,8 +2793,9 @@ export default function App() {
|
|||||||
s.engine === 'icom' ? 'icom'
|
s.engine === 'icom' ? 'icom'
|
||||||
: s.engine === 'flex' ? 'flex'
|
: s.engine === 'flex' ? 'flex'
|
||||||
: s.engine === 'yaesu' ? 'yaesu'
|
: s.engine === 'yaesu' ? 'yaesu'
|
||||||
: s.engine === 'serial' ? 'serial'
|
: s.engine === 'kenwood' ? 'kenwood'
|
||||||
: 'winkeyer');
|
: s.engine === 'serial' ? 'serial'
|
||||||
|
: 'winkeyer');
|
||||||
} catch { /* keyer not configured */ }
|
} catch { /* keyer not configured */ }
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
@@ -3309,6 +3397,24 @@ export default function App() {
|
|||||||
finally { setDeletingAll(false); }
|
finally { setDeletingAll(false); }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Worked-before for the QSO highlighted in the grid. Deliberately NOT
|
||||||
|
// runWorkedBefore: that one owns the entry form's wbRef and can trigger a
|
||||||
|
// field backfill, which browsing the log must never do.
|
||||||
|
const [selWb, setSelWb] = useState<WB | null>(null);
|
||||||
|
const [selWbBusy, setSelWbBusy] = useState(false);
|
||||||
|
useEffect(() => {
|
||||||
|
const call = (selQso?.call ?? '').trim().toUpperCase();
|
||||||
|
// The entry form wins whenever it has a call — it's the live QSO.
|
||||||
|
if (!call || callsign.trim()) { setSelWb(null); return; }
|
||||||
|
let dead = false;
|
||||||
|
setSelWbBusy(true);
|
||||||
|
WorkedBefore(call, 0)
|
||||||
|
.then((w: any) => { if (!dead) setSelWb(w); })
|
||||||
|
.catch(() => { if (!dead) setSelWb(null); })
|
||||||
|
.finally(() => { if (!dead) setSelWbBusy(false); });
|
||||||
|
return () => { dead = true; };
|
||||||
|
}, [selQso, callsign]);
|
||||||
|
|
||||||
async function runWorkedBefore(call: string, dxccHint: number = 0) {
|
async function runWorkedBefore(call: string, dxccHint: number = 0) {
|
||||||
setWbBusy(true);
|
setWbBusy(true);
|
||||||
try {
|
try {
|
||||||
@@ -3853,6 +3959,16 @@ export default function App() {
|
|||||||
if ((e.ctrlKey || e.metaKey) && e.key.toLowerCase() === 'o') {
|
if ((e.ctrlKey || e.metaKey) && e.key.toLowerCase() === 'o') {
|
||||||
e.preventDefault(); importAdif(); return;
|
e.preventDefault(); importAdif(); return;
|
||||||
}
|
}
|
||||||
|
// Alt+W: wipe the entry. The near-universal logger convention (N1MM,
|
||||||
|
// Log4OM, DXLog), and unlike ESC it is never swallowed by the CW keyer —
|
||||||
|
// so there is always one key that clears, whatever else is running.
|
||||||
|
// Alt-combos carry no character on Windows, so this is safe while typing.
|
||||||
|
if (e.altKey && !e.ctrlKey && !e.metaKey && e.key.toLowerCase() === 'w') {
|
||||||
|
e.preventDefault();
|
||||||
|
resetEntry();
|
||||||
|
callsignRef.current?.focus();
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (typing) return;
|
if (typing) return;
|
||||||
if (selectedId !== null) {
|
if (selectedId !== null) {
|
||||||
if (e.key === 'Delete') { e.preventDefault(); askDeleteSelected(); return; }
|
if (e.key === 'Delete') { e.preventDefault(); askDeleteSelected(); return; }
|
||||||
@@ -4125,7 +4241,7 @@ export default function App() {
|
|||||||
</div>
|
</div>
|
||||||
</>
|
</>
|
||||||
) : (
|
) : (
|
||||||
<div className="flex flex-col flex-1 min-w-[130px]"><Label className="mb-1 h-3.5">{t('field.qth')}</Label>
|
<div className="flex flex-col flex-1 min-w-[80px]"><Label className="mb-1 h-3.5">{t('field.qth')}</Label>
|
||||||
<Input value={qth} onChange={(e) => { setQth(e.target.value); markEdited('qth'); }} />
|
<Input value={qth} onChange={(e) => { setQth(e.target.value); markEdited('qth'); }} />
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
@@ -4354,7 +4470,7 @@ export default function App() {
|
|||||||
title={catState.connected ? t('field.freqTuneHint') : undefined}
|
title={catState.connected ? t('field.freqTuneHint') : undefined}
|
||||||
onFocus={() => setFreqFocused(true)}
|
onFocus={() => setFreqFocused(true)}
|
||||||
onBlur={() => setFreqFocused(false)}
|
onBlur={() => setFreqFocused(false)}
|
||||||
onKeyDown={(e) => { if (e.key === 'Enter') tuneRadioTo(freqMhz); }}
|
onKeyDown={(e) => { if (e.key === 'Enter') { e.preventDefault(); e.stopPropagation(); tuneRadioTo(freqMhz); } }}
|
||||||
onChange={(e) => { setFreqMhz(e.target.value); noteManualEdit(); const b = bandForMHz(parseFloat(e.target.value)); if (b) setBand(b); }}
|
onChange={(e) => { setFreqMhz(e.target.value); noteManualEdit(); const b = bandForMHz(parseFloat(e.target.value)); if (b) setBand(b); }}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
@@ -4369,7 +4485,7 @@ export default function App() {
|
|||||||
title={catState.connected ? t('field.freqTuneHint') : undefined}
|
title={catState.connected ? t('field.freqTuneHint') : undefined}
|
||||||
onFocus={() => setFreqFocused(true)}
|
onFocus={() => setFreqFocused(true)}
|
||||||
onBlur={() => setFreqFocused(false)}
|
onBlur={() => setFreqFocused(false)}
|
||||||
onKeyDown={(e) => { if (e.key === 'Enter') tuneRadioTo(rxFreqMhz); }}
|
onKeyDown={(e) => { if (e.key === 'Enter') { e.preventDefault(); e.stopPropagation(); tuneRadioTo(rxFreqMhz); } }}
|
||||||
onChange={(e) => { setRxFreqMhz(e.target.value); noteManualEdit(); const rb = bandForMHz(parseFloat(e.target.value)); if (rb) setBandRx(rb); }}
|
onChange={(e) => { setRxFreqMhz(e.target.value); noteManualEdit(); const rb = bandForMHz(parseFloat(e.target.value)); if (rb) setBandRx(rb); }}
|
||||||
className={cn('font-mono', catState.split && 'bg-danger-muted/40 border-danger-border focus:bg-card')}
|
className={cn('font-mono', catState.split && 'bg-danger-muted/40 border-danger-border focus:bg-card')}
|
||||||
/>
|
/>
|
||||||
@@ -4406,7 +4522,7 @@ export default function App() {
|
|||||||
</Button>
|
</Button>
|
||||||
)}
|
)}
|
||||||
<Button type="button" size="sm" variant="outline" onClick={() => { resetEntry(); callsignRef.current?.focus(); }} className="h-8 px-2.5 text-xs"
|
<Button type="button" size="sm" variant="outline" onClick={() => { resetEntry(); callsignRef.current?.focus(); }} className="h-8 px-2.5 text-xs"
|
||||||
title="Clear the QSO entry (always — unlike Esc which may be reserved for the CW keyer)">
|
title="Clear the QSO entry — Alt+W (always works, unlike Esc which may be reserved for the CW keyer)">
|
||||||
<Eraser className="size-3.5" />
|
<Eraser className="size-3.5" />
|
||||||
{t('btn.clear')}
|
{t('btn.clear')}
|
||||||
</Button>
|
</Button>
|
||||||
@@ -4451,11 +4567,14 @@ export default function App() {
|
|||||||
const k = spotStatusKey(s.dx_call, s.band ?? '', s.comment ?? '', s.freq_hz);
|
const k = spotStatusKey(s.dx_call, s.band ?? '', s.comment ?? '', s.freq_hz);
|
||||||
const e = spotStatus[k];
|
const e = spotStatus[k];
|
||||||
const st = (e?.status || '') as SpotStatusKey;
|
const st = (e?.status || '') as SpotStatusKey;
|
||||||
// A previously-worked call counts as WORKED for filtering even when its
|
// WORKED means "I've worked THIS callsign" — the blue WKD-CALL flag —
|
||||||
// entity status is still new-band/new-slot (the grid flags it WKD CALL),
|
// NOT the entity status 'worked' (entity/band/mode already worked, which
|
||||||
// matching the "Hide worked" toggle. Additive: it still matches its own
|
// the grid shows as a plain "—"). So the 'worked' key is matched ONLY via
|
||||||
// entity status too, so it stays visible under NEW BAND / NEW SLOT.
|
// worked_call below; exclude the entity status 'worked' from the generic
|
||||||
const matches = clusterStatusFilter.has(st)
|
// match, or every "already-worked-entity" spot would slip through. A
|
||||||
|
// worked call still matches its own entity status too (new-band/new-slot),
|
||||||
|
// so it stays visible under those chips.
|
||||||
|
const matches = (st !== 'worked' && clusterStatusFilter.has(st))
|
||||||
|| (!!e?.worked_call && clusterStatusFilter.has('worked'))
|
|| (!!e?.worked_call && clusterStatusFilter.has('worked'))
|
||||||
|| (!!e?.new_pota && clusterStatusFilter.has('new-pota'))
|
|| (!!e?.new_pota && clusterStatusFilter.has('new-pota'))
|
||||||
|| (!!e?.new_county && clusterStatusFilter.has('new-county'))
|
|| (!!e?.new_county && clusterStatusFilter.has('new-county'))
|
||||||
@@ -4580,7 +4699,10 @@ export default function App() {
|
|||||||
{ k: 'new-pota' as SpotFilterKey, label: 'NEW POTA', cls: 'bg-success-muted text-success-muted-foreground border-success-border' },
|
{ k: 'new-pota' as SpotFilterKey, label: 'NEW POTA', cls: 'bg-success-muted text-success-muted-foreground border-success-border' },
|
||||||
{ k: 'new-county' as SpotFilterKey, label: 'NEW COUNTY', cls: 'bg-success-muted text-success-muted-foreground border-success-border' },
|
{ k: 'new-county' as SpotFilterKey, label: 'NEW COUNTY', cls: 'bg-success-muted text-success-muted-foreground border-success-border' },
|
||||||
{ k: 'new-pfx' as SpotFilterKey, label: 'NEW PFX', cls: 'bg-caution-muted text-caution-muted-foreground border-caution-border' },
|
{ k: 'new-pfx' as SpotFilterKey, label: 'NEW PFX', cls: 'bg-caution-muted text-caution-muted-foreground border-caution-border' },
|
||||||
// (no WORKED chip — use the "Hide worked" checkbox to drop dupes.)
|
// Blue, like the already-worked call in the grid. Selecting it keeps
|
||||||
|
// worked spots; the separate "Hide worked" checkbox drops them — they
|
||||||
|
// are opposite controls, so don't use both at once.
|
||||||
|
{ k: 'worked' as SpotFilterKey, label: 'WORKED', cls: 'bg-info-muted text-info-muted-foreground border-info-border' },
|
||||||
]).map((s) => {
|
]).map((s) => {
|
||||||
const on = clusterStatusFilter.has(s.k);
|
const on = clusterStatusFilter.has(s.k);
|
||||||
return (
|
return (
|
||||||
@@ -4740,6 +4862,7 @@ export default function App() {
|
|||||||
onExportFiltered={exportFilteredADIF}
|
onExportFiltered={exportFilteredADIF}
|
||||||
onDelete={(ids) => setDeletingIds(ids)}
|
onDelete={(ids) => setDeletingIds(ids)}
|
||||||
onRowSelected={(ids) => { setSelectedIds(ids); setSelectedId(ids[0] ?? null); }}
|
onRowSelected={(ids) => { setSelectedIds(ids); setSelectedId(ids[0] ?? null); }}
|
||||||
|
onRowSelectedQso={(r) => setSelQso(r ? { call: String(r.callsign ?? ""), band: String(r.band ?? ""), mode: String(r.mode ?? "") } : null)}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
@@ -5477,7 +5600,10 @@ export default function App() {
|
|||||||
{/* Row 2: Name fixed to the Band/Mode/Country column width (300px) so
|
{/* Row 2: Name fixed to the Band/Mode/Country column width (300px) so
|
||||||
its right edge lines up with that column below; QTH grows to fill.
|
its right edge lines up with that column below; QTH grows to fill.
|
||||||
gap-4 matches Row 3 so QTH's left edge aligns with Comment/Note. */}
|
gap-4 matches Row 3 so QTH's left edge aligns with Comment/Note. */}
|
||||||
<div className="flex gap-4 items-end">
|
{/* flex-wrap, not overflow: at the narrowest window the Grid box used
|
||||||
|
to be pushed outside the entry panel and clipped. Wrapping drops
|
||||||
|
it to its own line instead, which stays readable. */}
|
||||||
|
<div className="flex gap-4 items-end flex-wrap">
|
||||||
<div className="flex flex-col w-[300px] shrink-0"><Label className="mb-1 h-3.5">Name</Label>
|
<div className="flex flex-col w-[300px] shrink-0"><Label className="mb-1 h-3.5">Name</Label>
|
||||||
<Input value={name} onChange={(e) => { setName(e.target.value); markEdited('name'); }} />
|
<Input value={name} onChange={(e) => { setName(e.target.value); markEdited('name'); }} />
|
||||||
</div>
|
</div>
|
||||||
@@ -5543,6 +5669,11 @@ export default function App() {
|
|||||||
band={band}
|
band={band}
|
||||||
mode={mode}
|
mode={mode}
|
||||||
bands={bands}
|
bands={bands}
|
||||||
|
onEditQso={openEdit}
|
||||||
|
{...(!callsign.trim() && selQso ? {
|
||||||
|
slotCall: selQso.call, slotBand: selQso.band, slotMode: selQso.mode,
|
||||||
|
slotWb: selWb, slotWbBusy: selWbBusy,
|
||||||
|
} : {})}
|
||||||
tab={detailTab}
|
tab={detailTab}
|
||||||
onTab={setDetailTab}
|
onTab={setDetailTab}
|
||||||
keyerActive={(wkEnabled && wkStatus.connected) || dvkEnabled}
|
keyerActive={(wkEnabled && wkStatus.connected) || dvkEnabled}
|
||||||
@@ -5702,11 +5833,11 @@ export default function App() {
|
|||||||
// exactly when its CAT backend is. Yaesu was missing from this
|
// exactly when its CAT backend is. Yaesu was missing from this
|
||||||
// list, so the panel fell back to the WinKeyer status — which
|
// list, so the panel fell back to the WinKeyer status — which
|
||||||
// reported disconnected, no WinKeyer being attached.
|
// reported disconnected, no WinKeyer being attached.
|
||||||
status={cwSource === 'icom' || cwSource === 'flex' || cwSource === 'yaesu'
|
status={cwSource === 'icom' || cwSource === 'flex' || cwSource === 'yaesu' || cwSource === 'kenwood'
|
||||||
? {
|
? {
|
||||||
connected: catState.backend === cwSource && catState.connected,
|
connected: catState.backend === cwSource && catState.connected,
|
||||||
busy: false, wpm: wkWpm, version: 0,
|
busy: false, wpm: wkWpm, version: 0,
|
||||||
port: cwSource === 'flex' ? 'CWX' : cwSource === 'yaesu' ? 'CAT' : 'CI-V',
|
port: cwSource === 'flex' ? 'CWX' : cwSource === 'yaesu' || cwSource === 'kenwood' ? 'CAT' : 'CI-V',
|
||||||
}
|
}
|
||||||
: wkStatus}
|
: wkStatus}
|
||||||
ports={wkPorts}
|
ports={wkPorts}
|
||||||
@@ -5993,6 +6124,7 @@ export default function App() {
|
|||||||
onExportCabrilloFiltered={exportFilteredCabrillo}
|
onExportCabrilloFiltered={exportFilteredCabrillo}
|
||||||
onDelete={(ids) => setDeletingIds(ids)}
|
onDelete={(ids) => setDeletingIds(ids)}
|
||||||
onRowSelected={(ids) => { setSelectedIds(ids); setSelectedId(ids[0] ?? null); }}
|
onRowSelected={(ids) => { setSelectedIds(ids); setSelectedId(ids[0] ?? null); }}
|
||||||
|
onRowSelectedQso={(r) => setSelQso(r ? { call: String(r.callsign ?? ""), band: String(r.band ?? ""), mode: String(r.mode ?? "") } : null)}
|
||||||
/>
|
/>
|
||||||
<div className="px-3 py-1.5 border-t border-border/60 text-[11px] text-muted-foreground flex items-center justify-between gap-3 bg-muted/30">
|
<div className="px-3 py-1.5 border-t border-border/60 text-[11px] text-muted-foreground flex items-center justify-between gap-3 bg-muted/30">
|
||||||
<div className="flex items-center gap-3">
|
<div className="flex items-center gap-3">
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import { useEffect, useMemo, useState } from 'react';
|
import { useEffect, useMemo, useState } from 'react';
|
||||||
import { Award as AwardIcon, RefreshCw, Loader2, Search, Pencil, X, Grid3x3, List, BarChart3, AlertTriangle, ChevronUp, ChevronDown } from 'lucide-react';
|
import { Award as AwardIcon, RefreshCw, Loader2, Search, Pencil, X, Grid3x3, List, BarChart3, AlertTriangle, ChevronUp, ChevronDown } from 'lucide-react';
|
||||||
import { GetAwardDefs, GetAward, AwardCellQSOs, GetAwardStats, AwardMissingQSOs, ListAwardReferences, AssignAwardRefToQSOs, RescanAwards } from '../../wailsjs/go/main/App';
|
import { GetAwardDefs, GetAward, AwardCellQSOs, GetAwardStats, AwardMissingQSOs, ListAwardReferences, AssignAwardRefToQSOs, RescanAwards, GetTrackedAwards } from '../../wailsjs/go/main/App';
|
||||||
|
import { EventsOn } from '../../wailsjs/runtime/runtime';
|
||||||
import { Input } from '@/components/ui/input';
|
import { Input } from '@/components/ui/input';
|
||||||
import { Button } from '@/components/ui/button';
|
import { Button } from '@/components/ui/button';
|
||||||
import { Checkbox } from '@/components/ui/checkbox';
|
import { Checkbox } from '@/components/ui/checkbox';
|
||||||
@@ -137,13 +138,20 @@ export function AwardsPanel({ onEditQSO, onAwardsChanged }: { onEditQSO?: (id: n
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Load the award list (no QSO scan), then compute only the first award.
|
// Load the award list (no QSO scan), then compute only the first award. The
|
||||||
|
// list is narrowed to the awards the operator follows (Settings → Awards); an
|
||||||
|
// empty follow-set means "show them all" so the tab is never blank.
|
||||||
async function loadList() {
|
async function loadList() {
|
||||||
try {
|
try {
|
||||||
const defs = ((await GetAwardDefs()) ?? []) as any[];
|
const [defs, tracked] = await Promise.all([
|
||||||
const list: AwardListItem[] = defs
|
GetAwardDefs().then((d) => (d ?? []) as any[]),
|
||||||
|
GetTrackedAwards().then((t) => (t ?? []) as string[]).catch(() => [] as string[]),
|
||||||
|
]);
|
||||||
|
const follow = new Set(tracked);
|
||||||
|
let list: AwardListItem[] = defs
|
||||||
.map((d) => ({ code: d.code, name: d.name, valid: d.valid, bands: d.valid_bands ?? [], emission: d.emission ?? [] }))
|
.map((d) => ({ code: d.code, name: d.name, valid: d.valid, bands: d.valid_bands ?? [], emission: d.emission ?? [] }))
|
||||||
.sort((a, b) => a.code.localeCompare(b.code));
|
.sort((a, b) => a.code.localeCompare(b.code));
|
||||||
|
if (follow.size > 0) list = list.filter((a) => follow.has(a.code));
|
||||||
setAwardList(list);
|
setAwardList(list);
|
||||||
const first = list.find((a) => a.code === selected) ?? list[0];
|
const first = list.find((a) => a.code === selected) ?? list[0];
|
||||||
if (first) compute(first.code);
|
if (first) compute(first.code);
|
||||||
@@ -152,6 +160,12 @@ export function AwardsPanel({ onEditQSO, onAwardsChanged }: { onEditQSO?: (id: n
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
useEffect(() => { loadList(); }, []);
|
useEffect(() => { loadList(); }, []);
|
||||||
|
// Re-filter when the operator changes their followed awards in Settings.
|
||||||
|
useEffect(() => {
|
||||||
|
const off = EventsOn('awards:tracked-changed', () => { loadList(); });
|
||||||
|
return () => { off(); };
|
||||||
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||||
|
}, []);
|
||||||
|
|
||||||
const current = byCode[`${selected}|${modeFilter}`];
|
const current = byCode[`${selected}|${modeFilter}`];
|
||||||
// Recompute when the mode class changes: the bands, counts and confirmations
|
// Recompute when the mode class changes: the bands, counts and confirmations
|
||||||
@@ -211,11 +225,14 @@ export function AwardsPanel({ onEditQSO, onAwardsChanged }: { onEditQSO?: (id: n
|
|||||||
// Alicante" — which reference order scatters across the whole table.
|
// Alicante" — which reference order scatters across the whole table.
|
||||||
// Remembered through writeUiPref rather than localStorage, so the choice
|
// Remembered through writeUiPref rather than localStorage, so the choice
|
||||||
// travels with a copied data/ folder like every other UI preference here.
|
// travels with a copied data/ folder like every other UI preference here.
|
||||||
const [refSort, setRefSort] = useState<'ref' | 'name'>(
|
const [refSort, setRefSort] = useState<'ref' | 'name' | 'group'>(
|
||||||
() => (localStorage.getItem('opslog.awardRefSort') === 'name' ? 'name' : 'ref'));
|
() => {
|
||||||
|
const v = localStorage.getItem('opslog.awardRefSort');
|
||||||
|
return v === 'name' || v === 'group' ? v : 'ref';
|
||||||
|
});
|
||||||
const [refSortDir, setRefSortDir] = useState<'asc' | 'desc'>(
|
const [refSortDir, setRefSortDir] = useState<'asc' | 'desc'>(
|
||||||
() => (localStorage.getItem('opslog.awardRefSortDir') === 'desc' ? 'desc' : 'asc'));
|
() => (localStorage.getItem('opslog.awardRefSortDir') === 'desc' ? 'desc' : 'asc'));
|
||||||
const toggleRefSort = (k: 'ref' | 'name') => {
|
const toggleRefSort = (k: 'ref' | 'name' | 'group') => {
|
||||||
if (k === refSort) {
|
if (k === refSort) {
|
||||||
const d = refSortDir === 'asc' ? 'desc' : 'asc';
|
const d = refSortDir === 'asc' ? 'desc' : 'asc';
|
||||||
setRefSortDir(d);
|
setRefSortDir(d);
|
||||||
@@ -258,10 +275,26 @@ export function AwardsPanel({ onEditQSO, onAwardsChanged }: { onEditQSO?: (id: n
|
|||||||
if (c !== 0) return c * dir;
|
if (c !== 0) return c * dir;
|
||||||
return a.ref.localeCompare(b.ref) * dir; // stable tie-break
|
return a.ref.localeCompare(b.ref) * dir; // stable tie-break
|
||||||
}
|
}
|
||||||
|
if (refSort === 'group') {
|
||||||
|
// Prefix order (XE, YV, ZL…) — how a DX operator actually thinks about
|
||||||
|
// entities. Blank prefixes sink to the bottom regardless of direction,
|
||||||
|
// so an unresolved entity never heads the list.
|
||||||
|
const ag = a.group ?? '', bg = b.group ?? '';
|
||||||
|
if (!ag !== !bg) return ag ? -1 : 1;
|
||||||
|
const c = ag.localeCompare(bg, undefined, { sensitivity: 'base' });
|
||||||
|
if (c !== 0) return c * dir;
|
||||||
|
return a.ref.localeCompare(b.ref, undefined, { numeric: true }) * dir;
|
||||||
|
}
|
||||||
return a.ref.localeCompare(b.ref, undefined, { numeric: true }) * dir;
|
return a.ref.localeCompare(b.ref, undefined, { numeric: true }) * dir;
|
||||||
});
|
});
|
||||||
}, [current, refSearch, refFilter, modeFilter, refSort, refSortDir]);
|
}, [current, refSearch, refFilter, modeFilter, refSort, refSortDir]);
|
||||||
|
|
||||||
|
// The group column earns its width only when the list actually carries one
|
||||||
|
// (DXCC prefixes, POTA locations); most custom lists have none. For DXCC the
|
||||||
|
// value IS the primary prefix, so it is labelled as such.
|
||||||
|
const hasGroup = useMemo(() => filteredRefs.some((r) => !!r.group), [filteredRefs]);
|
||||||
|
const groupColLabel = current && current.code.toUpperCase() === 'DXCC' ? t('awp.prefixCol') : t('awp.groupCol');
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex h-full min-h-0">
|
<div className="flex h-full min-h-0">
|
||||||
{/* Award list */}
|
{/* Award list */}
|
||||||
@@ -459,6 +492,14 @@ export function AwardsPanel({ onEditQSO, onAwardsChanged }: { onEditQSO?: (id: n
|
|||||||
{refSort === 'ref' && (refSortDir === 'asc' ? <ChevronUp className="size-3" /> : <ChevronDown className="size-3" />)}
|
{refSort === 'ref' && (refSortDir === 'asc' ? <ChevronUp className="size-3" /> : <ChevronDown className="size-3" />)}
|
||||||
</button>
|
</button>
|
||||||
</th>
|
</th>
|
||||||
|
{hasGroup && (
|
||||||
|
<th className="text-left py-1.5 pr-3 font-medium border-b border-border w-20">
|
||||||
|
<button type="button" onClick={() => toggleRefSort('group')} className="inline-flex items-center gap-1 hover:text-foreground">
|
||||||
|
{groupColLabel}
|
||||||
|
{refSort === 'group' && (refSortDir === 'asc' ? <ChevronUp className="size-3" /> : <ChevronDown className="size-3" />)}
|
||||||
|
</button>
|
||||||
|
</th>
|
||||||
|
)}
|
||||||
<th className="text-left py-1.5 pr-3 font-medium border-b border-border">
|
<th className="text-left py-1.5 pr-3 font-medium border-b border-border">
|
||||||
<button type="button" onClick={() => toggleRefSort('name')} className="inline-flex items-center gap-1 hover:text-foreground">
|
<button type="button" onClick={() => toggleRefSort('name')} className="inline-flex items-center gap-1 hover:text-foreground">
|
||||||
{t('awp.description')}
|
{t('awp.description')}
|
||||||
@@ -474,9 +515,10 @@ export function AwardsPanel({ onEditQSO, onAwardsChanged }: { onEditQSO?: (id: n
|
|||||||
{filteredRefs.map((r) => (
|
{filteredRefs.map((r) => (
|
||||||
<tr key={r.ref} className={cn('hover:bg-accent/20', !r.worked && 'opacity-60')}>
|
<tr key={r.ref} className={cn('hover:bg-accent/20', !r.worked && 'opacity-60')}>
|
||||||
<td className="sticky left-0 bg-card hover:bg-accent/20 py-1 pr-2 font-mono font-semibold border-b border-border/30">{r.ref}</td>
|
<td className="sticky left-0 bg-card hover:bg-accent/20 py-1 pr-2 font-mono font-semibold border-b border-border/30">{r.ref}</td>
|
||||||
<td className="py-1 pr-3 text-muted-foreground truncate max-w-[360px] border-b border-border/30">
|
{hasGroup && (
|
||||||
{r.name}{r.group ? <span className="text-muted-foreground/60"> · {r.group}</span> : ''}
|
<td className="py-1 pr-3 font-mono font-semibold border-b border-border/30">{r.group}</td>
|
||||||
</td>
|
)}
|
||||||
|
<td className="py-1 pr-3 text-muted-foreground truncate max-w-[360px] border-b border-border/30">{r.name}</td>
|
||||||
{gridBands.map((b) => {
|
{gridBands.map((b) => {
|
||||||
const s = cellStatus(r, b);
|
const s = cellStatus(r, b);
|
||||||
return (
|
return (
|
||||||
@@ -513,7 +555,12 @@ export function AwardsPanel({ onEditQSO, onAwardsChanged }: { onEditQSO?: (id: n
|
|||||||
{refSort === 'name' && (refSortDir === 'asc' ? <ChevronUp className="size-3" /> : <ChevronDown className="size-3" />)}
|
{refSort === 'name' && (refSortDir === 'asc' ? <ChevronUp className="size-3" /> : <ChevronDown className="size-3" />)}
|
||||||
</button>
|
</button>
|
||||||
</th>
|
</th>
|
||||||
<th className="py-1.5 pr-2 font-medium w-40">{t('awp.groupCol')}</th>
|
<th className="py-1.5 pr-2 font-medium w-40">
|
||||||
|
<button type="button" onClick={() => toggleRefSort('group')} className="inline-flex items-center gap-1 hover:text-foreground">
|
||||||
|
{groupColLabel}
|
||||||
|
{refSort === 'group' && (refSortDir === 'asc' ? <ChevronUp className="size-3" /> : <ChevronDown className="size-3" />)}
|
||||||
|
</button>
|
||||||
|
</th>
|
||||||
<th className="py-1.5 pr-2 font-medium w-24">{t('awp.status')}</th>
|
<th className="py-1.5 pr-2 font-medium w-24">{t('awp.status')}</th>
|
||||||
<th className="py-1.5 font-medium">{t('awp.bands')}</th>
|
<th className="py-1.5 font-medium">{t('awp.bands')}</th>
|
||||||
</tr>
|
</tr>
|
||||||
|
|||||||
@@ -358,6 +358,43 @@ export function BandMap({ band, spots, spotStatus, currentFreqHz, onSpotClick, o
|
|||||||
return () => el.removeEventListener('wheel', onWheel);
|
return () => el.removeEventListener('wheel', onWheel);
|
||||||
}, [range]);
|
}, [range]);
|
||||||
|
|
||||||
|
// Ctrl+↑ / Ctrl+↓ hop to the next spot above / below the rig frequency and tune
|
||||||
|
// to it. Higher freq is UP on the map (see freqToY), so ↑ = next higher spot.
|
||||||
|
// Only active on the docked Main-view map (keyNav) and ignored while typing.
|
||||||
|
// MUST stay ABOVE the `if (!range)` early return below: on an unknown band
|
||||||
|
// (e.g. a spurious 33 cm CAT reading from an Icom) that return skipped this
|
||||||
|
// hook, so the hook count changed between renders and React crashed with #300
|
||||||
|
// ("rendered fewer hooks than expected"). lo/hi are always defined (they fall
|
||||||
|
// back to [0,1] when there's no range), so it's safe to run here.
|
||||||
|
useEffect(() => {
|
||||||
|
if (!keyNav) return;
|
||||||
|
const onKey = (e: KeyboardEvent) => {
|
||||||
|
if (!e.ctrlKey || e.altKey || e.metaKey) return;
|
||||||
|
if (e.key !== 'ArrowUp' && e.key !== 'ArrowDown') return;
|
||||||
|
const ae = document.activeElement as HTMLElement | null;
|
||||||
|
const tag = (ae?.tagName || '').toLowerCase();
|
||||||
|
if (tag === 'input' || tag === 'textarea' || tag === 'select' || ae?.isContentEditable) return;
|
||||||
|
const list = spots
|
||||||
|
.filter((s) => (s.band ?? '') === band && s.freq_hz > 0)
|
||||||
|
.slice()
|
||||||
|
.sort((a, b) => a.freq_hz - b.freq_hz);
|
||||||
|
if (!list.length) return;
|
||||||
|
const cur = currentFreqHz || (lo + hi) * 500; // mid-band kHz→Hz when no rig freq
|
||||||
|
const EPS = 50; // Hz, so we don't re-pick the spot we're already sitting on
|
||||||
|
let target: Spot | undefined;
|
||||||
|
if (e.key === 'ArrowUp') {
|
||||||
|
target = list.find((s) => s.freq_hz > cur + EPS);
|
||||||
|
} else {
|
||||||
|
for (let i = list.length - 1; i >= 0; i--) { if (list[i].freq_hz < cur - EPS) { target = list[i]; break; } }
|
||||||
|
}
|
||||||
|
if (!target) return;
|
||||||
|
e.preventDefault();
|
||||||
|
onSpotClick(target);
|
||||||
|
};
|
||||||
|
window.addEventListener('keydown', onKey);
|
||||||
|
return () => window.removeEventListener('keydown', onKey);
|
||||||
|
}, [keyNav, spots, band, currentFreqHz, lo, hi, onSpotClick]);
|
||||||
|
|
||||||
if (!range) {
|
if (!range) {
|
||||||
return (
|
return (
|
||||||
<div className="h-full w-full flex flex-col items-center justify-center text-xs text-muted-foreground p-3 bg-muted/20">
|
<div className="h-full w-full flex flex-col items-center justify-center text-xs text-muted-foreground p-3 bg-muted/20">
|
||||||
@@ -388,38 +425,6 @@ export function BandMap({ band, spots, spotStatus, currentFreqHz, onSpotClick, o
|
|||||||
scrollerRef.current.scrollTop = Math.max(0, y - containerH / 2);
|
scrollerRef.current.scrollTop = Math.max(0, y - containerH / 2);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Ctrl+↑ / Ctrl+↓ hop to the next spot above / below the rig frequency and tune
|
|
||||||
// to it. Higher freq is UP on the map (see freqToY), so ↑ = next higher spot.
|
|
||||||
// Only active on the docked Main-view map (keyNav) and ignored while typing.
|
|
||||||
useEffect(() => {
|
|
||||||
if (!keyNav) return;
|
|
||||||
const onKey = (e: KeyboardEvent) => {
|
|
||||||
if (!e.ctrlKey || e.altKey || e.metaKey) return;
|
|
||||||
if (e.key !== 'ArrowUp' && e.key !== 'ArrowDown') return;
|
|
||||||
const ae = document.activeElement as HTMLElement | null;
|
|
||||||
const tag = (ae?.tagName || '').toLowerCase();
|
|
||||||
if (tag === 'input' || tag === 'textarea' || tag === 'select' || ae?.isContentEditable) return;
|
|
||||||
const list = spots
|
|
||||||
.filter((s) => (s.band ?? '') === band && s.freq_hz > 0)
|
|
||||||
.slice()
|
|
||||||
.sort((a, b) => a.freq_hz - b.freq_hz);
|
|
||||||
if (!list.length) return;
|
|
||||||
const cur = currentFreqHz || (lo + hi) * 500; // mid-band kHz→Hz when no rig freq
|
|
||||||
const EPS = 50; // Hz, so we don't re-pick the spot we're already sitting on
|
|
||||||
let target: Spot | undefined;
|
|
||||||
if (e.key === 'ArrowUp') {
|
|
||||||
target = list.find((s) => s.freq_hz > cur + EPS);
|
|
||||||
} else {
|
|
||||||
for (let i = list.length - 1; i >= 0; i--) { if (list[i].freq_hz < cur - EPS) { target = list[i]; break; } }
|
|
||||||
}
|
|
||||||
if (!target) return;
|
|
||||||
e.preventDefault();
|
|
||||||
onSpotClick(target);
|
|
||||||
};
|
|
||||||
window.addEventListener('keydown', onKey);
|
|
||||||
return () => window.removeEventListener('keydown', onKey);
|
|
||||||
}, [keyNav, spots, band, currentFreqHz, lo, hi, onSpotClick]);
|
|
||||||
|
|
||||||
const currentKHz = currentFreqHz ? currentFreqHz / 1000 : 0;
|
const currentKHz = currentFreqHz ? currentFreqHz / 1000 : 0;
|
||||||
const showRigPointer = currentKHz >= lo && currentKHz <= hi;
|
const showRigPointer = currentKHz >= lo && currentKHz <= hi;
|
||||||
const rigY = freqToY(currentKHz);
|
const rigY = freqToY(currentKHz);
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
import { useMemo } from 'react';
|
import { useEffect, useMemo, useState } from 'react';
|
||||||
import { Star, Radio, Sunrise, Sunset } from 'lucide-react';
|
import { Star, Radio, Sunrise, Sunset, X, Loader2 } from 'lucide-react';
|
||||||
import { Badge } from '@/components/ui/badge';
|
import { Badge } from '@/components/ui/badge';
|
||||||
import { cn } from '@/lib/utils';
|
import { cn } from '@/lib/utils';
|
||||||
import { sunTimes } from '@/lib/sun';
|
import { sunTimes } from '@/lib/sun';
|
||||||
|
import { BandSlotQSOs } from '../../wailsjs/go/main/App';
|
||||||
import type { WorkedBeforeView } from '@/types';
|
import type { WorkedBeforeView } from '@/types';
|
||||||
|
|
||||||
type WorkedBefore = WorkedBeforeView;
|
type WorkedBefore = WorkedBeforeView;
|
||||||
@@ -18,6 +19,12 @@ interface Props {
|
|||||||
// to an entity with no position at all, and the block simply does not appear.
|
// to an entity with no position at all, and the block simply does not appear.
|
||||||
lat?: number;
|
lat?: number;
|
||||||
lon?: number;
|
lon?: number;
|
||||||
|
// Set when the matrix is showing a QSO picked in the log grid rather than the
|
||||||
|
// entry form — labelled so the two can never be confused.
|
||||||
|
forCall?: string;
|
||||||
|
// Open the QSO editor for a contact — makes callsigns in the cell drill-down
|
||||||
|
// clickable. Threaded down from App.openEdit.
|
||||||
|
onEditQso?: (id: number) => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Compact column label for a band tag: keep the classic V/U for 2m/70cm,
|
// Compact column label for a band tag: keep the classic V/U for 2m/70cm,
|
||||||
@@ -89,7 +96,9 @@ function cellTitle(band: string, cls: string, status: string, current: boolean):
|
|||||||
return `${band} ${cls}: ${desc}${current ? ' — current entry' : ''}`;
|
return `${band} ${cls}: ${desc}${current ? ' — current entry' : ''}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function BandSlotGrid({ wb, busy, currentBand, currentMode, bands, hasCall = true, lat, lon }: Props) {
|
export function BandSlotGrid({ wb, busy, currentBand, currentMode, bands, hasCall = true, lat, lon, forCall, onEditQso }: Props) {
|
||||||
|
// Cell drill-down: which band+class the operator clicked, or null.
|
||||||
|
const [slot, setSlot] = useState<{ band: string; cls: string } | null>(null);
|
||||||
// Columns from the operator's configured bands (so the matrix shows only the
|
// Columns from the operator's configured bands (so the matrix shows only the
|
||||||
// bands they actually use), falling back to the built-in default set.
|
// bands they actually use), falling back to the built-in default set.
|
||||||
const cols = useMemo(
|
const cols = useMemo(
|
||||||
@@ -208,6 +217,14 @@ export function BandSlotGrid({ wb, busy, currentBand, currentMode, bands, hasCal
|
|||||||
</>
|
</>
|
||||||
) : hasDxcc ? (
|
) : hasDxcc ? (
|
||||||
<>
|
<>
|
||||||
|
{/* Says WHOSE stats these are when they come from a row picked in
|
||||||
|
the log rather than from what's being typed. */}
|
||||||
|
{forCall && (
|
||||||
|
<Badge variant="outline" className="px-2 py-0.5 text-[10px] font-mono shrink-0"
|
||||||
|
title="Stats for the QSO selected in the log">
|
||||||
|
{forCall}
|
||||||
|
</Badge>
|
||||||
|
)}
|
||||||
<Badge className="bg-primary text-primary-foreground px-3 py-1 text-xs normal-case font-semibold tracking-normal">
|
<Badge className="bg-primary text-primary-foreground px-3 py-1 text-xs normal-case font-semibold tracking-normal">
|
||||||
{dxccName || `DXCC #${dxcc}`}
|
{dxccName || `DXCC #${dxcc}`}
|
||||||
</Badge>
|
</Badge>
|
||||||
@@ -282,10 +299,14 @@ export function BandSlotGrid({ wb, busy, currentBand, currentMode, bands, hasCal
|
|||||||
return (
|
return (
|
||||||
<td
|
<td
|
||||||
key={b.tag}
|
key={b.tag}
|
||||||
title={cellTitle(b.tag, cls, st, isCurrent)}
|
title={cellTitle(b.tag, cls, st, isCurrent) + (st ? ' — click to list the QSOs' : '')}
|
||||||
|
onClick={st ? () => setSlot({ band: b.tag, cls }) : undefined}
|
||||||
className={cn(
|
className={cn(
|
||||||
'w-[28px] h-[24px] rounded transition-colors p-0',
|
'w-[28px] h-[24px] rounded transition-colors p-0',
|
||||||
st ? STATUS_CLASSES[st] : 'bg-mx-none',
|
st ? STATUS_CLASSES[st] : 'bg-mx-none',
|
||||||
|
// Only a filled cell has anything to show — an empty one
|
||||||
|
// stays inert rather than opening a "no QSOs" dialog.
|
||||||
|
st && 'cursor-pointer hover:brightness-110',
|
||||||
isCurrent && 'ring-2 ring-warning ring-inset',
|
isCurrent && 'ring-2 ring-warning ring-inset',
|
||||||
)}
|
)}
|
||||||
/>
|
/>
|
||||||
@@ -313,6 +334,119 @@ export function BandSlotGrid({ wb, busy, currentBand, currentMode, bands, hasCal
|
|||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{slot && (
|
||||||
|
<SlotQSOModal
|
||||||
|
call={wb?.callsign ?? ''}
|
||||||
|
dxcc={dxcc}
|
||||||
|
entity={dxccName}
|
||||||
|
band={slot.band}
|
||||||
|
cls={slot.cls}
|
||||||
|
onClose={() => setSlot(null)}
|
||||||
|
onEdit={onEditQso}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
</section>
|
</section>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ── Cell drill-down ──────────────────────────────────────────────────────────
|
||||||
|
// The contacts behind one band+class cell: this exact callsign AND anyone else
|
||||||
|
// in the entity, because that is the pair of facts the cell's colour encodes.
|
||||||
|
// The call's own QSOs are marked so the two never blur together.
|
||||||
|
|
||||||
|
function SlotQSOModal({ call, dxcc, entity, band, cls, onClose, onEdit }: {
|
||||||
|
call: string; dxcc: number; entity: string; band: string; cls: string; onClose: () => void; onEdit?: (id: number) => void;
|
||||||
|
}) {
|
||||||
|
const [rows, setRows] = useState<any[] | null>(null);
|
||||||
|
const [err, setErr] = useState('');
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
let dead = false;
|
||||||
|
BandSlotQSOs(call, dxcc, band, cls)
|
||||||
|
.then((r: any) => { if (!dead) setRows((r ?? []) as any[]); })
|
||||||
|
.catch((e: any) => { if (!dead) { setErr(String(e?.message ?? e)); setRows([]); } });
|
||||||
|
return () => { dead = true; };
|
||||||
|
}, [call, dxcc, band, cls]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
// Capture phase: the app's global ESC handler resets the entry form, and
|
||||||
|
// closing a dialog must not also wipe what the operator was typing.
|
||||||
|
function onKey(e: KeyboardEvent) {
|
||||||
|
if (e.key === 'Escape') { e.stopImmediatePropagation(); e.preventDefault(); onClose(); }
|
||||||
|
}
|
||||||
|
window.addEventListener('keydown', onKey, true);
|
||||||
|
return () => window.removeEventListener('keydown', onKey, true);
|
||||||
|
}, [onClose]);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="fixed inset-0 z-50 flex items-center justify-center bg-black/60 backdrop-blur-[2px] p-4" onClick={onClose}>
|
||||||
|
<div className="bg-card border border-border rounded-xl shadow-2xl w-[760px] max-w-full max-h-[72vh] flex flex-col overflow-hidden ring-1 ring-black/5"
|
||||||
|
onClick={(e) => e.stopPropagation()}>
|
||||||
|
<div className="flex items-center gap-2.5 px-4 py-2.5 border-b border-border bg-muted/30">
|
||||||
|
<span className="inline-flex items-center justify-center h-6 min-w-6 px-1.5 rounded-md bg-primary/15 text-primary text-[11px] font-bold shrink-0 tabular-nums">{band}</span>
|
||||||
|
<div className="min-w-0">
|
||||||
|
<div className="font-semibold text-sm leading-tight truncate">
|
||||||
|
{cls}{entity && <span className="text-muted-foreground font-normal"> · {entity}</span>}
|
||||||
|
</div>
|
||||||
|
{onEdit && <div className="text-[10px] text-muted-foreground leading-tight">Click a callsign to edit the QSO</div>}
|
||||||
|
</div>
|
||||||
|
<span className="ml-auto text-xs text-muted-foreground tabular-nums shrink-0">{rows ? `${rows.length} QSO${rows.length > 1 ? 's' : ''}` : ''}</span>
|
||||||
|
<button type="button" onClick={onClose} className="text-muted-foreground hover:text-foreground shrink-0 rounded p-0.5 hover:bg-muted transition-colors">
|
||||||
|
<X className="size-4" />
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<div className="flex-1 overflow-auto">
|
||||||
|
{err && <p className="p-3 text-xs text-destructive">{err}</p>}
|
||||||
|
{!rows ? (
|
||||||
|
<p className="p-4 text-xs text-muted-foreground flex items-center gap-2">
|
||||||
|
<Loader2 className="size-3.5 animate-spin" /> Loading…
|
||||||
|
</p>
|
||||||
|
) : rows.length === 0 ? (
|
||||||
|
<p className="p-4 text-xs text-muted-foreground italic">No QSOs.</p>
|
||||||
|
) : (
|
||||||
|
<table className="w-full text-xs border-collapse">
|
||||||
|
<thead className="sticky top-0 z-10 bg-muted/80 backdrop-blur text-[10px] uppercase tracking-wider text-muted-foreground">
|
||||||
|
<tr>
|
||||||
|
<th className="text-left font-medium px-3 py-1.5">Date UTC</th>
|
||||||
|
<th className="text-left font-medium px-3 py-1.5">Callsign</th>
|
||||||
|
<th className="text-left font-medium px-3 py-1.5">Mode</th>
|
||||||
|
<th className="text-left font-medium px-3 py-1.5">Freq</th>
|
||||||
|
<th className="text-left font-medium px-3 py-1.5">Name</th>
|
||||||
|
<th className="text-center font-medium px-3 py-1.5">Cfm</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{rows.map((q, i) => {
|
||||||
|
const cfm = q.lotw_rcvd === 'Y' || q.eqsl_rcvd === 'Y' || q.qsl_rcvd === 'Y';
|
||||||
|
const mine = q.callsign === call;
|
||||||
|
return (
|
||||||
|
<tr key={q.id ?? i} className="border-t border-border/40 even:bg-muted/[0.06] hover:bg-primary/[0.06] transition-colors">
|
||||||
|
<td className="px-3 py-1.5 tabular-nums text-muted-foreground whitespace-nowrap">
|
||||||
|
{String(q.qso_date ?? '').slice(0, 16).replace('T', ' ')}
|
||||||
|
</td>
|
||||||
|
<td className="px-3 py-1.5">
|
||||||
|
{onEdit ? (
|
||||||
|
<button type="button" onClick={() => { onEdit(q.id as number); onClose(); }} title="Edit this QSO"
|
||||||
|
className={cn('font-mono cursor-pointer text-left hover:underline underline-offset-2', mine ? 'font-bold text-primary' : 'text-foreground hover:text-primary')}>
|
||||||
|
{q.callsign}
|
||||||
|
</button>
|
||||||
|
) : (
|
||||||
|
<span className={cn('font-mono', mine && 'font-bold text-primary')}>{q.callsign}</span>
|
||||||
|
)}
|
||||||
|
</td>
|
||||||
|
<td className="px-3 py-1.5">{q.mode}</td>
|
||||||
|
<td className="px-3 py-1.5 tabular-nums text-muted-foreground">{q.freq_hz ? (q.freq_hz / 1e6).toFixed(3) : ''}</td>
|
||||||
|
<td className="px-3 py-1.5 text-muted-foreground truncate max-w-[180px]">{q.name}</td>
|
||||||
|
<td className="px-3 py-1.5 text-center">{cfm ? <span className="text-success">✓</span> : <span className="text-muted-foreground/30">·</span>}</td>
|
||||||
|
</tr>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|||||||
@@ -140,6 +140,19 @@ function statusColor(s: SpotStatusEntry | undefined): string | null {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// isDull reports a spot that "represents nothing" under the current worked/slot
|
||||||
|
// rules: the entity/band/mode is already worked (status resolved, not new in any
|
||||||
|
// dimension), the callsign itself isn't in the log, and there's no POTA / county
|
||||||
|
// / prefix novelty. Such rows are dimmed so the eye skips them. Because the
|
||||||
|
// status obeys the DX-cluster "same slot" option and the digital-mode grouping,
|
||||||
|
// what counts as dull follows those settings automatically. Unresolved statuses
|
||||||
|
// (still loading, or entity unknown) are NOT dimmed — that would flicker.
|
||||||
|
function isDull(s: SpotStatusEntry | undefined): boolean {
|
||||||
|
if (!s || !s.status) return false;
|
||||||
|
if (s.status === 'new' || s.status === 'new-band' || s.status === 'new-mode' || s.status === 'new-slot') return false;
|
||||||
|
return !(s.worked_call || s.new_pota || s.new_county || s.new_pfx);
|
||||||
|
}
|
||||||
|
|
||||||
const makeColCatalog = (t: TFn): ColEntry[] => [
|
const makeColCatalog = (t: TFn): ColEntry[] => [
|
||||||
{
|
{
|
||||||
group: 'Spot', label: t('clg2.c.time'), colId: 'time',
|
group: 'Spot', label: t('clg2.c.time'), colId: 'time',
|
||||||
@@ -397,6 +410,11 @@ export function ClusterGrid({ rows, spotStatus, onSpotClick }: Props) {
|
|||||||
|
|
||||||
const defaultColDef = useMemo<ColDef>(() => ({
|
const defaultColDef = useMemo<ColDef>(() => ({
|
||||||
sortable: true, resizable: true, filter: true, suppressMovable: false,
|
sortable: true, resizable: true, filter: true, suppressMovable: false,
|
||||||
|
// Dim "represents nothing" spots at the CELL level, via a class that
|
||||||
|
// refreshCells re-applies. Doing it with a row STYLE needed redrawRows() on
|
||||||
|
// every status update, which re-rendered the whole grid continuously and
|
||||||
|
// pegged the CPU on a busy cluster (the 0.23.6 slowdown).
|
||||||
|
cellClassRules: { 'opacity-40': (p: any) => isDull(statusFor(p)) },
|
||||||
}), []);
|
}), []);
|
||||||
|
|
||||||
// Pass spotStatus through AG Grid's context so cell renderers can look up
|
// Pass spotStatus through AG Grid's context so cell renderers can look up
|
||||||
@@ -406,12 +424,22 @@ export function ClusterGrid({ rows, spotStatus, onSpotClick }: Props) {
|
|||||||
const context = useMemo(() => ({ spotStatus }), [spotStatus]);
|
const context = useMemo(() => ({ spotStatus }), [spotStatus]);
|
||||||
|
|
||||||
// Spot statuses arrive asynchronously (~after the rows render). The Call/Band/
|
// Spot statuses arrive asynchronously (~after the rows render). The Call/Band/
|
||||||
// Mode cellStyles depend on them but their cell VALUE doesn't change, so ag-grid
|
// Mode cellStyles and the dimmed "represents nothing" class depend on them but
|
||||||
// won't re-render those cells on its own — force a refresh so e.g. a worked call
|
// the cell VALUE doesn't change, so ag-grid won't re-render on its own — force a
|
||||||
// turns blue once its status loads.
|
// refresh so e.g. a worked call turns blue once its status loads.
|
||||||
|
//
|
||||||
|
// THROTTLED: under an RBN firehose spotStatus updates ~20×/second, and firing a
|
||||||
|
// full refreshCells that often is pure churn on a slow PC. Coalesce the bursts
|
||||||
|
// into one refresh every 200 ms (still imperceptible) instead of one per update.
|
||||||
|
const refreshPending = useRef<number | undefined>(undefined);
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
gridRef.current?.api?.refreshCells({ force: true });
|
if (refreshPending.current !== undefined) return; // a refresh is already queued
|
||||||
|
refreshPending.current = window.setTimeout(() => {
|
||||||
|
refreshPending.current = undefined;
|
||||||
|
gridRef.current?.api?.refreshCells({ force: true });
|
||||||
|
}, 200);
|
||||||
}, [spotStatus]);
|
}, [spotStatus]);
|
||||||
|
useEffect(() => () => { if (refreshPending.current !== undefined) window.clearTimeout(refreshPending.current); }, []);
|
||||||
|
|
||||||
// Restore AFTER the profile scope is known — this grid has no key= remount to
|
// Restore AFTER the profile scope is known — this grid has no key= remount to
|
||||||
// save it from reading the wrong (unscoped) cache key at first paint.
|
// save it from reading the wrong (unscoped) cache key at first paint.
|
||||||
|
|||||||
@@ -69,6 +69,14 @@ interface Props {
|
|||||||
band: string;
|
band: string;
|
||||||
mode: string;
|
mode: string;
|
||||||
bands?: string[]; // configured bands for the worked-before matrix columns
|
bands?: string[]; // configured bands for the worked-before matrix columns
|
||||||
|
// When the entry form is empty and a QSO is selected in the log grid, the
|
||||||
|
// Stats (F1) matrix shows THAT contact's entity instead of sitting blank.
|
||||||
|
// Only the matrix is redirected — every other tab still edits the live entry.
|
||||||
|
slotCall?: string;
|
||||||
|
slotBand?: string;
|
||||||
|
slotMode?: string;
|
||||||
|
slotWb?: any;
|
||||||
|
slotWbBusy?: boolean;
|
||||||
imageUrl?: string;
|
imageUrl?: string;
|
||||||
onOpenImage?: () => void;
|
onOpenImage?: () => void;
|
||||||
// Optional controlled active tab (so the app can switch it via keyboard).
|
// Optional controlled active tab (so the app can switch it via keyboard).
|
||||||
@@ -77,6 +85,8 @@ interface Props {
|
|||||||
// When the WinKeyer is active, F1-F12 fire macros, so the tab shortcut is
|
// When the WinKeyer is active, F1-F12 fire macros, so the tab shortcut is
|
||||||
// shown as Ctrl+F1…F5 instead of F1…F5.
|
// shown as Ctrl+F1…F5 instead of F1…F5.
|
||||||
keyerActive?: boolean;
|
keyerActive?: boolean;
|
||||||
|
// Open the QSO editor — makes callsigns clickable in the band-slot drill-down.
|
||||||
|
onEditQso?: (id: number) => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
export type TabName = 'stats' | 'info' | 'awards' | 'my' | 'extended';
|
export type TabName = 'stats' | 'info' | 'awards' | 'my' | 'extended';
|
||||||
@@ -139,7 +149,7 @@ function Field({ label, span = 1, className, children }: { label: string; span?:
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function DetailsPanel({ callsign, prefix, operatorGrid, remoteGrid, qth, name, country, comment, note, details, onChange, wb, wbBusy, band, mode, bands, tab, onTab, keyerActive }: Props) {
|
export function DetailsPanel({ callsign, prefix, operatorGrid, remoteGrid, qth, name, country, comment, note, details, onChange, wb, wbBusy, band, mode, bands, slotCall, slotBand, slotMode, slotWb, slotWbBusy, tab, onTab, keyerActive, onEditQso }: Props) {
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const [internalOpen, setInternalOpen] = useState<TabName>('stats');
|
const [internalOpen, setInternalOpen] = useState<TabName>('stats');
|
||||||
const open = tab ?? internalOpen; // controlled when `tab` is provided
|
const open = tab ?? internalOpen; // controlled when `tab` is provided
|
||||||
@@ -272,7 +282,15 @@ export function DetailsPanel({ callsign, prefix, operatorGrid, remoteGrid, qth,
|
|||||||
<div className={cn('flex-1 min-h-0', open === 'stats' ? 'overflow-hidden' : 'overflow-y-auto')}>
|
<div className={cn('flex-1 min-h-0', open === 'stats' ? 'overflow-hidden' : 'overflow-y-auto')}>
|
||||||
{open === 'stats' && (
|
{open === 'stats' && (
|
||||||
<div className="px-3 py-2.5">
|
<div className="px-3 py-2.5">
|
||||||
<BandSlotGrid wb={wb} busy={!!wbBusy} currentBand={band} currentMode={mode} bands={bands} hasCall={callsign.trim() !== ''}
|
<BandSlotGrid
|
||||||
|
wb={slotCall ? slotWb : wb}
|
||||||
|
busy={slotCall ? !!slotWbBusy : !!wbBusy}
|
||||||
|
currentBand={slotCall ? (slotBand ?? '') : band}
|
||||||
|
currentMode={slotCall ? (slotMode ?? '') : mode}
|
||||||
|
bands={bands}
|
||||||
|
hasCall={slotCall ? true : callsign.trim() !== ''}
|
||||||
|
forCall={slotCall}
|
||||||
|
onEditQso={onEditQso}
|
||||||
lat={dxLL?.lat} lon={dxLL?.lon} />
|
lat={dxLL?.lat} lon={dxLL?.lon} />
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -21,7 +21,13 @@ import { TailLogFile, GetLogFilePath } from '../../wailsjs/go/main/App';
|
|||||||
// 256 KB blob: with "cluster" or "acom" typed in, the window becomes exactly
|
// 256 KB blob: with "cluster" or "acom" typed in, the window becomes exactly
|
||||||
// the subsystem trace you would have grepped for.
|
// the subsystem trace you would have grepped for.
|
||||||
// • It polls only while open. A closed dialog costs nothing.
|
// • It polls only while open. A closed dialog costs nothing.
|
||||||
const TAIL_BYTES = 256 * 1024;
|
// 512 KB ≈ 3200 lines. The window is a sliding tail: once new lines push past it
|
||||||
|
// the oldest fall out of the fetched text entirely, so a small buffer dropped
|
||||||
|
// lines the operator was still reading during a busy trace (CAT/cluster/antenna
|
||||||
|
// polling). This is double the old 256 KB — 1 MB was tried but the per-second
|
||||||
|
// fetch + split + re-render of ~6500 lines made the window lag. 512 KB keeps a
|
||||||
|
// useful backlog while staying smooth. The backend caps this at 4 MB.
|
||||||
|
const TAIL_BYTES = 512 * 1024;
|
||||||
const POLL_MS = 1000;
|
const POLL_MS = 1000;
|
||||||
|
|
||||||
export function LogViewer({ open, onOpenChange }: { open: boolean; onOpenChange: (v: boolean) => void }) {
|
export function LogViewer({ open, onOpenChange }: { open: boolean; onOpenChange: (v: boolean) => void }) {
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import {
|
|||||||
Select, SelectTrigger, SelectValue, SelectContent, SelectItem,
|
Select, SelectTrigger, SelectValue, SelectContent, SelectItem,
|
||||||
} from '@/components/ui/select';
|
} from '@/components/ui/select';
|
||||||
import { cn } from '@/lib/utils';
|
import { cn } from '@/lib/utils';
|
||||||
import { FindQSOsForUpload, UploadQSOsManual, DownloadConfirmations, SyncPOTAHunterLog, ListQSO, BulkUpdateQSL, UploadCallsign, GetSlotStats } from '../../wailsjs/go/main/App';
|
import { FindQSOsForUpload, UploadQSOsManual, DownloadConfirmations, CancelConfirmations, SyncPOTAHunterLog, ListQSO, BulkUpdateQSL, UploadCallsign, GetSlotStats } from '../../wailsjs/go/main/App';
|
||||||
import { Input } from '@/components/ui/input';
|
import { Input } from '@/components/ui/input';
|
||||||
import { RecentQSOsGrid } from '@/components/RecentQSOsGrid';
|
import { RecentQSOsGrid } from '@/components/RecentQSOsGrid';
|
||||||
import { EventsOn } from '../../wailsjs/runtime/runtime';
|
import { EventsOn } from '../../wailsjs/runtime/runtime';
|
||||||
@@ -120,6 +120,10 @@ export function QSLManagerPanel({ onEditQSO }: { onEditQSO?: (id: number) => voi
|
|||||||
if (service === 'pota' || service === 'paper') { setUploadCall(''); return; }
|
if (service === 'pota' || service === 'paper') { setUploadCall(''); return; }
|
||||||
UploadCallsign(service).then((c) => setUploadCall(c || '')).catch(() => setUploadCall(''));
|
UploadCallsign(service).then((c) => setUploadCall(c || '')).catch(() => setUploadCall(''));
|
||||||
}, [service]);
|
}, [service]);
|
||||||
|
// Closing the QSL Manager (the tab's ×) unmounts this panel — cancel any download
|
||||||
|
// still running so a slow QRZ/LoTW sync doesn't keep going in the background and
|
||||||
|
// bleed its log into the next one.
|
||||||
|
useEffect(() => () => { CancelConfirmations().catch(() => {}); }, []);
|
||||||
const [potaSyncing, setPotaSyncing] = useState(false);
|
const [potaSyncing, setPotaSyncing] = useState(false);
|
||||||
const [potaRes, setPotaRes] = useState<POTASync | null>(null);
|
const [potaRes, setPotaRes] = useState<POTASync | null>(null);
|
||||||
const [potaErr, setPotaErr] = useState('');
|
const [potaErr, setPotaErr] = useState('');
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { useEffect, useMemo, useRef, useState } from 'react';
|
import { useEffect, useMemo, useRef, useState } from 'react';
|
||||||
import { Trash2, Search, Loader2, CalendarDays } from 'lucide-react';
|
import { Trash2, Search, Loader2, CalendarDays } from 'lucide-react';
|
||||||
import { LookupCallsign, LookupCallsignFresh, DXCCForCountry, GetAwardDefs, ComputeQSOAwardRefs, GetListsSettings } from '../../wailsjs/go/main/App';
|
import { LookupCallsign, LookupCallsignFresh, DXCCForCountry, GetAwardDefs, ComputeQSOAwardRefs, GetListsSettings, OpenExternalURL } from '../../wailsjs/go/main/App';
|
||||||
import { rstOptions, type RSTLists } from '@/lib/rst';
|
import { rstOptions, type RSTLists } from '@/lib/rst';
|
||||||
import { AwardRefSelector } from '@/components/AwardRefSelector';
|
import { AwardRefSelector } from '@/components/AwardRefSelector';
|
||||||
import { AdifExtrasEditor } from '@/components/AdifExtrasEditor';
|
import { AdifExtrasEditor } from '@/components/AdifExtrasEditor';
|
||||||
@@ -466,7 +466,22 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
|
|||||||
{/* Top: Callsign + RST + Fetch */}
|
{/* Top: Callsign + RST + Fetch */}
|
||||||
<div className="flex items-end gap-2 mb-3">
|
<div className="flex items-end gap-2 mb-3">
|
||||||
<div className="flex flex-col flex-1 min-w-0">
|
<div className="flex flex-col flex-1 min-w-0">
|
||||||
<Label>{t('qedit.callsign')}</Label>
|
<div className="flex items-center">
|
||||||
|
<Label>{t('qedit.callsign')}</Label>
|
||||||
|
{(draft.callsign ?? '').trim() && (
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
title={t('qrz.openTitle', { call: (draft.callsign ?? '').trim().toUpperCase() })}
|
||||||
|
onClick={() => {
|
||||||
|
const c = (draft.callsign ?? '').trim().toUpperCase().split('/').map(encodeURIComponent).join('/');
|
||||||
|
if (c) OpenExternalURL(`https://www.qrz.com/db/${c}`).catch((e: any) => setLocalErr(String(e?.message ?? e)));
|
||||||
|
}}
|
||||||
|
className="ml-auto shrink-0 inline-flex items-center gap-0.5 text-[9px] font-semibold normal-case tracking-wider text-primary hover:underline"
|
||||||
|
>
|
||||||
|
QRZ ↗
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
<Input className="font-mono text-lg font-bold tracking-wider uppercase h-10"
|
<Input className="font-mono text-lg font-bold tracking-wider uppercase h-10"
|
||||||
value={draft.callsign ?? ''} onChange={(e) => set('callsign', e.target.value)} />
|
value={draft.callsign ?? ''} onChange={(e) => set('callsign', e.target.value)} />
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -56,6 +56,10 @@ type Props = {
|
|||||||
onRowDoubleClicked?: (q: QSOForm) => void;
|
onRowDoubleClicked?: (q: QSOForm) => void;
|
||||||
onRowClicked?: (q: QSOForm) => void;
|
onRowClicked?: (q: QSOForm) => void;
|
||||||
onRowSelected?: (ids: number[]) => void;
|
onRowSelected?: (ids: number[]) => void;
|
||||||
|
// The full first selected row — the Stats (F1) panel shows its entity when the
|
||||||
|
// entry form is empty, so browsing the log answers "what have I got with this
|
||||||
|
// one?" without retyping the call.
|
||||||
|
onRowSelectedQso?: (row: QSOForm | null) => void;
|
||||||
onUpdateFromCty?: (ids: number[]) => void;
|
onUpdateFromCty?: (ids: number[]) => void;
|
||||||
onUpdateFromQRZ?: (ids: number[]) => void;
|
onUpdateFromQRZ?: (ids: number[]) => void;
|
||||||
onUpdateFromClublog?: (ids: number[]) => void;
|
onUpdateFromClublog?: (ids: number[]) => void;
|
||||||
@@ -283,7 +287,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, myGrid, selectAllSignal, selectRowSignal, rowDragCall, passOrder, onGridApi, storageKey, onRowDoubleClicked, onRowClicked, onRowSelected, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onSendTo, onSendRecording, onSendEQSL, onBulkEdit, onExportSelected, onExportSelectedFields, onExportFiltered, onExportCabrilloSelected, onExportCabrilloFiltered, onDelete, onFilteredCountChange, awardCols }: Props) {
|
export function RecentQSOsGrid({ rows, myGrid, selectAllSignal, selectRowSignal, rowDragCall, passOrder, onGridApi, storageKey, onRowDoubleClicked, onRowClicked, onRowSelected, onRowSelectedQso, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onSendTo, onSendRecording, onSendEQSL, onBulkEdit, onExportSelected, onExportSelectedFields, 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);
|
||||||
@@ -542,6 +546,7 @@ export function RecentQSOsGrid({ rows, myGrid, selectAllSignal, selectRowSignal,
|
|||||||
setSelCount(sel.length);
|
setSelCount(sel.length);
|
||||||
setDispCount(api?.getDisplayedRowCount?.() ?? 0);
|
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));
|
||||||
|
onRowSelectedQso?.(sel[0] ?? null);
|
||||||
}
|
}
|
||||||
// Select every row when the caller bumps selectAllSignal (QSL Manager search).
|
// Select every row when the caller bumps selectAllSignal (QSL Manager search).
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import { useEffect, useMemo, useRef, useState } from 'react';
|
|||||||
import {
|
import {
|
||||||
ArrowDown, ArrowUp, ArrowLeft, ArrowRight, Copy, Plus, Star, StarOff, Trash2,
|
ArrowDown, ArrowUp, ArrowLeft, ArrowRight, Copy, Plus, Star, StarOff, Trash2,
|
||||||
ChevronDown, ChevronRight,
|
ChevronDown, ChevronRight,
|
||||||
User, Database, Radio, Cog, Server, Award, Antenna as AntennaIcon,
|
User, Database, Radio, Cog, Server, Antenna as AntennaIcon,
|
||||||
Compass, Wifi, Construction, UploadCloud, Loader2, FolderOpen, Play, Power, Check, Pencil,
|
Compass, Wifi, Construction, UploadCloud, Loader2, FolderOpen, Play, Power, Check, Pencil,
|
||||||
} from 'lucide-react';
|
} from 'lucide-react';
|
||||||
import {
|
import {
|
||||||
@@ -50,6 +50,7 @@ import {
|
|||||||
GetFlexState, GetFlexBandAntennas, SaveFlexBandAntennas, GetFlexBandPower, SaveFlexBandPower,
|
GetFlexState, GetFlexBandAntennas, SaveFlexBandAntennas, GetFlexBandPower, SaveFlexBandPower,
|
||||||
GetADIFMonitor, SaveADIFMonitor, PickADIFMonitorFile,
|
GetADIFMonitor, SaveADIFMonitor, PickADIFMonitorFile,
|
||||||
GetRelayAuto, SaveRelayAuto, GetStationDevices,
|
GetRelayAuto, SaveRelayAuto, GetStationDevices,
|
||||||
|
GetAwardDefs, GetTrackedAwards, SaveTrackedAwards,
|
||||||
} from '../../wailsjs/go/main/App';
|
} from '../../wailsjs/go/main/App';
|
||||||
import type { profile as profileModels } from '../../wailsjs/go/models';
|
import type { profile as profileModels } from '../../wailsjs/go/models';
|
||||||
import type { LookupSettingsForm, StationSettingsForm, ListsSettingsForm, ModePresetForm } from '@/types';
|
import type { LookupSettingsForm, StationSettingsForm, ListsSettingsForm, ModePresetForm } from '@/types';
|
||||||
@@ -254,6 +255,7 @@ function buildTree(flexAvailable: boolean, t: (k: string) => string): TreeNode[]
|
|||||||
{ kind: 'item', label: t('sec.profiles'), id: 'profiles' },
|
{ kind: 'item', label: t('sec.profiles'), id: 'profiles' },
|
||||||
{ kind: 'item', label: t('sec.operating'), id: 'operating' },
|
{ kind: 'item', label: t('sec.operating'), id: 'operating' },
|
||||||
{ kind: 'item', label: t('sec.confirmations'), id: 'confirmations' },
|
{ kind: 'item', label: t('sec.confirmations'), id: 'confirmations' },
|
||||||
|
{ kind: 'item', label: t('sec.awards'), id: 'awards' },
|
||||||
{ kind: 'item', label: t('sec.external'), id: 'external-services' },
|
{ kind: 'item', label: t('sec.external'), id: 'external-services' },
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
@@ -673,6 +675,9 @@ type AmpUI = { id: string; name: string; enabled: boolean; type: string; transpo
|
|||||||
type RelayRuleUI = { device_id: string; relay: number; mode: string; freq_lo_khz: number; freq_hi_khz: number; bands: string[] };
|
type RelayRuleUI = { device_id: string; relay: number; mode: string; freq_lo_khz: number; freq_hi_khz: number; bands: string[] };
|
||||||
type StationDevUI = { id: string; type: string; name: string; labels: string[] };
|
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'];
|
||||||
|
// Bands a motorized HF/6 m antenna (Ultrabeam / SteppIR) can cover — the follow
|
||||||
|
// filter is a subset of these. Must match motorBands in app.go, low → high.
|
||||||
|
const MOTOR_BANDS = ['40m', '30m', '20m', '17m', '15m', '12m', '10m', '6m'];
|
||||||
const relayCountUI = (type: string) => (type === 'kmtronic' || type === 'denkovi' ? 8 : 5);
|
const relayCountUI = (type: string) => (type === 'kmtronic' || type === 'denkovi' ? 8 : 5);
|
||||||
|
|
||||||
// Live status + OPERATE/STANDBY toggle for ONE configured amplifier (by config
|
// Live status + OPERATE/STANDBY toggle for ONE configured amplifier (by config
|
||||||
@@ -941,6 +946,91 @@ function FlexDiscover({ onPick }: { onPick: (ip: string, port: number) => void }
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// AwardsSelectionPanel is a two-column transfer list: every defined award on the
|
||||||
|
// left, the ones the operator follows on the right. The Awards tab shows only the
|
||||||
|
// followed set (empty = all). Per-profile, saved immediately (local SQLite).
|
||||||
|
function AwardsSelectionPanel({ profile }: { profile?: { name?: string; callsign?: string } }) {
|
||||||
|
const { t } = useI18n();
|
||||||
|
const [all, setAll] = useState<{ code: string; name: string }[]>([]);
|
||||||
|
const [tracked, setTracked] = useState<string[]>([]);
|
||||||
|
const [err, setErr] = useState('');
|
||||||
|
const [q, setQ] = useState('');
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
(async () => {
|
||||||
|
try {
|
||||||
|
const [defs, tr] = await Promise.all([
|
||||||
|
GetAwardDefs().then((d) => (d ?? []) as any[]),
|
||||||
|
GetTrackedAwards().then((v) => (v ?? []) as string[]).catch(() => [] as string[]),
|
||||||
|
]);
|
||||||
|
setAll(defs.map((d) => ({ code: d.code, name: d.name })).sort((a, b) => a.code.localeCompare(b.code)));
|
||||||
|
setTracked(tr);
|
||||||
|
} catch (e: any) { setErr(String(e?.message ?? e)); }
|
||||||
|
})();
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
async function persist(next: string[]) {
|
||||||
|
setTracked(next);
|
||||||
|
try { await SaveTrackedAwards(next); } catch (e: any) { setErr(String(e?.message ?? e)); }
|
||||||
|
}
|
||||||
|
const trackedSet = new Set(tracked);
|
||||||
|
const byCode = new Map(all.map((a) => [a.code, a] as const));
|
||||||
|
const needle = q.trim().toLowerCase();
|
||||||
|
const available = all.filter((a) => !trackedSet.has(a.code)
|
||||||
|
&& (needle === '' || `${a.code} ${a.name}`.toLowerCase().includes(needle)));
|
||||||
|
const trackedItems = (tracked.map((c) => byCode.get(c)).filter(Boolean) as { code: string; name: string }[])
|
||||||
|
.sort((a, b) => a.code.localeCompare(b.code));
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div>
|
||||||
|
<SectionHeader title={t('sec.awards')} hint={t('awards.followHint')} />
|
||||||
|
<ProfileScopeNote profile={profile} />
|
||||||
|
{err && <div className="mb-2 text-xs text-destructive">{err}</div>}
|
||||||
|
<div className="grid grid-cols-2 gap-3">
|
||||||
|
<div className="rounded-lg border border-border bg-card/40 flex flex-col">
|
||||||
|
<div className="flex items-center justify-between px-3 py-2 border-b border-border/60">
|
||||||
|
<span className="text-sm font-medium">{t('awards.available')} <span className="text-muted-foreground">({available.length})</span></span>
|
||||||
|
<button type="button" className="text-xs text-primary hover:underline disabled:opacity-40"
|
||||||
|
disabled={available.length === 0} onClick={() => persist(all.map((a) => a.code))}>{t('awards.addAll')}</button>
|
||||||
|
</div>
|
||||||
|
<div className="p-2 border-b border-border/60">
|
||||||
|
<Input value={q} onChange={(e) => setQ(e.target.value)} placeholder={t('awards.search')} className="h-8" />
|
||||||
|
</div>
|
||||||
|
<div className="max-h-[340px] overflow-y-auto p-1.5 space-y-0.5">
|
||||||
|
{available.map((a) => (
|
||||||
|
<button key={a.code} type="button" onClick={() => persist([...tracked, a.code])}
|
||||||
|
className="group w-full flex items-center gap-2 rounded-md px-2 py-1 text-left hover:bg-primary/10">
|
||||||
|
<span className="font-mono text-xs shrink-0">{a.code}</span>
|
||||||
|
<span className="text-xs text-muted-foreground truncate flex-1">{a.name}</span>
|
||||||
|
<span className="text-primary opacity-0 group-hover:opacity-100">→</span>
|
||||||
|
</button>
|
||||||
|
))}
|
||||||
|
{available.length === 0 && <div className="p-2 text-xs text-muted-foreground">{t('awards.allTracked')}</div>}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="rounded-lg border border-primary/40 bg-primary/5 flex flex-col">
|
||||||
|
<div className="flex items-center justify-between px-3 py-2 border-b border-border/60">
|
||||||
|
<span className="text-sm font-medium">{t('awards.followed')} <span className="text-muted-foreground">({tracked.length})</span></span>
|
||||||
|
<button type="button" className="text-xs text-primary hover:underline disabled:opacity-40"
|
||||||
|
disabled={tracked.length === 0} onClick={() => persist([])}>{t('awards.clear')}</button>
|
||||||
|
</div>
|
||||||
|
<div className="max-h-[392px] overflow-y-auto p-1.5 space-y-0.5">
|
||||||
|
{trackedItems.map((a) => (
|
||||||
|
<button key={a.code} type="button" onClick={() => persist(tracked.filter((c) => c !== a.code))}
|
||||||
|
className="group w-full flex items-center gap-2 rounded-md px-2 py-1 text-left hover:bg-primary/10">
|
||||||
|
<span className="text-muted-foreground opacity-0 group-hover:opacity-100">←</span>
|
||||||
|
<span className="font-mono text-xs shrink-0">{a.code}</span>
|
||||||
|
<span className="text-xs text-muted-foreground truncate flex-1">{a.name}</span>
|
||||||
|
</button>
|
||||||
|
))}
|
||||||
|
{tracked.length === 0 && <div className="p-2 text-xs text-muted-foreground">{t('awards.noneFollowed')}</div>}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
function ComingSoon({ id, icon: Icon }: { id: SectionId; icon?: any }) {
|
function ComingSoon({ id, icon: Icon }: { id: SectionId; icon?: any }) {
|
||||||
const label = SECTION_LABELS[id] ?? id;
|
const label = SECTION_LABELS[id] ?? id;
|
||||||
const IconCmp = Icon ?? Construction;
|
const IconCmp = Icon ?? Construction;
|
||||||
@@ -1136,7 +1226,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
const [modeDraft, setModeDraft] = useState('');
|
const [modeDraft, setModeDraft] = useState('');
|
||||||
const [catCfg, setCatCfg] = useState<CATSettings>({
|
const [catCfg, setCatCfg] = useState<CATSettings>({
|
||||||
enabled: false, backend: 'omnirig', omnirig_rig: 1, omnirig_vfo: '', flex_host: '', flex_port: 4992, flex_spots: false, flex_decode_spots: false, flex_decode_secs: 120,
|
enabled: false, backend: 'omnirig', omnirig_rig: 1, omnirig_vfo: '', flex_host: '', flex_port: 4992, flex_spots: false, flex_decode_spots: false, flex_decode_secs: 120,
|
||||||
yaesu_port: '', yaesu_baud: 38400, yaesu_low_lines: false, kenwood_low_lines: false, kenwood_port: '', kenwood_baud: 9600, kenwood_host: '', xiegu_port: '', xiegu_baud: 19200, xiegu_addr: 0x70, xiegu_ptt_line: '',
|
yaesu_port: '', yaesu_baud: 38400, yaesu_low_lines: false, kenwood_low_lines: false, kenwood_port: '', kenwood_baud: 9600, kenwood_host: '', kenwood_data_mode: 'usb', xiegu_port: '', xiegu_baud: 19200, xiegu_addr: 0x70, xiegu_ptt_line: '',
|
||||||
icom_port: '', icom_baud: 115200, icom_addr: 0x98, icom_net_host: '', icom_net_user: '', icom_net_pass: '', icom_net_audio: false,
|
icom_port: '', icom_baud: 115200, icom_addr: 0x98, icom_net_host: '', icom_net_user: '', icom_net_pass: '', icom_net_audio: false,
|
||||||
tci_host: '', tci_port: 40001, tci_spots: false, poll_ms: 250, delay_ms: 0,
|
tci_host: '', tci_port: 40001, tci_spots: false, poll_ms: 250, delay_ms: 0,
|
||||||
digital_default: 'FT8', share_enabled: false, share_port: 4532,
|
digital_default: 'FT8', share_enabled: false, share_port: 4532,
|
||||||
@@ -1149,8 +1239,8 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
const [rotatorTest, setRotatorTest] = useState<{ ok: boolean; msg: string } | null>(null);
|
const [rotatorTest, setRotatorTest] = useState<{ ok: boolean; msg: string } | null>(null);
|
||||||
|
|
||||||
// Motorized antenna (Ultrabeam TCP or SteppIR TCP/serial) settings.
|
// Motorized antenna (Ultrabeam TCP or SteppIR TCP/serial) settings.
|
||||||
const [ultrabeam, setUltrabeam] = useState<{ enabled: boolean; type: string; transport: string; host: string; port: number; com: string; baud: number; follow: boolean; step_khz: number; tx_inhibit: boolean; freq_min_mhz: number; freq_max_mhz: number }>({
|
const [ultrabeam, setUltrabeam] = useState<{ enabled: boolean; type: string; transport: string; host: string; port: number; com: string; baud: number; follow: boolean; step_khz: number; tx_inhibit: boolean; bands: string[]; freq_min_mhz: number; freq_max_mhz: number }>({
|
||||||
enabled: false, type: 'ultrabeam', transport: 'tcp', host: '', port: 23, com: '', baud: 9600, follow: false, step_khz: 50, tx_inhibit: false, freq_min_mhz: 13, freq_max_mhz: 54,
|
enabled: false, type: 'ultrabeam', transport: 'tcp', host: '', port: 23, com: '', baud: 9600, follow: false, step_khz: 50, tx_inhibit: false, bands: [], freq_min_mhz: 13, freq_max_mhz: 54,
|
||||||
});
|
});
|
||||||
const [ubTesting, setUbTesting] = useState(false);
|
const [ubTesting, setUbTesting] = useState(false);
|
||||||
const [ubTest, setUbTest] = useState<{ ok: boolean; msg: string } | null>(null);
|
const [ubTest, setUbTest] = useState<{ ok: boolean; msg: string } | null>(null);
|
||||||
@@ -1246,6 +1336,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
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 [groupDigital, setGroupDigital] = useState(() => localStorage.getItem('opslog.groupDigitalSlots') === '1');
|
||||||
|
const [clusterWorkedSameSlot, setClusterWorkedSameSlot] = useState(() => localStorage.getItem('opslog.clusterWorkedSameSlot') === '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.
|
||||||
@@ -2595,9 +2686,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
||||||
<Checkbox checked={civTrace} onCheckedChange={(c) => { setCivTrace(!!c); SetCIVTrace(!!c); }} />
|
<Checkbox checked={civTrace} onCheckedChange={(c) => { setCivTrace(!!c); SetCIVTrace(!!c); }} />
|
||||||
{t('cat.civTrace')}
|
{t('cat.civTrace')}
|
||||||
</label>
|
</label> </div>
|
||||||
<p className="text-[10px] text-muted-foreground mt-1">{t('cat.civTraceHint')}</p>
|
|
||||||
</div>
|
|
||||||
)}
|
)}
|
||||||
{catCfg.backend === 'kenwood' && (
|
{catCfg.backend === 'kenwood' && (
|
||||||
<>
|
<>
|
||||||
@@ -2613,9 +2702,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
</Select>
|
</Select>
|
||||||
<Button type="button" variant="outline" size="sm"
|
<Button type="button" variant="outline" size="sm"
|
||||||
onClick={() => ListSerialPorts().then((p) => setWkPorts((p ?? []) as string[])).catch(() => {})}>↻</Button>
|
onClick={() => ListSerialPorts().then((p) => setWkPorts((p ?? []) as string[])).catch(() => {})}>↻</Button>
|
||||||
</div>
|
</div> </div>
|
||||||
<span className="text-xs text-muted-foreground">{t('cat.kenwoodPortHint')}</span>
|
|
||||||
</div>
|
|
||||||
<div className="space-y-1">
|
<div className="space-y-1">
|
||||||
<Label>{t('cat.baud')}</Label>
|
<Label>{t('cat.baud')}</Label>
|
||||||
<Select value={String(catCfg.kenwood_baud || 9600)} onValueChange={(v) => setCatCfg((s) => ({ ...s, kenwood_baud: parseInt(v) || 9600 }))}>
|
<Select value={String(catCfg.kenwood_baud || 9600)} onValueChange={(v) => setCatCfg((s) => ({ ...s, kenwood_baud: parseInt(v) || 9600 }))}>
|
||||||
@@ -2623,18 +2710,14 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
<SelectContent>
|
<SelectContent>
|
||||||
{[4800, 9600, 19200, 38400, 57600, 115200].map((r) => <SelectItem key={r} value={String(r)}>{r}</SelectItem>)}
|
{[4800, 9600, 19200, 38400, 57600, 115200].map((r) => <SelectItem key={r} value={String(r)}>{r}</SelectItem>)}
|
||||||
</SelectContent>
|
</SelectContent>
|
||||||
</Select>
|
</Select> </div>
|
||||||
<span className="text-xs text-muted-foreground">{t('cat.kenwoodBaudHint')}</span>
|
|
||||||
</div>
|
|
||||||
<div className="space-y-1">
|
<div className="space-y-1">
|
||||||
<Label>{t('cat.kenwoodHost')}</Label>
|
<Label>{t('cat.kenwoodHost')}</Label>
|
||||||
<Input
|
<Input
|
||||||
value={catCfg.kenwood_host || ''}
|
value={catCfg.kenwood_host || ''}
|
||||||
placeholder="192.168.1.50:4532"
|
placeholder="192.168.1.50:4532"
|
||||||
onChange={(e) => setCatCfg((s) => ({ ...s, kenwood_host: e.target.value }))}
|
onChange={(e) => setCatCfg((s) => ({ ...s, kenwood_host: e.target.value }))}
|
||||||
/>
|
/> </div>
|
||||||
<span className="text-xs text-muted-foreground">{t('cat.kenwoodHostHint')}</span>
|
|
||||||
</div>
|
|
||||||
<div className="space-y-1">
|
<div className="space-y-1">
|
||||||
<label className="flex items-center gap-2 text-xs cursor-pointer">
|
<label className="flex items-center gap-2 text-xs cursor-pointer">
|
||||||
<Checkbox checked={!!catCfg.kenwood_low_lines} onCheckedChange={(c) => setCatCfg((s) => ({ ...s, kenwood_low_lines: !!c }))} />
|
<Checkbox checked={!!catCfg.kenwood_low_lines} onCheckedChange={(c) => setCatCfg((s) => ({ ...s, kenwood_low_lines: !!c }))} />
|
||||||
@@ -2642,6 +2725,16 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
</label>
|
</label>
|
||||||
<span className="text-xs text-muted-foreground">{t('cat.lowerLinesHint')}</span>
|
<span className="text-xs text-muted-foreground">{t('cat.lowerLinesHint')}</span>
|
||||||
</div>
|
</div>
|
||||||
|
<div className="space-y-1">
|
||||||
|
<Label>{t('cat.kwDataMode')}</Label>
|
||||||
|
<Select value={(catCfg as any).kenwood_data_mode || 'usb'} onValueChange={(v) => setCatCfg((s) => ({ ...s, kenwood_data_mode: v } as any))}>
|
||||||
|
<SelectTrigger className="h-8"><SelectValue /></SelectTrigger>
|
||||||
|
<SelectContent>
|
||||||
|
<SelectItem value="usb">{t('cat.kwDataUsb')}</SelectItem>
|
||||||
|
<SelectItem value="data">{t('cat.kwDataMd6')}</SelectItem>
|
||||||
|
<SelectItem value="keep">{t('cat.kwDataKeep')}</SelectItem>
|
||||||
|
</SelectContent>
|
||||||
|
</Select> </div>
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
{catCfg.backend === 'icom' && (
|
{catCfg.backend === 'icom' && (
|
||||||
@@ -2855,9 +2948,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
onCheckedChange={(c) => setCatCfg((s) => ({ ...s, ptt_hotkey_toggle: !!c } as any))}
|
onCheckedChange={(c) => setCatCfg((s) => ({ ...s, ptt_hotkey_toggle: !!c } as any))}
|
||||||
/>
|
/>
|
||||||
{t('cat.pttKeyToggle')}
|
{t('cat.pttKeyToggle')}
|
||||||
</label>
|
</label> </>
|
||||||
<p className="text-[11px] text-muted-foreground">{t('cat.pttKeyHint')}</p>
|
|
||||||
</>
|
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
{catCfg.backend === 'omnirig' && (
|
{catCfg.backend === 'omnirig' && (
|
||||||
@@ -3011,20 +3102,28 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
{isSteppir && (
|
{(isSteppir || ultrabeam.type === 'ultrabeam') && (
|
||||||
<div className="border-t border-border/60 pt-3 space-y-1">
|
<div className="border-t border-border/60 pt-3 space-y-2">
|
||||||
<div className="flex items-center gap-2 flex-wrap">
|
<Label className="text-sm">{t('hw.motorBands')}</Label>
|
||||||
<Label className="text-sm">{t('hw.steppirRange')}</Label>
|
<div className="flex items-center gap-1.5 flex-wrap">
|
||||||
<input type="number" min={1} max={60} value={ultrabeam.freq_min_mhz}
|
{MOTOR_BANDS.map((b) => {
|
||||||
onChange={(e) => setUltrabeam((s) => ({ ...s, freq_min_mhz: parseInt(e.target.value, 10) || 0 }))}
|
const on = ultrabeam.bands.includes(b);
|
||||||
className="h-8 w-16 rounded-md border border-input bg-background px-2 text-sm" />
|
return (
|
||||||
<span className="text-xs text-muted-foreground">–</span>
|
<button key={b} type="button"
|
||||||
<input type="number" min={1} max={60} value={ultrabeam.freq_max_mhz}
|
onClick={() => setUltrabeam((s) => ({
|
||||||
onChange={(e) => setUltrabeam((s) => ({ ...s, freq_max_mhz: parseInt(e.target.value, 10) || 0 }))}
|
...s,
|
||||||
className="h-8 w-16 rounded-md border border-input bg-background px-2 text-sm" />
|
bands: on ? s.bands.filter((x) => x !== b) : [...s.bands, b],
|
||||||
<span className="text-xs text-muted-foreground">MHz</span>
|
}))}
|
||||||
|
className={`h-8 min-w-[3rem] rounded-md border px-2 text-sm font-medium transition-colors ${
|
||||||
|
on
|
||||||
|
? 'border-primary bg-primary/15 text-primary'
|
||||||
|
: 'border-input bg-background text-muted-foreground hover:bg-muted'
|
||||||
|
}`}>
|
||||||
|
{b}
|
||||||
|
</button>
|
||||||
|
);
|
||||||
|
})}
|
||||||
</div>
|
</div>
|
||||||
<p className="text-xs text-muted-foreground">{t('hw.steppirRangeHint')}</p>
|
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
<div className="border-t border-border/60 pt-3 space-y-1">
|
<div className="border-t border-border/60 pt-3 space-y-1">
|
||||||
@@ -3387,6 +3486,8 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
const dev = d as any;
|
const dev = d as any;
|
||||||
const isRG = dev.type === 'rotgenius';
|
const isRG = dev.type === 'rotgenius';
|
||||||
const isARCO = dev.type === 'arco';
|
const isARCO = dev.type === 'arco';
|
||||||
|
const isDCU1 = dev.type === 'dcu1';
|
||||||
|
const isSerialCap = isARCO || isDCU1; // COM-port or serial-over-IP controllers
|
||||||
const transport = dev.transport ?? 'tcp';
|
const transport = dev.transport ?? 'tcp';
|
||||||
return (
|
return (
|
||||||
<div key={dev.id || i} className="rounded-xl border border-border bg-card/40 p-3 space-y-3">
|
<div key={dev.id || i} className="rounded-xl border border-border bg-card/40 p-3 space-y-3">
|
||||||
@@ -3405,12 +3506,13 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
{/* Each backend gets its default port: Rotator Genius 9006, ARCO 4001
|
{/* Each backend gets its default port: Rotator Genius 9006, ARCO 4001
|
||||||
(placeholder — must match the ARCO's LAN menu), PstRotator 12000. */}
|
(placeholder — must match the ARCO's LAN menu), PstRotator 12000. */}
|
||||||
<Select value={dev.type ?? 'pst'}
|
<Select value={dev.type ?? 'pst'}
|
||||||
onValueChange={(v) => patch(i, { type: v as any, port: v === 'rotgenius' ? 9006 : v === 'arco' ? 4001 : 12000 })}>
|
onValueChange={(v) => patch(i, { type: v as any, port: v === 'rotgenius' ? 9006 : (v === 'arco' || v === 'dcu1') ? 4001 : 12000, ...(v === 'dcu1' ? { transport: 'serial' } : {}) })}>
|
||||||
<SelectTrigger className="h-9"><SelectValue /></SelectTrigger>
|
<SelectTrigger className="h-9"><SelectValue /></SelectTrigger>
|
||||||
<SelectContent>
|
<SelectContent>
|
||||||
<SelectItem value="pst">PstRotator (UDP)</SelectItem>
|
<SelectItem value="pst">PstRotator (UDP)</SelectItem>
|
||||||
<SelectItem value="rotgenius">Rotator Genius (4O3A, native)</SelectItem>
|
<SelectItem value="rotgenius">Rotator Genius (4O3A, native)</SelectItem>
|
||||||
<SelectItem value="arco">GS-232A controller (microHAM ARCO, ERC…)</SelectItem>
|
<SelectItem value="arco">GS-232A controller (microHAM ARCO, ERC…)</SelectItem>
|
||||||
|
<SelectItem value="dcu1">Hy-Gain DCU-1 (RotorCard DXA, Rotor-EZ, Green Heron)</SelectItem>
|
||||||
</SelectContent>
|
</SelectContent>
|
||||||
</Select>
|
</Select>
|
||||||
</div>
|
</div>
|
||||||
@@ -3427,8 +3529,8 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
</Select>
|
</Select>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
{/* The ARCO is reachable over the LAN (TCP) or its USB virtual COM. */}
|
{/* ARCO and DCU-1 controllers reach over the LAN (TCP) or a serial COM. */}
|
||||||
{isARCO && (
|
{isSerialCap && (
|
||||||
<div className="space-y-1">
|
<div className="space-y-1">
|
||||||
<Label>Connection</Label>
|
<Label>Connection</Label>
|
||||||
<Select value={transport} onValueChange={(v) => patch(i, { transport: v as any })}>
|
<Select value={transport} onValueChange={(v) => patch(i, { transport: v as any })}>
|
||||||
@@ -3448,7 +3550,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
{t('rot.rgDual')}
|
{t('rot.rgDual')}
|
||||||
</label>
|
</label>
|
||||||
)}
|
)}
|
||||||
{isARCO && transport === 'serial' ? (
|
{isSerialCap && transport === 'serial' ? (
|
||||||
<div className="space-y-1 max-w-xs">
|
<div className="space-y-1 max-w-xs">
|
||||||
<Label>COM port</Label>
|
<Label>COM port</Label>
|
||||||
<div className="flex items-center gap-2">
|
<div className="flex items-center gap-2">
|
||||||
@@ -3477,16 +3579,16 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
<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={dev.host ?? ''} onChange={(e) => patch(i, { host: e.target.value })}
|
<Input value={dev.host ?? ''} onChange={(e) => patch(i, { host: e.target.value })}
|
||||||
placeholder={isRG || isARCO ? '192.168.1.60' : '127.0.0.1'} className="font-mono" />
|
placeholder={isRG || isSerialCap ? '192.168.1.60' : '127.0.0.1'} className="font-mono" />
|
||||||
</div>
|
</div>
|
||||||
<div className="space-y-1">
|
<div className="space-y-1">
|
||||||
<Label>{isRG || isARCO ? 'TCP port' : 'UDP port'}</Label>
|
<Label>{isRG || isSerialCap ? 'TCP port' : 'UDP port'}</Label>
|
||||||
<PortInput value={dev.port} onChange={(n) => patch(i, { port: n })}
|
<PortInput value={dev.port} onChange={(n) => patch(i, { port: n })}
|
||||||
fallback={isRG ? 9006 : isARCO ? 4001 : 12000} className="font-mono" />
|
fallback={isRG ? 9006 : isSerialCap ? 4001 : 12000} className="font-mono" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
{!isRG && !isARCO && (
|
{!isRG && !isSerialCap && (
|
||||||
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
||||||
<Checkbox checked={!!dev.has_elevation} onCheckedChange={(c) => patch(i, { has_elevation: !!c })} />
|
<Checkbox checked={!!dev.has_elevation} onCheckedChange={(c) => patch(i, { has_elevation: !!c })} />
|
||||||
This rotator supports elevation (VHF / satellite)
|
This rotator supports elevation (VHF / satellite)
|
||||||
@@ -3494,6 +3596,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
)}
|
)}
|
||||||
{isRG && <p className="text-xs text-muted-foreground">{t('rot.rgHint')}</p>}
|
{isRG && <p className="text-xs text-muted-foreground">{t('rot.rgHint')}</p>}
|
||||||
{isARCO && <p className="text-xs text-muted-foreground">{t('rot.arcoHint')}</p>}
|
{isARCO && <p className="text-xs text-muted-foreground">{t('rot.arcoHint')}</p>}
|
||||||
|
{isDCU1 && <p className="text-xs text-muted-foreground">{t('rot.dcu1Hint')}</p>}
|
||||||
{/* Which antenna this rotor carries — only relevant with >1 rotor. */}
|
{/* Which antenna this rotor carries — only relevant with >1 rotor. */}
|
||||||
{multi && (
|
{multi && (
|
||||||
<div className="space-y-1 max-w-xs">
|
<div className="space-y-1 max-w-xs">
|
||||||
@@ -4000,6 +4103,11 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
<span className="font-mono">dx.maritimecontestclub.net:7300</span>,{' '}
|
<span className="font-mono">dx.maritimecontestclub.net:7300</span>,{' '}
|
||||||
<span className="font-mono">w8avi.net:7300</span>.
|
<span className="font-mono">w8avi.net:7300</span>.
|
||||||
</p>
|
</p>
|
||||||
|
<label className="flex items-start gap-2 text-sm cursor-pointer border-t border-border/60 pt-3">
|
||||||
|
<Checkbox checked={clusterWorkedSameSlot} className="mt-0.5"
|
||||||
|
onCheckedChange={(c) => { const v = !!c; setClusterWorkedSameSlot(v); writeUiPref('opslog.clusterWorkedSameSlot', v ? '1' : '0'); }} />
|
||||||
|
<span>{t('clu.workedSameSlot')} <span className="text-xs text-muted-foreground">{t('clu.workedSameSlotHint')}</span></span>
|
||||||
|
</label>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{editingServer && (
|
{editingServer && (
|
||||||
@@ -5694,6 +5802,17 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
<span className="text-[11px] text-muted-foreground">{emailMsg}</span>
|
<span className="text-[11px] text-muted-foreground">{emailMsg}</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div className="pt-2 mt-2 border-t border-border space-y-2">
|
||||||
|
<Label className="text-sm font-semibold">{t('em.recEmail')}</Label>
|
||||||
|
<div className="text-[11px] text-muted-foreground">
|
||||||
|
{t('em.recVarsHint')} {'{CALL}'} {'{DATE}'} {'{BAND}'} {'{MODE}'} {'{MYCALL}'}.
|
||||||
|
</div>
|
||||||
|
<Input className="h-8" placeholder={t('em.subject')} value={emailCfg.subject}
|
||||||
|
onChange={(e) => setEmailField({ subject: e.target.value })} />
|
||||||
|
<Textarea rows={3} className="text-sm" placeholder={t('em.body')} value={emailCfg.body}
|
||||||
|
onChange={(e) => setEmailField({ body: e.target.value })} />
|
||||||
|
</div>
|
||||||
|
|
||||||
<div className="pt-2 mt-2 border-t border-border space-y-2">
|
<div className="pt-2 mt-2 border-t border-border space-y-2">
|
||||||
<Label className="text-sm font-semibold">{t('em.qslCardEmail')}</Label>
|
<Label className="text-sm font-semibold">{t('em.qslCardEmail')}</Label>
|
||||||
<div className="text-[11px] text-muted-foreground">
|
<div className="text-[11px] text-muted-foreground">
|
||||||
@@ -5801,7 +5920,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
database: DatabasePanel,
|
database: DatabasePanel,
|
||||||
uscounties: USCountiesPanel,
|
uscounties: USCountiesPanel,
|
||||||
autostart: () => <AutostartPanelComponent />,
|
autostart: () => <AutostartPanelComponent />,
|
||||||
awards: () => <ComingSoon id="awards" icon={Award} />,
|
awards: () => <AwardsSelectionPanel profile={activeProfile ?? undefined} />,
|
||||||
cat: CATPanel,
|
cat: CATPanel,
|
||||||
rotator: RotatorPanel,
|
rotator: RotatorPanel,
|
||||||
winkeyer: WinkeyerPanel,
|
winkeyer: WinkeyerPanel,
|
||||||
|
|||||||
@@ -672,6 +672,7 @@ function DeviceEditor({ device, onChange, onSave, onCancel, t }: {
|
|||||||
<div className={cn('space-y-1', (isKM || isDingtian) ? '' : 'max-w-xs')}>
|
<div className={cn('space-y-1', (isKM || isDingtian) ? '' : 'max-w-xs')}>
|
||||||
<Label>{t('station.host')}</Label>
|
<Label>{t('station.host')}</Label>
|
||||||
<Input className="font-mono" value={device.host} placeholder="192.168.1.100" onChange={(e) => onChange({ ...device, host: e.target.value })} />
|
<Input className="font-mono" value={device.host} placeholder="192.168.1.100" onChange={(e) => onChange({ ...device, host: e.target.value })} />
|
||||||
|
<span className="text-[10px] text-muted-foreground">{t('station.hostHint')}</span>
|
||||||
</div>
|
</div>
|
||||||
{/* Dingtian: both are OFF on a factory board — the session ID only when
|
{/* Dingtian: both are OFF on a factory board — the session ID only when
|
||||||
"HTTP Session" is enabled in its web page, the password only when a
|
"HTTP Session" is enabled in its web page, the password only when a
|
||||||
|
|||||||
+18
-12
@@ -155,7 +155,8 @@ const en: Dict = {
|
|||||||
'uscty.backfillIntro': 'Resolve county (and grid) for US QSOs already in your log that are missing them. Existing values are kept — only blanks are filled.',
|
'uscty.backfillIntro': 'Resolve county (and grid) for US QSOs already in your log that are missing them. Existing values are kept — only blanks are filled.',
|
||||||
'uscty.backfillRun': 'Fill missing counties',
|
'uscty.backfillRun': 'Fill missing counties',
|
||||||
'uscty.backfillDone': '{s} US QSOs scanned · {c} counties, {g} grids filled.',
|
'uscty.backfillDone': '{s} US QSOs scanned · {c} counties, {g} grids filled.',
|
||||||
'station.title': 'Station Control', 'station.rotator': 'Rotator', 'station.rotatorNoRead': 'No heading read', 'station.pattern': 'Pattern', 'station.bi': 'Bi', 'station.retract': 'Retract elements', 'station.moving': 'MOVING', 'station.elements': 'Elements (mm)', 'station.read': 'Read', 'station.readLengths': 'Read current element lengths from the controller', 'station.noLengths': 'Lengths unknown — click Read to fetch them from the controller.', 'station.element': 'Element', 'station.reflector': 'Reflector', 'station.driven': 'Driven', 'station.director': 'Dir', 'station.set': 'Set', 'station.elementsHint': 'Each press lengthens/shortens the element by 2 mm (like the physical console). Verify which element responds on your antenna.', 'station.setExactLen': 'Click to type the exact current length (fixes the baseline if the auto-read is off).', 'station.atMax': 'Controller refused — the element is likely at its maximum length for this band, so it can\'t extend further.', 'station.go': 'Go', 'station.stop': 'Stop', 'station.dragHint': 'Drag the grip handle on the left of a panel to move it. Pick a column count to lay them out in a grid.', 'station.dragMove': 'Drag to move this panel', 'station.colsAuto': 'Auto', 'station.addDevice': 'Add device', 'station.editDevice': 'Edit device', 'station.empty': 'No relay boards yet. Add a WebSwitch 1216H or a KMTronic 8-relay board to control your station power and accessories.', 'station.online': 'Online', 'station.offline': 'Offline', 'station.edit': 'Edit', 'station.delete': 'Delete', 'station.relay': 'Relay', 'station.on': 'ON', 'station.off': 'OFF', 'station.type': 'Device type', 'station.name': 'Name', 'station.host': 'Host / IP', 'station.user': 'Username', 'station.pass': 'Password', 'station.optional': 'optional', 'station.ftdiSerial': 'FTDI serial number', 'station.detect': 'Detect', 'station.ftdiHint': 'The Denkovi board is driven via FTDI bit-bang (not the COM port). Pick its serial (e.g. DAE0006K). Needs the FTDI D2XX driver installed.', 'station.channels': 'Relays', 'station.comPort': 'COM port', 'station.noPorts': 'No ports found', 'station.usbRelayHint': 'Cheap USB-serial relay boards (CH340/LCUS) using the A0 command protocol. If yours does not switch, tell me its model / command set.', 'station.labels': 'Relay labels', 'station.cancel': 'Cancel', 'station.save': 'Save', 'station.test': 'Test connection', 'station.testOk': 'Connected — {n} relays', 'station.testFail': 'Not connected', 'station.detectNone': 'No FTDI board found — check the cable and that the D2XX driver is installed.', 'station.detectFound': '{n} board(s) detected.',
|
'station.title': 'Station Control', 'station.rotator': 'Rotator', 'station.rotatorNoRead': 'No heading read', 'station.pattern': 'Pattern', 'station.bi': 'Bi', 'station.retract': 'Retract elements', 'station.moving': 'MOVING', 'station.elements': 'Elements (mm)', 'station.read': 'Read', 'station.readLengths': 'Read current element lengths from the controller', 'station.noLengths': 'Lengths unknown — click Read to fetch them from the controller.', 'station.element': 'Element', 'station.reflector': 'Reflector', 'station.driven': 'Driven', 'station.director': 'Dir', 'station.set': 'Set', 'station.elementsHint': 'Each press lengthens/shortens the element by 2 mm (like the physical console). Verify which element responds on your antenna.', 'station.setExactLen': 'Click to type the exact current length (fixes the baseline if the auto-read is off).', 'station.atMax': 'Controller refused — the element is likely at its maximum length for this band, so it can\'t extend further.', 'station.go': 'Go', 'station.stop': 'Stop', 'station.dragHint': 'Drag the grip handle on the left of a panel to move it. Pick a column count to lay them out in a grid.', 'station.dragMove': 'Drag to move this panel', 'station.colsAuto': 'Auto', 'station.addDevice': 'Add device', 'station.editDevice': 'Edit device', 'station.empty': 'No relay boards yet. Add a WebSwitch 1216H or a KMTronic 8-relay board to control your station power and accessories.', 'station.online': 'Online', 'station.offline': 'Offline', 'station.edit': 'Edit', 'station.delete': 'Delete', 'station.relay': 'Relay', 'station.on': 'ON', 'station.off': 'OFF', 'station.type': 'Device type', 'station.name': 'Name', 'station.host': 'Host / IP', 'station.hostHint': 'LAN IP for local use. To reach the board from OUTSIDE, put a full URL here — e.g. https://relay.yourdomain.com — pointing at a reverse proxy (Nginx Proxy Manager…) that fronts the board’s HTTP port.', 'station.user': 'Username', 'station.pass': 'Password', 'station.optional': 'optional', 'station.ftdiSerial': 'FTDI serial number', 'station.detect': 'Detect', 'station.ftdiHint': 'The Denkovi board is driven via FTDI bit-bang (not the COM port). Pick its serial (e.g. DAE0006K). Needs the FTDI D2XX driver installed.', 'station.channels': 'Relays', 'station.comPort': 'COM port', 'station.noPorts': 'No ports found', 'station.usbRelayHint': 'Cheap USB-serial relay boards (CH340/LCUS) using the A0 command protocol. If yours does not switch, tell me its model / command set.', 'station.labels': 'Relay labels', 'station.cancel': 'Cancel', 'station.save': 'Save', 'station.test': 'Test connection', 'station.testOk': 'Connected — {n} relays', 'station.testFail': 'Not connected', 'station.detectNone': 'No FTDI board found — check the cable and that the D2XX driver is installed.', 'station.detectFound': '{n} board(s) detected.',
|
||||||
|
'awards.followHint': 'Awards shown in the Awards tab. Leave the right side empty to show them all.', 'awards.available': 'All awards', 'awards.followed': 'Followed', 'awards.search': 'Filter…', 'awards.addAll': 'Add all', 'awards.clear': 'Clear', 'awards.allTracked': 'All awards are followed.', 'awards.noneFollowed': 'Nothing followed yet — the Awards tab shows all.',
|
||||||
'sec.awards': 'Awards', 'sec.cat': 'CAT interface', 'sec.rotator': 'Rotator', 'sec.winkeyer': 'CW Keyer',
|
'sec.awards': 'Awards', 'sec.cat': 'CAT interface', 'sec.rotator': 'Rotator', 'sec.winkeyer': 'CW Keyer',
|
||||||
'sec.antenna': 'Ultrabeam / Steppir', 'sec.antgenius': 'Antenna Genius', 'sec.tunergenius': 'Tuner Genius', 'sec.pgxl': 'Amplifier', 'sec.flex': 'FlexRadio', 'sec.audio': 'Audio devices',
|
'sec.antenna': 'Ultrabeam / Steppir', 'sec.antgenius': 'Antenna Genius', 'sec.tunergenius': 'Tuner Genius', 'sec.pgxl': 'Amplifier', 'sec.flex': 'FlexRadio', 'sec.audio': 'Audio devices',
|
||||||
// CW Keyer settings panel
|
// CW Keyer settings panel
|
||||||
@@ -262,6 +263,8 @@ const en: Dict = {
|
|||||||
'clu.moveUp': 'Move up', 'clu.moveDown': 'Move down', 'clu.edit': 'Edit', 'clu.delete': 'Delete', 'clu.none': 'No cluster nodes saved yet.', 'clu.connect': 'Connect', 'clu.disconnect': 'Disconnect',
|
'clu.moveUp': 'Move up', 'clu.moveDown': 'Move down', 'clu.edit': 'Edit', 'clu.delete': 'Delete', 'clu.none': 'No cluster nodes saved yet.', 'clu.connect': 'Connect', 'clu.disconnect': 'Disconnect',
|
||||||
'clu.add': 'Add cluster', 'clu.connectAll': 'Connect all', 'clu.disconnectAll': 'Disconnect all', 'clu.autoConnect': 'Auto-connect all enabled on app start',
|
'clu.add': 'Add cluster', 'clu.connectAll': 'Connect all', 'clu.disconnectAll': 'Disconnect all', 'clu.autoConnect': 'Auto-connect all enabled on app start',
|
||||||
'clu.freeNodes': 'Free public nodes:',
|
'clu.freeNodes': 'Free public nodes:',
|
||||||
|
'clu.workedSameSlot': 'Already worked only on the same slot',
|
||||||
|
'clu.workedSameSlotHint': '— a spot shows "worked" only if you worked that call on the SAME band and mode, not just anywhere. Combines with digital-mode grouping (Settings → General): with it on, a call worked on 20m FT8 also counts as worked for a 20m FT4 spot; with it off, FT8 and FT4 are separate slots.',
|
||||||
// Backup panel
|
// Backup panel
|
||||||
'bk.hintMysql': 'On close (once/day) OpsLog snapshots the local SQLite (config) AND exports the shared MySQL log to ADIF — opslog-log-<date>.adi — so your contacts are protected even though they live on the server. Rotation keeps the last N of each.',
|
'bk.hintMysql': 'On close (once/day) OpsLog snapshots the local SQLite (config) AND exports the shared MySQL log to ADIF — opslog-log-<date>.adi — so your contacts are protected even though they live on the server. Rotation keeps the last N of each.',
|
||||||
'bk.hint': 'OpsLog can copy the SQLite database to a folder of your choice when you close it, once per day. Rotation keeps the last N copies and deletes older ones.',
|
'bk.hint': 'OpsLog can copy the SQLite database to a folder of your choice when you close it, once per day. Rotation keeps the last N copies and deletes older ones.',
|
||||||
@@ -273,11 +276,11 @@ const en: Dict = {
|
|||||||
'cat.hint': "Reads the rig's frequency / band / mode and pushes them into the entry strip in real time. Use OmniRig (free, any rig) or — for FlexRadio — the native SmartSDR API (no OmniRig needed, real-time, no second-click mode bug).",
|
'cat.hint': "Reads the rig's frequency / band / mode and pushes them into the entry strip in real time. Use OmniRig (free, any rig) or — for FlexRadio — the native SmartSDR API (no OmniRig needed, real-time, no second-click mode bug).",
|
||||||
'ag2.hint': 'OpsLog talks to the 4O3A Antenna Genius switch over TCP (GSCP protocol). The port is fixed at 9007, so only the device IP is needed. A docked widget then lets you switch antennas per port (A/B).', 'ag2.password': 'Remote password', 'ag2.passwordPh': 'blank on LAN', 'ag2.passwordHint': 'Only needed when reaching the device remotely — it then announces "AG AUTH" and rejects commands until you log in. Leave blank on the local network.',
|
'ag2.hint': 'OpsLog talks to the 4O3A Antenna Genius switch over TCP (GSCP protocol). The port is fixed at 9007, so only the device IP is needed. A docked widget then lets you switch antennas per port (A/B).', 'ag2.password': 'Remote password', 'ag2.passwordPh': 'blank on LAN', 'ag2.passwordHint': 'Only needed when reaching the device remotely — it then announces "AG AUTH" and rejects commands until you log in. Leave blank on the local network.',
|
||||||
'tg2.hint': 'OpsLog talks to the 4O3A Tuner Genius XL over TCP (port fixed at 9010), so only the device IP is needed. A docked widget then shows SWR and forward power and offers Tune, Bypass and Operate/Standby. Control it directly (not through the radio) so OpsLog uses just one of the box\'s connection slots.', 'tg2.enable': 'Enable Tuner Genius control', 'tg2.portHint': 'The TCP port is fixed at 9010 on the device.', 'tg2.password': 'Remote code', 'tg2.passwordPh': 'blank on LAN', 'tg2.passwordHint': 'Only needed when reaching the device remotely — it then announces "AUTH" and rejects commands until you log in. Leave blank on the local network.',
|
'tg2.hint': 'OpsLog talks to the 4O3A Tuner Genius XL over TCP (port fixed at 9010), so only the device IP is needed. A docked widget then shows SWR and forward power and offers Tune, Bypass and Operate/Standby. Control it directly (not through the radio) so OpsLog uses just one of the box\'s connection slots.', 'tg2.enable': 'Enable Tuner Genius control', 'tg2.portHint': 'The TCP port is fixed at 9010 on the device.', 'tg2.password': 'Remote code', 'tg2.passwordPh': 'blank on LAN', 'tg2.passwordHint': 'Only needed when reaching the device remotely — it then announces "AUTH" and rejects commands until you log in. Leave blank on the local network.',
|
||||||
'rot.enable': 'Enable rotator control', 'rot.testOkRG': 'Connected — the Rotator Genius accepted the command (moving to 0°).', 'rot.type': 'Rotator type', 'rot.rotatorNum': 'Rotator #', 'rot.dual': 'Two rotors', 'rot.rotor1': 'Rotor 1', 'rot.rotor2': 'Rotor 2', 'rot.name': 'Name', 'rot.antenna': 'Antenna', 'rot.antenna1': 'Rotor 1 antenna', 'rot.antenna2': 'Rotor 2 antenna', 'rot.name1': 'Rotor 1 name', 'rot.name2': 'Rotor 2 name', 'rot.antStd': 'Standard antenna', 'rot.antMotor': 'Motorized (Ultrabeam/SteppIR)', 'rot.add': 'Add rotor', 'rot.remove': 'Remove rotor', 'rot.none': 'No rotor configured. Click “Add rotor” to add one.', 'rot.rgDual': 'This Rotator Genius drives two rotors (adds a second one)', 'rot.testRotor1': 'Test rotor 1', 'rot.testRotor2': 'Test rotor 2', 'rot.dualHint': 'Two independent rotors of any type — for example an ARCO and a Rotator Genius side by side. Configure each below; OpsLog shows a Rotor 1/2 toggle on the compass to pick which one it turns and displays. Set each rotor to "Motorized" so the boom/pattern paths (reverse, bidirectional) show only for the one that carries the Ultrabeam/SteppIR. (For a single Rotator Genius driving two rotors, set both to Rotator Genius with the same host and rotator # 1 and 2.)', 'rot.rgHint': 'Talks directly to a 4O3A Rotator Genius over TCP (default port 9006) — no PstRotator needed. Rotator # selects which of the two rotators to drive.', 'rot.arcoHint': "Talks directly to any controller set to Yaesu GS-232A — no PstRotator needed. microHAM ARCO: set Config → LAN → CONTROL PROTOCOL (or USB CONTROL PROTOCOL) to 'Yaesu GS-232A'; on USB the baud rate does not matter. ERC (Easy Rotor Control, incl. ERC Mini): its emulation MUST be set to GS-232 — an ERC left on Hy-Gain DCU-1 speaks a different command set and will not answer — then pick its COM port and the same baud rate as in the ERC configuration.", 'rot.hint': "OpsLog sends UDP commands to PstRotator. Enable PstRotator's UDP listener (Setup → Communication → UDP) before testing.",
|
'rot.enable': 'Enable rotator control', 'rot.testOkRG': 'Connected — the Rotator Genius accepted the command (moving to 0°).', 'rot.type': 'Rotator type', 'rot.rotatorNum': 'Rotator #', 'rot.dual': 'Two rotors', 'rot.rotor1': 'Rotor 1', 'rot.rotor2': 'Rotor 2', 'rot.name': 'Name', 'rot.antenna': 'Antenna', 'rot.antenna1': 'Rotor 1 antenna', 'rot.antenna2': 'Rotor 2 antenna', 'rot.name1': 'Rotor 1 name', 'rot.name2': 'Rotor 2 name', 'rot.antStd': 'Standard antenna', 'rot.antMotor': 'Motorized (Ultrabeam/SteppIR)', 'rot.add': 'Add rotor', 'rot.remove': 'Remove rotor', 'rot.none': 'No rotor configured. Click “Add rotor” to add one.', 'rot.rgDual': 'This Rotator Genius drives two rotors (adds a second one)', 'rot.testRotor1': 'Test rotor 1', 'rot.testRotor2': 'Test rotor 2', 'rot.dualHint': 'Two independent rotors of any type — for example an ARCO and a Rotator Genius side by side. Configure each below; OpsLog shows a Rotor 1/2 toggle on the compass to pick which one it turns and displays. Set each rotor to "Motorized" so the boom/pattern paths (reverse, bidirectional) show only for the one that carries the Ultrabeam/SteppIR. (For a single Rotator Genius driving two rotors, set both to Rotator Genius with the same host and rotator # 1 and 2.)', 'rot.rgHint': 'Talks directly to a 4O3A Rotator Genius over TCP (default port 9006) — no PstRotator needed. Rotator # selects which of the two rotators to drive.', 'rot.arcoHint': "Talks directly to any controller set to Yaesu GS-232A — no PstRotator needed. microHAM ARCO: set Config → LAN → CONTROL PROTOCOL (or USB CONTROL PROTOCOL) to 'Yaesu GS-232A'; on USB the baud rate does not matter. ERC (Easy Rotor Control, incl. ERC Mini): its emulation MUST be set to GS-232 — an ERC left on Hy-Gain DCU-1 speaks a different command set and will not answer — then pick its COM port and the same baud rate as in the ERC configuration.", 'rot.dcu1Hint': "Speaks the Hy-Gain DCU-1 command set (RotorCard DXA, Idiom Press Rotor-EZ, Green Heron). Connect over the controller's COM port (a DCU-1 is 4800 baud; RotorCard/Green Heron may differ — match the controller) or over TCP through a serial-over-IP bridge. Azimuth only, no elevation. New backend — please report if your controller needs a different command or baud.", 'rot.hint': "OpsLog sends UDP commands to PstRotator. Enable PstRotator's UDP listener (Setup → Communication → UDP) before testing.",
|
||||||
'extsvc.hint': 'Upload logged QSOs to online logbooks. Each service uploads automatically on a new QSO when enabled; timing is per-service (immediate, or a 1–2 min delay so a mis-logged QSO can still be fixed first).',
|
'extsvc.hint': 'Upload logged QSOs to online logbooks. Each service uploads automatically on a new QSO when enabled; timing is per-service (immediate, or a 1–2 min delay so a mis-logged QSO can still be fixed first).',
|
||||||
'hw.motorTxInhibit': 'Inhibit transmission while the antenna is moving', 'hw.motorTxInhibitHint': 'Blocks the FlexRadio from transmitting while the elements move (needs FlexRadio in API mode + this antenna enabled). No effect with other radios.', 'hw.motorAntenna': 'Ultrabeam / Steppir', 'hw.motorEnable': 'Enable antenna control', 'hw.motorType': 'Antenna type', 'hw.motorTransport': 'Connection', 'hw.motorTcp': 'Network (TCP)', 'hw.motorSerial': 'Serial (COM)', 'hw.motorCom': 'Serial port', 'hw.motorBaud': 'Baud', 'hw.steppirHint': 'SteppIR controllers are RS-232 serial (the DATA OUT DB9 port). Serial = a USB↔RS-232 (FTDI) adapter, shown as a COM port. Network = a serial-to-Ethernet bridge (as for the Ultrabeam).', 'hw.steppirRange': 'Tunable range', 'hw.steppirRangeHint': "The SteppIR's frequency coverage. On a band outside this range (e.g. 30 m on a 20 m–6 m SteppIR) OpsLog won't try to tune the antenna and won't inhibit transmission. Default 13–54 MHz (20 m–6 m); widen the low edge (e.g. 6) for a 40 m-equipped SteppIR.", 'hw.ultrabeam': 'Antenna (Ultrabeam)', 'hw.audioVoice': 'Audio devices & voice keyer',
|
'hw.motorTxInhibit': 'Inhibit transmission while the antenna is moving', 'hw.motorTxInhibitHint': 'Blocks the FlexRadio from transmitting while the elements move (needs FlexRadio in API mode + this antenna enabled). No effect with other radios.', 'hw.motorAntenna': 'Ultrabeam / Steppir', 'hw.motorEnable': 'Enable antenna control', 'hw.motorType': 'Antenna type', 'hw.motorTransport': 'Connection', 'hw.motorTcp': 'Network (TCP)', 'hw.motorSerial': 'Serial (COM)', 'hw.motorCom': 'Serial port', 'hw.motorBaud': 'Baud', 'hw.steppirHint': 'SteppIR controllers are RS-232 serial (the DATA OUT DB9 port). Serial = a USB↔RS-232 (FTDI) adapter, shown as a COM port. Network = a serial-to-Ethernet bridge (as for the Ultrabeam).', 'hw.steppirRange': 'Tunable range', 'hw.steppirRangeHint': "The SteppIR's frequency coverage. On a band outside this range (e.g. 30 m on a 20 m–6 m SteppIR) OpsLog won't try to tune the antenna and won't inhibit transmission. Default 13–54 MHz (20 m–6 m); widen the low edge (e.g. 6) for a 40 m-equipped SteppIR.", 'hw.motorBands': 'Covered bands', 'hw.ultrabeam': 'Antenna (Ultrabeam)', 'hw.audioVoice': 'Audio devices & voice keyer',
|
||||||
// CAT panel body
|
// CAT panel body
|
||||||
'cat.enable': 'Enable CAT', 'cat.backend': 'Backend', 'cat.optOmnirig': 'OmniRig', 'cat.optFlex': 'FlexRadio (API)', 'cat.share': 'Share CAT with other programs', 'cat.shareHint': 'A native CAT backend owns the radio serial port, so no other program can reach it. This lets WSJT-X, JTDX, MSHV or Log4OM talk to the rig THROUGH OpsLog: in the other program pick the rig model "Hamlib NET rigctl" and enter 127.0.0.1:4532. Works with every backend, not only the native ones.', 'cat.sharePort': 'Sharing port', 'cat.pttKey': 'Enable PTT hotkey', 'cat.pttKeyPress': 'Press a key…', 'cat.pttKeyNone': 'Click to set a key', 'cat.pttKeyClear': 'Clear', 'cat.pttKeyToggle': 'Toggle mode (press to key, press again to unkey)', 'cat.pttKeyHint': 'While OpsLog is focused, this key keys the transmitter — held down by default (release to stop), or latched in toggle mode. It uses the Audio → PTT method (CAT / RTS / DTR), falling back to CAT keying. Pick a key you never type while logging (e.g. Pause, ScrollLock, or a footswitch mapped to one) — OpsLog swallows it so it never lands in a field.', 'cat.optXiegu': 'Xiegu (USB)', 'cat.xieguPort': 'Xiegu CAT port', 'cat.xieguBaudHint': 'Must match the radio menu (G90 default: 19200).', 'cat.xieguAddrHint': 'Factory CI-V address of the G90/X6100 family: 0x70.', 'cat.xieguPTTLine': 'How the rig is keyed', 'cat.xieguPTTCiv': 'CI-V command', 'cat.xieguPTTHint': 'A G90 does not transmit on the CI-V command: interfaces like the DE-19 key it on RTS or DTR. Pick the line yours uses \u2014 it is also what lets WSJT-X transmit through the shared CAT link.', 'cat.optYaesu': 'Yaesu (USB)', 'cat.optKenwood': 'Kenwood (USB, network)', 'cat.civTrace': 'Log the CAT protocol', 'cat.civTraceHint': 'Writes every CAT frame to and from the radio into the log \u2014 CI-V as hex, Kenwood as the text it exchanges. For reporting a rig that answers oddly \u2014 a button that does the wrong thing, a frequency that jumps. Session only: it is a diagnostic, and it makes the log large.', 'cat.kenwoodPort': 'Kenwood COM port', 'cat.kenwoodPortHint': 'The rig\u2019s CAT/USB serial port (TS-590, TS-890, TS-990, TS-2000, and Elecraft K3/K4 which speak the same dialect).', 'cat.kenwoodBaudHint': 'Must match MENU on the radio: a TS-590 leaves the factory at 9600, a TS-890 at 115200.', 'cat.kenwoodHost': 'Or over the network (host:port)', 'cat.kenwoodHostHint': 'A serial-over-network bridge \u2014 ser2net, an Ethernet-serial adapter, a Raspberry Pi at the radio. Filled in, it is used INSTEAD of the COM port above. This is not the radio\u2019s own RJ45 socket, which speaks Kenwood\u2019s KNS protocol and is not supported.', 'cat.yaesuPort': 'Yaesu CAT port', 'cat.yaesuPortHint': 'The rig CAT port — on an FTDX10/FTDX101 over USB this is the ENHANCED COM port, not the standard one.', 'cat.yaesuBaudHint': 'Must match the radio menu (FTDX10/FTDX101 default: 38400).', 'cat.lowerLines': 'Lower the DTR and RTS lines on connect', 'cat.lowerLinesHint': 'Windows raises both when the port opens, and some interfaces read either line as PTT — the radio then transmits for as long as OpsLog runs. Tick this only if that happens: other interfaces need RTS raised to transmit at all, and lowering it makes the rig go silent.', 'cat.optIcom': 'Icom (CI-V USB)', 'cat.optIcomNet': 'Icom (CI-V network)', 'cat.optTci': 'TCI', 'flxpw.title': 'FlexRadio \u2014 power per band and mode', 'flxpw.hint': 'TX power applied when the band or mode changes. Leave a box empty to leave the power alone.', 'flxpw.band': 'Band', 'flxb.title': 'FlexRadio \u2014 per-band antennas and power', 'flxb.hint': 'Antennas are applied when the band changes; power when the band or the mode changes. Leave a power box empty to leave it alone.', 'flxb.rxAnt': 'RX antenna', 'flxb.txAnt': 'TX antenna', 'flxb.noRadio': 'No antennas reported yet \u2014 connect the FlexRadio, then reopen this panel.', 'flxpw.phone': 'Phone', 'flxpw.digi': 'Digital', 'flxpw.noBands': 'No bands configured \u2014 add them in Lists \u2192 Bands.', 'flxpw.saved': 'Saved',
|
'cat.enable': 'Enable CAT', 'cat.backend': 'Backend', 'cat.optOmnirig': 'OmniRig', 'cat.optFlex': 'FlexRadio (API)', 'cat.share': 'Share CAT with other programs', 'cat.shareHint': 'In the other program pick the rig model "Hamlib NET rigctl" and enter 127.0.0.1:4532. Works with every backend, not only the native ones.', 'cat.sharePort': 'Sharing port', 'cat.pttKey': 'Enable PTT hotkey', 'cat.pttKeyPress': 'Press a key…', 'cat.pttKeyNone': 'Click to set a key', 'cat.pttKeyClear': 'Clear', 'cat.pttKeyToggle': 'Toggle mode (press to key, press again to unkey)', 'cat.pttKeyHint': 'While OpsLog is focused, this key keys the transmitter — held down by default (release to stop), or latched in toggle mode. It uses the Audio → PTT method (CAT / RTS / DTR), falling back to CAT keying. Pick a key you never type while logging (e.g. Pause, ScrollLock, or a footswitch mapped to one) — OpsLog swallows it so it never lands in a field.', 'cat.optXiegu': 'Xiegu (USB)', 'cat.xieguPort': 'Xiegu CAT port', 'cat.xieguBaudHint': 'Must match the radio menu (G90 default: 19200).', 'cat.xieguAddrHint': 'Factory CI-V address of the G90/X6100 family: 0x70.', 'cat.xieguPTTLine': 'How the rig is keyed', 'cat.xieguPTTCiv': 'CI-V command', 'cat.xieguPTTHint': 'A G90 does not transmit on the CI-V command: interfaces like the DE-19 key it on RTS or DTR. Pick the line yours uses \u2014 it is also what lets WSJT-X transmit through the shared CAT link.', 'cat.optYaesu': 'Yaesu (USB)', 'cat.optKenwood': 'Kenwood (USB, network)', 'cat.civTrace': 'Log the CAT protocol', 'cat.civTraceHint': 'Writes every CAT frame to and from the radio into the log \u2014 CI-V as hex, Kenwood as the text it exchanges. For reporting a rig that answers oddly \u2014 a button that does the wrong thing, a frequency that jumps. Session only: it is a diagnostic, and it makes the log large.', 'cat.kenwoodPort': 'Kenwood COM port', 'cat.kenwoodPortHint': 'The rig\u2019s CAT/USB serial port (TS-590, TS-890, TS-990, TS-2000, and Elecraft K3/K4 which speak the same dialect).', 'cat.kenwoodBaudHint': 'Must match MENU on the radio: a TS-590 leaves the factory at 9600, a TS-890 at 115200.', 'cat.kenwoodHost': 'Or over the network (host:port)', 'cat.kenwoodHostHint': 'A serial-over-network bridge \u2014 ser2net, an Ethernet-serial adapter, a Raspberry Pi at the radio. Filled in, it is used INSTEAD of the COM port above. This is not the radio\u2019s own RJ45 socket, which speaks Kenwood\u2019s KNS protocol and is not supported.', 'cat.yaesuPort': 'Yaesu CAT port', 'cat.yaesuPortHint': 'The rig CAT port — on an FTDX10/FTDX101 over USB this is the ENHANCED COM port, not the standard one.', 'cat.yaesuBaudHint': 'Must match the radio menu (FTDX10/FTDX101 default: 38400).', 'cat.lowerLines': 'Lower the DTR and RTS lines on connect', 'cat.lowerLinesHint': 'If your radio is always on TX, tick this.', 'cat.kwDataMode': 'Data modes (FT8/PSK…) use', 'cat.kwDataUsb': 'USB', 'cat.kwDataMd6': 'DATA mode — MD6 (Elecraft K3/K4)', 'cat.kwDataKeep': 'Leave the rig’s mode unchanged', 'cat.kwDataHint': 'What OpsLog sets on the rig for a data mode. No single command fits every rig: an Elecraft K3/K4 wants DATA (MD6); a TS-590SG/TS-990S data mode is a USB modifier set on the rig, so pick USB or, safest, "Leave unchanged" and switch the rig to DATA yourself. On MD6 a plain Kenwood (TS-590/990) would land on FSK/RTTY — do not use it there.', 'cat.optIcom': 'Icom (CI-V USB)', 'cat.optIcomNet': 'Icom (CI-V network)', 'cat.optTci': 'TCI', 'flxpw.title': 'FlexRadio \u2014 power per band and mode', 'flxpw.hint': 'TX power applied when the band or mode changes. Leave a box empty to leave the power alone.', 'flxpw.band': 'Band', 'flxb.title': 'FlexRadio \u2014 per-band antennas and power', 'flxb.hint': 'Antennas are applied when the band changes; power when the band or the mode changes. Leave a power box empty to leave it alone.', 'flxb.rxAnt': 'RX antenna', 'flxb.txAnt': 'TX antenna', 'flxb.noRadio': 'No antennas reported yet \u2014 connect the FlexRadio, then reopen this panel.', 'flxpw.phone': 'Phone', 'flxpw.digi': 'Digital', 'flxpw.noBands': 'No bands configured \u2014 add them in Lists \u2192 Bands.', 'flxpw.saved': 'Saved',
|
||||||
'cat.icomNetHost': 'Rig IP / hostname', 'cat.icomNetUser': 'Network user (ID)', 'cat.icomNetPass': 'Network password',
|
'cat.icomNetHost': 'Rig IP / hostname', 'cat.icomNetUser': 'Network user (ID)', 'cat.icomNetPass': 'Network password',
|
||||||
'cat.icomNetHint': "Connects to the rig's built-in LAN server directly — no RS-BA1 or Remote Utility needed (close them first). Use the Network User1 ID/Password set in the rig's Network menu. A rig in standby is powered on automatically.",
|
'cat.icomNetHint': "Connects to the rig's built-in LAN server directly — no RS-BA1 or Remote Utility needed (close them first). Use the Network User1 ID/Password set in the rig's Network menu. A rig in standby is powered on automatically.",
|
||||||
'cat.icomNetAudio': 'Stream RX audio over the network (experimental)',
|
'cat.icomNetAudio': 'Stream RX audio over the network (experimental)',
|
||||||
@@ -325,7 +328,7 @@ const en: Dict = {
|
|||||||
// Email panel
|
// Email panel
|
||||||
'em.none': 'None', 'em.smtpAuth': 'SMTP requires authorization', 'em.username': 'Username', 'em.fromAddr': 'From address', 'em.replyTo': 'Reply-To address', 'em.replyToPh': '(optional — where replies go)', 'em.replyToHint': 'Leave blank to use the From address. Set it so correspondents reply to e.g. your personal inbox.',
|
'em.none': 'None', 'em.smtpAuth': 'SMTP requires authorization', 'em.username': 'Username', 'em.fromAddr': 'From address', 'em.replyTo': 'Reply-To address', 'em.replyToPh': '(optional — where replies go)', 'em.replyToHint': 'Leave blank to use the From address. Set it so correspondents reply to e.g. your personal inbox.',
|
||||||
'em.sendTest': 'Send test e-mail', 'em.sendingTest': 'Sending test…', 'em.testSent': 'Test e-mail sent ✓', 'em.testFailed': 'Test failed: ',
|
'em.sendTest': 'Send test e-mail', 'em.sendingTest': 'Sending test…', 'em.testSent': 'Test e-mail sent ✓', 'em.testFailed': 'Test failed: ',
|
||||||
'em.qslCardEmail': 'OpsLog QSL card e-mail', 'em.qslVarsHint': 'Message sent with the QSL card. Variables:', 'em.subject': 'Subject', 'em.body': 'Body', 'em.autoSend': 'Auto-send OpsLog QSL when a QSO is logged', 'em.autoSendHint': 'Sends automatically only when the contact has an e-mail address and a default QSL template exists.',
|
'em.recEmail': 'QSO recording e-mail', 'em.recVarsHint': 'Message sent with the QSO audio recording. Variables:', 'em.qslCardEmail': 'OpsLog QSL card e-mail', 'em.qslVarsHint': 'Message sent with the QSL card. Variables:', 'em.subject': 'Subject', 'em.body': 'Body', 'em.autoSend': 'Auto-send OpsLog QSL when a QSO is logged', 'em.autoSendHint': 'Sends automatically only when the contact has an e-mail address and a default QSL template exists.',
|
||||||
'settings.title': 'Preferences',
|
'settings.title': 'Preferences',
|
||||||
'btn.cancel': 'Cancel', 'btn.save': 'Save', 'btn.saveClose': 'Save and close', 'btn.savingLong': 'Saving…',
|
'btn.cancel': 'Cancel', 'btn.save': 'Save', 'btn.saveClose': 'Save and close', 'btn.savingLong': 'Saving…',
|
||||||
// Component keys (chat / call history / band map / first-run / contest / adif extras)
|
// Component keys (chat / call history / band map / first-run / contest / adif extras)
|
||||||
@@ -376,7 +379,7 @@ const en: Dict = {
|
|||||||
// Awards (ref picker / ref selector / awards panel / award editor)
|
// Awards (ref picker / ref selector / awards panel / award editor)
|
||||||
'awrp.remove': 'Remove', 'awrp.searchLabel': 'Search {label}…', 'awrp.searching': 'Searching…', 'awrp.noMatch': 'No match.', 'awrp.noMatchDxcc': 'No match for this DXCC.',
|
'awrp.remove': 'Remove', 'awrp.searchLabel': 'Search {label}…', 'awrp.searching': 'Searching…', 'awrp.noMatch': 'No match.', 'awrp.noMatchDxcc': 'No match for this DXCC.',
|
||||||
'awrs.group': 'Group', 'awrs.sub': 'Sub', 'awrs.pickReference': '← pick a reference', 'awrs.add': 'Add', 'awrs.enterCallsignFirst': 'Enter a callsign first', 'awrs.noRefsAdded': 'No references added yet', 'awrs.references': 'References', 'awrs.autoMatchTitle': 'The {field} field is {code} — this award counts it automatically', 'awrs.fromField': 'from {field}', 'awrs.autoClickToAdd': 'auto — click to add', 'awrs.search': 'Search…', 'awrs.addUnlistedTitle': "Add this reference even though it isn't in the list yet (new / unlisted)", 'awrs.addPrefix': '+ Add', 'awrs.unlisted': '(unlisted)', 'awrs.searching': 'Searching…', 'awrs.typeToSearch': 'Type 2+ chars to search', 'awrs.enterCallsignOrSearch': 'Enter a callsign, or type to search.', 'awrs.noRefsForEntity': 'No references for this entity.', 'awrs.noResults': 'No results.', 'awrs.downloadLists': 'Download reference lists in the Awards panel → Import data.',
|
'awrs.group': 'Group', 'awrs.sub': 'Sub', 'awrs.pickReference': '← pick a reference', 'awrs.add': 'Add', 'awrs.enterCallsignFirst': 'Enter a callsign first', 'awrs.noRefsAdded': 'No references added yet', 'awrs.references': 'References', 'awrs.autoMatchTitle': 'The {field} field is {code} — this award counts it automatically', 'awrs.fromField': 'from {field}', 'awrs.autoClickToAdd': 'auto — click to add', 'awrs.search': 'Search…', 'awrs.addUnlistedTitle': "Add this reference even though it isn't in the list yet (new / unlisted)", 'awrs.addPrefix': '+ Add', 'awrs.unlisted': '(unlisted)', 'awrs.searching': 'Searching…', 'awrs.typeToSearch': 'Type 2+ chars to search', 'awrs.enterCallsignOrSearch': 'Enter a callsign, or type to search.', 'awrs.noRefsForEntity': 'No references for this entity.', 'awrs.noResults': 'No results.', 'awrs.downloadLists': 'Download reference lists in the Awards panel → Import data.',
|
||||||
'awp.awards': 'Awards', 'awp.editAwards': 'Edit awards', 'awp.rescanTitle': 'Re-pull the logbook and recompute (picks up new LoTW/QRZ confirmations)', 'awp.rescan': 'Rescan', 'awp.selectAward': 'Select an award…', 'awp.of': 'of', 'awp.computing': 'Computing…', 'awp.noData': 'No data', 'awp.worked': 'worked', 'awp.confirmed': 'confirmed', 'awp.validated': 'validated', 'awp.ofConfirmed': 'of {total} · {pct}% confirmed', 'awp.byBand': 'By band (confirmed / worked)', 'awp.filterReferences': 'Filter references…', 'awp.filterAll': 'All', 'awp.filterWkd': 'Wkd', 'awp.filterNotWkd': 'Not wkd', 'awp.filterWkdNotCfmd': 'Wkd not cfmd', 'awp.modePhone': 'Phone', 'awp.modeDigital': 'Digital', 'awp.refs': 'refs', 'awp.missingRefsTitle': "Contacts in this award's scope (right DXCC/band/mode) but with no reference — they're excluded until you add it", 'awp.missingRefs': 'Missing refs', 'awp.gridView': 'Grid view', 'awp.listView': 'List view', 'awp.statistics': 'Statistics', 'awp.statistic': 'Statistic', 'awp.total': 'Total', 'awp.grand': 'Grand', 'awp.ref': 'Ref', 'awp.description': 'Description', 'awp.cellTitle': '{ref} · {band} — click to view QSOs', 'awp.name': 'Name', 'awp.groupCol': 'Group', 'awp.status': 'Status', 'awp.bands': 'Bands', 'awp.missing': '— missing', 'awp.contactsMissingRef': 'contacts missing a reference', 'awp.recomputeTitle': "Recompute now — contacts you've fixed drop off the list", 'awp.refresh': 'Refresh', 'awp.missingScopeHelp': "In this award's scope (DXCC / band / mode / dates) but no reference was found — so they don't count yet. Sort by a column, tick the matching contacts, then assign the reference below.", 'awp.orClickRow': '(Or click a row to open the QSO.)', 'awp.selectedArrow': '{n} selected →', 'awp.chooseReference': 'Choose a reference to assign…', 'awp.assignToSelected': 'Assign to {n} selected', 'awp.scanning': 'Scanning…', 'awp.noGaps': 'No gaps found. (Missing-reference detection applies to awards scoped to a DXCC entity — e.g. DDFM, WAS, RAC, WAJA.)', 'awp.dateUtc': 'Date (UTC)', 'awp.callsign': 'Callsign', 'awp.band': 'Band', 'awp.mode': 'Mode', 'awp.country': 'Country', 'awp.qthNote': 'QTH / Note', 'awp.stations': 'stations', 'awp.contactsWithoutRef': 'contacts without a reference', 'awp.assignedMsg': 'Assigned {code}@{ref} to {n} contact(s).', 'awp.loading': 'Loading…', 'awp.noQsos': 'No QSOs.',
|
'awp.awards': 'Awards', 'awp.editAwards': 'Edit awards', 'awp.rescanTitle': 'Re-pull the logbook and recompute (picks up new LoTW/QRZ confirmations)', 'awp.rescan': 'Rescan', 'awp.selectAward': 'Select an award…', 'awp.of': 'of', 'awp.computing': 'Computing…', 'awp.noData': 'No data', 'awp.worked': 'worked', 'awp.confirmed': 'confirmed', 'awp.validated': 'validated', 'awp.ofConfirmed': 'of {total} · {pct}% confirmed', 'awp.byBand': 'By band (confirmed / worked)', 'awp.filterReferences': 'Filter references…', 'awp.filterAll': 'All', 'awp.filterWkd': 'Wkd', 'awp.filterNotWkd': 'Not wkd', 'awp.filterWkdNotCfmd': 'Wkd not cfmd', 'awp.modePhone': 'Phone', 'awp.modeDigital': 'Digital', 'awp.refs': 'refs', 'awp.missingRefsTitle': "Contacts in this award's scope (right DXCC/band/mode) but with no reference — they're excluded until you add it", 'awp.missingRefs': 'Missing refs', 'awp.gridView': 'Grid view', 'awp.listView': 'List view', 'awp.statistics': 'Statistics', 'awp.statistic': 'Statistic', 'awp.total': 'Total', 'awp.grand': 'Grand', 'awp.ref': 'Ref', 'awp.description': 'Description', 'awp.cellTitle': '{ref} · {band} — click to view QSOs', 'awp.name': 'Name', 'awp.groupCol': 'Group', 'awp.prefixCol': 'Prefix', 'awp.status': 'Status', 'awp.bands': 'Bands', 'awp.missing': '— missing', 'awp.contactsMissingRef': 'contacts missing a reference', 'awp.recomputeTitle': "Recompute now — contacts you've fixed drop off the list", 'awp.refresh': 'Refresh', 'awp.missingScopeHelp': "In this award's scope (DXCC / band / mode / dates) but no reference was found — so they don't count yet. Sort by a column, tick the matching contacts, then assign the reference below.", 'awp.orClickRow': '(Or click a row to open the QSO.)', 'awp.selectedArrow': '{n} selected →', 'awp.chooseReference': 'Choose a reference to assign…', 'awp.assignToSelected': 'Assign to {n} selected', 'awp.scanning': 'Scanning…', 'awp.noGaps': 'No gaps found. (Missing-reference detection applies to awards scoped to a DXCC entity — e.g. DDFM, WAS, RAC, WAJA.)', 'awp.dateUtc': 'Date (UTC)', 'awp.callsign': 'Callsign', 'awp.band': 'Band', 'awp.mode': 'Mode', 'awp.country': 'Country', 'awp.qthNote': 'QTH / Note', 'awp.stations': 'stations', 'awp.contactsWithoutRef': 'contacts without a reference', 'awp.assignedMsg': 'Assigned {code}@{ref} to {n} contact(s).', 'awp.loading': 'Loading…', 'awp.noQsos': 'No QSOs.',
|
||||||
'awed.addCountry': 'Add country…', 'awed.exportedTo': 'Awards exported to:\n{path}', 'awed.importedMsg': 'Imported {awards} award(s) and {references} reference(s).', 'awed.awardManagement': 'Award management', 'awed.searchAwards': 'Search awards…', 'awed.newAward': 'New award', 'awed.clickToDismiss': 'Click to dismiss', 'awed.selectOrCreate': 'Select or create an award.', 'awed.tabInfo': 'Award info', 'awed.tabType': 'Award type', 'awed.tabConfirmation': 'Confirmation', 'awed.tabReferences': 'References', 'awed.awardName': 'Award name', 'awed.valid': 'Valid', 'awed.deleteAward': 'Delete award', 'awed.description': 'Description', 'awed.awardUrl': 'Award URL', 'awed.refDisplay': 'Column shows', 'awed.refDisplayRef': 'Reference', 'awed.refDisplayName': 'Description / name', 'awed.refDisplayBoth': 'Both (ref — name)', 'awed.referenceUrl': 'Reference URL', 'awed.validFrom': 'Valid from', 'awed.validTo': 'Valid to', 'awed.dxccFilter': 'DXCC filter', 'awed.validBands': 'Valid bands (empty = all)', 'awed.emission': 'Emission (empty = all)', 'awed.validModes': 'Valid modes (empty = all)', 'awed.awardType': 'Award type', 'awed.dynamicRefs': 'Dynamic references (not predefined — any value counts, like POTA)', 'awed.qsoParams': 'QSO parameters (used by QSOFIELDS / REFERENCE types)', 'awed.searchInField': 'Search in field', 'awed.matchBy': 'Match by', 'awed.exactMatch': 'Exact match (else search reference inside the field)', 'awed.oneRef': 'One reference per QSO', 'awed.oneRefHint': 'When several references match the same contact, assign none and list it under missing references. For awards where two entries can share a description — two DOKs called Gießen — picking one at random would write the wrong one into the log.', 'awed.patternRegex': 'Pattern (regex)', 'awed.patternPlaceholder': 'group 1 = reference (for match-by pattern / dynamic)', 'awed.leadingString': 'Leading string', 'awed.trailingString': 'Trailing string', 'awed.additionalSearches': 'Fallback searches', 'awed.orAlsoMatch': '— tried in order, only if nothing matched yet; first hit wins', 'awed.addOr': 'Add OR', 'awed.orSearchIn': 'OR — search in', 'awed.exact': 'exact', 'awed.removeOrSearch': 'Remove this OR search', 'awed.orPatternPlaceholder': 'regex — group 1 = reference (e.g. \\b(\\d{2})\\d{3}\\b for postal → dept)', 'awed.prefixPlaceholder': 'prefix (D)', 'awed.prefixTitle': 'Prepended to each found reference, e.g. 74 → D74', 'awed.confirmationLabel': 'Confirmation (worked → confirmed)', 'awed.validationLabel': 'Validation (confirmed → validated)', 'awed.resetDefaults': 'Reset to defaults', 'awed.exportTitle': 'Export all award definitions + reference lists to a JSON backup', 'awed.export': 'Export…', 'awed.importTitle': 'Import an award bundle (definitions + reference lists)', 'awed.import': 'Import…', 'awed.cancel': 'Cancel', 'awed.save': 'Save', 'awed.populatedMsg': 'Populated {n} built-in references.', 'awed.newRefCodePrompt': 'New reference code:', 'awed.importedRefsMsg': 'Imported {n} references.', 'awed.referenceCount': 'Reference count:', 'awed.applyPreset': 'Apply preset…', 'awed.pasteCsv': 'Paste / CSV', 'awed.populateBuiltinTitle': 'Replace with the shipped built-in list (DXCC entities, French departments, …)', 'awed.populateBuiltin': 'Populate built-in', 'awed.updateOnline': 'Update online', 'awed.add': 'Add', 'awed.onePerLine': 'One reference per line:', 'awed.replacesList': '(comma/semicolon/tab). Replaces the whole list.', 'awed.import2': 'Import', 'awed.search': 'Search…', 'awed.searching': 'Searching…', 'awed.tooManyItems': 'Too many items ({total}). Please refine search (type 2+ characters).', 'awed.noReferences': 'No references.', 'awed.selectReference': 'Select a reference, or Add / import a list.', 'awed.group': 'Group', 'awed.subgroup': 'Subgroup', 'awed.perRefRegex': 'optional per-reference regex', 'awed.grid': 'Grid', 'awed.saveReference': 'Save reference',
|
'awed.addCountry': 'Add country…', 'awed.exportedTo': 'Awards exported to:\n{path}', 'awed.importedMsg': 'Imported {awards} award(s) and {references} reference(s).', 'awed.awardManagement': 'Award management', 'awed.searchAwards': 'Search awards…', 'awed.newAward': 'New award', 'awed.clickToDismiss': 'Click to dismiss', 'awed.selectOrCreate': 'Select or create an award.', 'awed.tabInfo': 'Award info', 'awed.tabType': 'Award type', 'awed.tabConfirmation': 'Confirmation', 'awed.tabReferences': 'References', 'awed.awardName': 'Award name', 'awed.valid': 'Valid', 'awed.deleteAward': 'Delete award', 'awed.description': 'Description', 'awed.awardUrl': 'Award URL', 'awed.refDisplay': 'Column shows', 'awed.refDisplayRef': 'Reference', 'awed.refDisplayName': 'Description / name', 'awed.refDisplayBoth': 'Both (ref — name)', 'awed.referenceUrl': 'Reference URL', 'awed.validFrom': 'Valid from', 'awed.validTo': 'Valid to', 'awed.dxccFilter': 'DXCC filter', 'awed.validBands': 'Valid bands (empty = all)', 'awed.emission': 'Emission (empty = all)', 'awed.validModes': 'Valid modes (empty = all)', 'awed.awardType': 'Award type', 'awed.dynamicRefs': 'Dynamic references (not predefined — any value counts, like POTA)', 'awed.qsoParams': 'QSO parameters (used by QSOFIELDS / REFERENCE types)', 'awed.searchInField': 'Search in field', 'awed.matchBy': 'Match by', 'awed.exactMatch': 'Exact match (else search reference inside the field)', 'awed.oneRef': 'One reference per QSO', 'awed.oneRefHint': 'When several references match the same contact, assign none and list it under missing references. For awards where two entries can share a description — two DOKs called Gießen — picking one at random would write the wrong one into the log.', 'awed.patternRegex': 'Pattern (regex)', 'awed.patternPlaceholder': 'group 1 = reference (for match-by pattern / dynamic)', 'awed.leadingString': 'Leading string', 'awed.trailingString': 'Trailing string', 'awed.additionalSearches': 'Fallback searches', 'awed.orAlsoMatch': '— tried in order, only if nothing matched yet; first hit wins', 'awed.addOr': 'Add OR', 'awed.orSearchIn': 'OR — search in', 'awed.exact': 'exact', 'awed.removeOrSearch': 'Remove this OR search', 'awed.orPatternPlaceholder': 'regex — group 1 = reference (e.g. \\b(\\d{2})\\d{3}\\b for postal → dept)', 'awed.prefixPlaceholder': 'prefix (D)', 'awed.prefixTitle': 'Prepended to each found reference, e.g. 74 → D74', 'awed.confirmationLabel': 'Confirmation (worked → confirmed)', 'awed.validationLabel': 'Validation (confirmed → validated)', 'awed.resetDefaults': 'Reset to defaults', 'awed.exportTitle': 'Export all award definitions + reference lists to a JSON backup', 'awed.export': 'Export…', 'awed.importTitle': 'Import an award bundle (definitions + reference lists)', 'awed.import': 'Import…', 'awed.cancel': 'Cancel', 'awed.save': 'Save', 'awed.populatedMsg': 'Populated {n} built-in references.', 'awed.newRefCodePrompt': 'New reference code:', 'awed.importedRefsMsg': 'Imported {n} references.', 'awed.referenceCount': 'Reference count:', 'awed.applyPreset': 'Apply preset…', 'awed.pasteCsv': 'Paste / CSV', 'awed.populateBuiltinTitle': 'Replace with the shipped built-in list (DXCC entities, French departments, …)', 'awed.populateBuiltin': 'Populate built-in', 'awed.updateOnline': 'Update online', 'awed.add': 'Add', 'awed.onePerLine': 'One reference per line:', 'awed.replacesList': '(comma/semicolon/tab). Replaces the whole list.', 'awed.import2': 'Import', 'awed.search': 'Search…', 'awed.searching': 'Searching…', 'awed.tooManyItems': 'Too many items ({total}). Please refine search (type 2+ characters).', 'awed.noReferences': 'No references.', 'awed.selectReference': 'Select a reference, or Add / import a list.', 'awed.group': 'Group', 'awed.subgroup': 'Subgroup', 'awed.perRefRegex': 'optional per-reference regex', 'awed.grid': 'Grid', 'awed.saveReference': 'Save reference',
|
||||||
'awed.updateAvailable': 'An updated version of this award is available', 'awed.updateOverwrites': 'You have modified this award, so the update was not applied. Taking it replaces your definition and reference list.', 'awed.updateApply': 'Update', 'awed.updateKeepMine': 'Keep mine',
|
'awed.updateAvailable': 'An updated version of this award is available', 'awed.updateOverwrites': 'You have modified this award, so the update was not applied. Taking it replaces your definition and reference list.', 'awed.updateApply': 'Update', 'awed.updateKeepMine': 'Keep mine',
|
||||||
'awed.tabTest': 'Test', 'awed.testCallsign': 'Test against callsign', 'awed.testRun': 'Test', 'awed.testSavedOnly': 'Tests the SAVED award — save your changes first.', 'awed.testNoMatch': 'no match', 'awed.testOutOfScope': 'QSO out of scope — no rule was run.', 'awed.testSkipped': 'not run: an earlier rule already matched', 'awed.testFieldValue': 'Field', 'awed.testEmptyField': 'empty', 'awed.testNoCandidate': 'produced no candidate', 'awed.testManual': 'Manual override', 'awed.testAmbiguous': 'Ambiguous', 'awed.testAmbiguousHint': '— none kept, this award allows one reference per QSO. Assign the right one by hand.', 'awed.testSameAs': '+{n} other QSO(s), same result',
|
'awed.tabTest': 'Test', 'awed.testCallsign': 'Test against callsign', 'awed.testRun': 'Test', 'awed.testSavedOnly': 'Tests the SAVED award — save your changes first.', 'awed.testNoMatch': 'no match', 'awed.testOutOfScope': 'QSO out of scope — no rule was run.', 'awed.testSkipped': 'not run: an earlier rule already matched', 'awed.testFieldValue': 'Field', 'awed.testEmptyField': 'empty', 'awed.testNoCandidate': 'produced no candidate', 'awed.testManual': 'Manual override', 'awed.testAmbiguous': 'Ambiguous', 'awed.testAmbiguousHint': '— none kept, this award allows one reference per QSO. Assign the right one by hand.', 'awed.testSameAs': '+{n} other QSO(s), same result',
|
||||||
@@ -572,7 +575,8 @@ const fr: Dict = {
|
|||||||
'uscty.backfillIntro': "Résout le comté (et le locator) pour les QSO US déjà dans ton log qui n'en ont pas. Les valeurs existantes sont conservées — seuls les vides sont remplis.",
|
'uscty.backfillIntro': "Résout le comté (et le locator) pour les QSO US déjà dans ton log qui n'en ont pas. Les valeurs existantes sont conservées — seuls les vides sont remplis.",
|
||||||
'uscty.backfillRun': 'Remplir les comtés manquants',
|
'uscty.backfillRun': 'Remplir les comtés manquants',
|
||||||
'uscty.backfillDone': '{s} QSO US analysés · {c} comtés, {g} locators remplis.',
|
'uscty.backfillDone': '{s} QSO US analysés · {c} comtés, {g} locators remplis.',
|
||||||
'station.title': 'Contrôle station', 'station.rotator': 'Rotator', 'station.rotatorNoRead': 'Azimut non lu', 'station.pattern': 'Diagramme', 'station.bi': 'Bi', 'station.retract': 'Rétracter les éléments', 'station.moving': 'EN MOUVEMENT', 'station.elements': 'Éléments (mm)', 'station.read': 'Lire', 'station.readLengths': 'Lire les longueurs actuelles depuis le contrôleur', 'station.noLengths': 'Longueurs inconnues — clique sur Lire pour les récupérer depuis le contrôleur.', 'station.element': 'Élément', 'station.reflector': 'Réflecteur', 'station.driven': 'Radiateur', 'station.director': 'Dir', 'station.set': 'Régler', 'station.elementsHint': "Chaque appui allonge/raccourcit l'élément de 2 mm (comme le pupitre). Vérifie quel élément répond sur ton antenne.", 'station.setExactLen': "Clique pour taper la longueur actuelle exacte (recale la base si la lecture auto est fausse).", 'station.atMax': "Refusé par le contrôleur — l'élément est probablement en butée (longueur max pour cette bande), il ne peut plus s'allonger.", 'station.go': 'Aller', 'station.stop': 'Stop', 'station.dragHint': 'Glisse la poignée à gauche d un panneau pour le déplacer. Choisis un nombre de colonnes pour la disposition.', 'station.dragMove': 'Glisser pour déplacer ce panneau', 'station.colsAuto': 'Auto', 'station.addDevice': 'Ajouter un appareil', 'station.editDevice': "Modifier l'appareil", 'station.empty': "Aucune carte relais. Ajoute un WebSwitch 1216H ou une carte KMTronic 8 relais pour piloter l'alimentation et les accessoires de ta station.", 'station.online': 'En ligne', 'station.offline': 'Hors ligne', 'station.edit': 'Modifier', 'station.delete': 'Supprimer', 'station.relay': 'Relais', 'station.on': 'ON', 'station.off': 'OFF', 'station.type': "Type d'appareil", 'station.name': 'Nom', 'station.host': 'Hôte / IP', 'station.user': "Nom d'utilisateur", 'station.pass': 'Mot de passe', 'station.optional': 'optionnel', 'station.ftdiSerial': 'Numéro de série FTDI', 'station.detect': 'Détecter', 'station.ftdiHint': "La carte Denkovi se pilote en FTDI bit-bang (pas via le port COM). Choisis son numéro de série (ex. DAE0006K). Nécessite le driver FTDI D2XX installé.", 'station.channels': 'Relais', 'station.comPort': 'Port COM', 'station.noPorts': 'Aucun port', 'station.usbRelayHint': "Cartes USB-série bon marché (CH340/LCUS) protocole A0. Si la tienne ne commute pas, donne-moi le modèle / jeu de commandes.", 'station.labels': 'Libellés des relais', 'station.cancel': 'Annuler', 'station.save': 'Enregistrer', 'station.test': 'Tester la connexion', 'station.testOk': 'Connecté — {n} relais', 'station.testFail': 'Non connecté', 'station.detectNone': 'Aucune carte FTDI trouvée — vérifie le câble et que le driver D2XX est installé.', 'station.detectFound': '{n} carte(s) détectée(s).',
|
'station.title': 'Contrôle station', 'station.rotator': 'Rotator', 'station.rotatorNoRead': 'Azimut non lu', 'station.pattern': 'Diagramme', 'station.bi': 'Bi', 'station.retract': 'Rétracter les éléments', 'station.moving': 'EN MOUVEMENT', 'station.elements': 'Éléments (mm)', 'station.read': 'Lire', 'station.readLengths': 'Lire les longueurs actuelles depuis le contrôleur', 'station.noLengths': 'Longueurs inconnues — clique sur Lire pour les récupérer depuis le contrôleur.', 'station.element': 'Élément', 'station.reflector': 'Réflecteur', 'station.driven': 'Radiateur', 'station.director': 'Dir', 'station.set': 'Régler', 'station.elementsHint': "Chaque appui allonge/raccourcit l'élément de 2 mm (comme le pupitre). Vérifie quel élément répond sur ton antenne.", 'station.setExactLen': "Clique pour taper la longueur actuelle exacte (recale la base si la lecture auto est fausse).", 'station.atMax': "Refusé par le contrôleur — l'élément est probablement en butée (longueur max pour cette bande), il ne peut plus s'allonger.", 'station.go': 'Aller', 'station.stop': 'Stop', 'station.dragHint': 'Glisse la poignée à gauche d un panneau pour le déplacer. Choisis un nombre de colonnes pour la disposition.', 'station.dragMove': 'Glisser pour déplacer ce panneau', 'station.colsAuto': 'Auto', 'station.addDevice': 'Ajouter un appareil', 'station.editDevice': "Modifier l'appareil", 'station.empty': "Aucune carte relais. Ajoute un WebSwitch 1216H ou une carte KMTronic 8 relais pour piloter l'alimentation et les accessoires de ta station.", 'station.online': 'En ligne', 'station.offline': 'Hors ligne', 'station.edit': 'Modifier', 'station.delete': 'Supprimer', 'station.relay': 'Relais', 'station.on': 'ON', 'station.off': 'OFF', 'station.type': "Type d'appareil", 'station.name': 'Nom', 'station.host': 'Hôte / IP', 'station.hostHint': "IP du LAN en local. Pour joindre la carte depuis L'EXTÉRIEUR, saisis une URL complète ici — ex. https://relais.tondomaine.com — pointant vers un reverse proxy (Nginx Proxy Manager…) qui expose le port HTTP de la carte.", 'station.user': "Nom d'utilisateur", 'station.pass': 'Mot de passe', 'station.optional': 'optionnel', 'station.ftdiSerial': 'Numéro de série FTDI', 'station.detect': 'Détecter', 'station.ftdiHint': "La carte Denkovi se pilote en FTDI bit-bang (pas via le port COM). Choisis son numéro de série (ex. DAE0006K). Nécessite le driver FTDI D2XX installé.", 'station.channels': 'Relais', 'station.comPort': 'Port COM', 'station.noPorts': 'Aucun port', 'station.usbRelayHint': "Cartes USB-série bon marché (CH340/LCUS) protocole A0. Si la tienne ne commute pas, donne-moi le modèle / jeu de commandes.", 'station.labels': 'Libellés des relais', 'station.cancel': 'Annuler', 'station.save': 'Enregistrer', 'station.test': 'Tester la connexion', 'station.testOk': 'Connecté — {n} relais', 'station.testFail': 'Non connecté', 'station.detectNone': 'Aucune carte FTDI trouvée — vérifie le câble et que le driver D2XX est installé.', 'station.detectFound': '{n} carte(s) détectée(s).',
|
||||||
|
'awards.followHint': 'Diplômes affichés dans l’onglet Awards. Laisse la colonne de droite vide pour tous les afficher.', 'awards.available': 'Tous les diplômes', 'awards.followed': 'Suivis', 'awards.search': 'Filtrer…', 'awards.addAll': 'Tout ajouter', 'awards.clear': 'Vider', 'awards.allTracked': 'Tous les diplômes sont suivis.', 'awards.noneFollowed': 'Aucun pour l’instant — l’onglet Awards les montre tous.',
|
||||||
'sec.awards': 'Diplômes', 'sec.cat': 'Interface CAT', 'sec.rotator': 'Rotator', 'sec.winkeyer': 'Manipulateur CW',
|
'sec.awards': 'Diplômes', 'sec.cat': 'Interface CAT', 'sec.rotator': 'Rotator', 'sec.winkeyer': 'Manipulateur CW',
|
||||||
'sec.antenna': 'Antenne motorisée', 'sec.antgenius': 'Antenna Genius', 'sec.tunergenius': 'Tuner Genius', 'sec.pgxl': 'Amplificateur', 'sec.flex': 'FlexRadio', 'sec.audio': 'Périphériques audio',
|
'sec.antenna': 'Antenne motorisée', 'sec.antgenius': 'Antenna Genius', 'sec.tunergenius': 'Tuner Genius', 'sec.pgxl': 'Amplificateur', 'sec.flex': 'FlexRadio', 'sec.audio': 'Périphériques audio',
|
||||||
// Panneau Manipulateur CW
|
// Panneau Manipulateur CW
|
||||||
@@ -672,6 +676,8 @@ const fr: Dict = {
|
|||||||
'clu.moveUp': 'Monter', 'clu.moveDown': 'Descendre', 'clu.edit': 'Éditer', 'clu.delete': 'Supprimer', 'clu.none': 'Aucun nœud cluster enregistré.', 'clu.connect': 'Connecter', 'clu.disconnect': 'Déconnecter',
|
'clu.moveUp': 'Monter', 'clu.moveDown': 'Descendre', 'clu.edit': 'Éditer', 'clu.delete': 'Supprimer', 'clu.none': 'Aucun nœud cluster enregistré.', 'clu.connect': 'Connecter', 'clu.disconnect': 'Déconnecter',
|
||||||
'clu.add': 'Ajouter cluster', 'clu.connectAll': 'Tout connecter', 'clu.disconnectAll': 'Tout déconnecter', 'clu.autoConnect': 'Connexion auto de tous les activés au démarrage',
|
'clu.add': 'Ajouter cluster', 'clu.connectAll': 'Tout connecter', 'clu.disconnectAll': 'Tout déconnecter', 'clu.autoConnect': 'Connexion auto de tous les activés au démarrage',
|
||||||
'clu.freeNodes': 'Nœuds publics gratuits :',
|
'clu.freeNodes': 'Nœuds publics gratuits :',
|
||||||
|
'clu.workedSameSlot': 'Déjà contacté seulement sur le même slot',
|
||||||
|
'clu.workedSameSlotHint': '— un spot n\'affiche « contacté » que si vous avez contacté cet indicatif sur la MÊME bande et le MÊME mode, pas juste n\'importe où. Se combine avec le groupage des modes numériques (Réglages → Général) : activé, un indicatif contacté en 20m FT8 compte aussi comme contacté pour un spot 20m FT4 ; désactivé, FT8 et FT4 sont des slots distincts.',
|
||||||
'bk.hintMysql': "À la fermeture (1×/jour) OpsLog sauvegarde le SQLite local (config) ET exporte le log MySQL partagé en ADIF — opslog-log-<date>.adi — pour protéger tes contacts même s'ils sont sur le serveur. La rotation garde les N derniers de chaque.",
|
'bk.hintMysql': "À la fermeture (1×/jour) OpsLog sauvegarde le SQLite local (config) ET exporte le log MySQL partagé en ADIF — opslog-log-<date>.adi — pour protéger tes contacts même s'ils sont sur le serveur. La rotation garde les N derniers de chaque.",
|
||||||
'bk.hint': "OpsLog peut copier la base SQLite dans un dossier de ton choix à la fermeture, une fois par jour. La rotation garde les N dernières copies et supprime les plus anciennes.",
|
'bk.hint': "OpsLog peut copier la base SQLite dans un dossier de ton choix à la fermeture, une fois par jour. La rotation garde les N dernières copies et supprime les plus anciennes.",
|
||||||
'bk.auto': 'Sauvegarde auto à la fermeture d\'OpsLog (max 1×/jour)', 'bk.folder': 'Dossier de sauvegarde', 'bk.folderPh': 'vide = dossier par défaut', 'bk.browse': 'Parcourir…',
|
'bk.auto': 'Sauvegarde auto à la fermeture d\'OpsLog (max 1×/jour)', 'bk.folder': 'Dossier de sauvegarde', 'bk.folderPh': 'vide = dossier par défaut', 'bk.browse': 'Parcourir…',
|
||||||
@@ -681,10 +687,10 @@ const fr: Dict = {
|
|||||||
'cat.hint': "Lit la fréquence / bande / mode du poste et les injecte dans le bandeau de saisie en temps réel. Utilise OmniRig (gratuit, tout poste) ou — pour FlexRadio — l'API native SmartSDR (sans OmniRig, temps réel, sans le bug du mode au 2ᵉ clic).",
|
'cat.hint': "Lit la fréquence / bande / mode du poste et les injecte dans le bandeau de saisie en temps réel. Utilise OmniRig (gratuit, tout poste) ou — pour FlexRadio — l'API native SmartSDR (sans OmniRig, temps réel, sans le bug du mode au 2ᵉ clic).",
|
||||||
'ag2.hint': "OpsLog dialogue avec le switch 4O3A Antenna Genius en TCP (protocole GSCP). Le port est fixé à 9007, seule l'IP de l'appareil est nécessaire. Un widget ancré permet ensuite de commuter les antennes par port (A/B).", 'ag2.password': 'Mot de passe distant', 'ag2.passwordPh': 'vide en LAN', 'ag2.passwordHint': "Nécessaire seulement à distance — l'appareil annonce alors « AG AUTH » et refuse les commandes tant qu'on n'est pas identifié. Laisse vide sur le réseau local.",
|
'ag2.hint': "OpsLog dialogue avec le switch 4O3A Antenna Genius en TCP (protocole GSCP). Le port est fixé à 9007, seule l'IP de l'appareil est nécessaire. Un widget ancré permet ensuite de commuter les antennes par port (A/B).", 'ag2.password': 'Mot de passe distant', 'ag2.passwordPh': 'vide en LAN', 'ag2.passwordHint': "Nécessaire seulement à distance — l'appareil annonce alors « AG AUTH » et refuse les commandes tant qu'on n'est pas identifié. Laisse vide sur le réseau local.",
|
||||||
'tg2.hint': "OpsLog dialogue avec le 4O3A Tuner Genius XL en TCP (port fixé à 9010), seule l'IP de l'appareil est nécessaire. Un widget ancré affiche le ROS et la puissance directe et propose Accord, Bypass et Operate/Standby. Pilotage direct (pas via la radio) pour n'utiliser qu'une des connexions de la boîte.", 'tg2.enable': "Activer le contrôle du Tuner Genius", 'tg2.portHint': "Le port TCP est fixé à 9010 sur l'appareil.", 'tg2.password': 'Code distant', 'tg2.passwordPh': 'vide en LAN', 'tg2.passwordHint': "Nécessaire seulement à distance — l'appareil annonce alors « AUTH » et refuse les commandes tant qu'on n'est pas identifié. Laisse vide sur le réseau local.",
|
'tg2.hint': "OpsLog dialogue avec le 4O3A Tuner Genius XL en TCP (port fixé à 9010), seule l'IP de l'appareil est nécessaire. Un widget ancré affiche le ROS et la puissance directe et propose Accord, Bypass et Operate/Standby. Pilotage direct (pas via la radio) pour n'utiliser qu'une des connexions de la boîte.", 'tg2.enable': "Activer le contrôle du Tuner Genius", 'tg2.portHint': "Le port TCP est fixé à 9010 sur l'appareil.", 'tg2.password': 'Code distant', 'tg2.passwordPh': 'vide en LAN', 'tg2.passwordHint': "Nécessaire seulement à distance — l'appareil annonce alors « AUTH » et refuse les commandes tant qu'on n'est pas identifié. Laisse vide sur le réseau local.",
|
||||||
'rot.enable': 'Activer le contrôle du rotator', 'rot.testOkRG': 'Connecté — le Rotator Genius a accepté la commande (rotation vers 0°).', 'rot.type': 'Type de rotator', 'rot.rotatorNum': 'Rotator n°', 'rot.dual': 'Deux rotors', 'rot.rotor1': 'Rotor 1', 'rot.rotor2': 'Rotor 2', 'rot.name': 'Nom', 'rot.antenna': 'Antenne', 'rot.antenna1': 'Antenne rotor 1', 'rot.antenna2': 'Antenne rotor 2', 'rot.name1': 'Nom du rotor 1', 'rot.name2': 'Nom du rotor 2', 'rot.antStd': 'Antenne standard', 'rot.antMotor': 'Motorisée (Ultrabeam/SteppIR)', 'rot.add': 'Ajouter un rotor', 'rot.remove': 'Supprimer le rotor', 'rot.none': 'Aucun rotor configuré. Cliquez sur « Ajouter un rotor ».', 'rot.rgDual': 'Ce Rotator Genius pilote deux rotors (en ajoute un second)', 'rot.testRotor1': 'Tester rotor 1', 'rot.testRotor2': 'Tester rotor 2', 'rot.dualHint': 'Deux rotors indépendants de n\'importe quel type — par exemple un ARCO et un Rotator Genius côte à côte. Configurez chacun ci-dessous ; OpsLog affiche un sélecteur Rotor 1/2 sur le compas pour choisir celui qu\'il tourne et affiche. Réglez chaque rotor sur « Motorisée » pour que les tracés de boom/diagramme (inverse, bidirectionnel) n\'apparaissent que pour celui qui porte l\'Ultrabeam/SteppIR. (Pour un seul Rotator Genius pilotant deux rotors, réglez les deux sur Rotator Genius avec le même hôte et le rotator n° 1 et 2.)', 'rot.rgHint': 'Parle directement à un Rotator Genius 4O3A en TCP (port 9006 par défaut) — sans PstRotator. Le n° choisit lequel des deux rotators du boîtier piloter.', 'rot.arcoHint': "Parle directement à tout contrôleur réglé sur Yaesu GS-232A — sans PstRotator. microHAM ARCO : régler Config → LAN → CONTROL PROTOCOL (ou USB CONTROL PROTOCOL) sur « Yaesu GS-232A » ; en USB la vitesse est sans importance. ERC (Easy Rotor Control, ERC Mini compris) : son émulation DOIT être réglée sur GS-232 — un ERC laissé en Hy-Gain DCU-1 parle un autre jeu de commandes et ne répondra pas — puis choisir son port COM et la même vitesse que dans la configuration de l'ERC.", 'rot.hint': "OpsLog envoie des commandes UDP à PstRotator. Active l'écouteur UDP de PstRotator (Setup → Communication → UDP) avant de tester.",
|
'rot.enable': 'Activer le contrôle du rotator', 'rot.testOkRG': 'Connecté — le Rotator Genius a accepté la commande (rotation vers 0°).', 'rot.type': 'Type de rotator', 'rot.rotatorNum': 'Rotator n°', 'rot.dual': 'Deux rotors', 'rot.rotor1': 'Rotor 1', 'rot.rotor2': 'Rotor 2', 'rot.name': 'Nom', 'rot.antenna': 'Antenne', 'rot.antenna1': 'Antenne rotor 1', 'rot.antenna2': 'Antenne rotor 2', 'rot.name1': 'Nom du rotor 1', 'rot.name2': 'Nom du rotor 2', 'rot.antStd': 'Antenne standard', 'rot.antMotor': 'Motorisée (Ultrabeam/SteppIR)', 'rot.add': 'Ajouter un rotor', 'rot.remove': 'Supprimer le rotor', 'rot.none': 'Aucun rotor configuré. Cliquez sur « Ajouter un rotor ».', 'rot.rgDual': 'Ce Rotator Genius pilote deux rotors (en ajoute un second)', 'rot.testRotor1': 'Tester rotor 1', 'rot.testRotor2': 'Tester rotor 2', 'rot.dualHint': 'Deux rotors indépendants de n\'importe quel type — par exemple un ARCO et un Rotator Genius côte à côte. Configurez chacun ci-dessous ; OpsLog affiche un sélecteur Rotor 1/2 sur le compas pour choisir celui qu\'il tourne et affiche. Réglez chaque rotor sur « Motorisée » pour que les tracés de boom/diagramme (inverse, bidirectionnel) n\'apparaissent que pour celui qui porte l\'Ultrabeam/SteppIR. (Pour un seul Rotator Genius pilotant deux rotors, réglez les deux sur Rotator Genius avec le même hôte et le rotator n° 1 et 2.)', 'rot.rgHint': 'Parle directement à un Rotator Genius 4O3A en TCP (port 9006 par défaut) — sans PstRotator. Le n° choisit lequel des deux rotators du boîtier piloter.', 'rot.arcoHint': "Parle directement à tout contrôleur réglé sur Yaesu GS-232A — sans PstRotator. microHAM ARCO : régler Config → LAN → CONTROL PROTOCOL (ou USB CONTROL PROTOCOL) sur « Yaesu GS-232A » ; en USB la vitesse est sans importance. ERC (Easy Rotor Control, ERC Mini compris) : son émulation DOIT être réglée sur GS-232 — un ERC laissé en Hy-Gain DCU-1 parle un autre jeu de commandes et ne répondra pas — puis choisir son port COM et la même vitesse que dans la configuration de l'ERC.", 'rot.dcu1Hint': "Parle le jeu de commandes Hy-Gain DCU-1 (RotorCard DXA, Idiom Press Rotor-EZ, Green Heron). Connexion via le port COM du contrôleur (un DCU-1 est à 4800 bauds ; RotorCard/Green Heron peuvent différer — reprendre la vitesse du contrôleur) ou en TCP via un pont série-sur-IP. Azimut uniquement, pas d'élévation. Nouveau pilote — signalez si votre contrôleur nécessite une autre commande ou vitesse.", 'rot.hint': "OpsLog envoie des commandes UDP à PstRotator. Active l'écouteur UDP de PstRotator (Setup → Communication → UDP) avant de tester.",
|
||||||
'extsvc.hint': "Envoie les QSO enregistrés vers des carnets en ligne. Chaque service upload automatiquement à chaque nouveau QSO si activé ; le délai est propre à chaque service (immédiat, ou 1–2 min pour corriger un QSO mal saisi avant).",
|
'extsvc.hint': "Envoie les QSO enregistrés vers des carnets en ligne. Chaque service upload automatiquement à chaque nouveau QSO si activé ; le délai est propre à chaque service (immédiat, ou 1–2 min pour corriger un QSO mal saisi avant).",
|
||||||
'hw.motorTxInhibit': "Inhiber la transmission pendant que l'antenne bouge", 'hw.motorTxInhibitHint': "Empêche le FlexRadio d'émettre pendant que les éléments bougent (nécessite le FlexRadio en API + cette antenne activée). Sans effet avec les autres radios.", 'hw.motorAntenna': 'Antenne motorisée', 'hw.motorEnable': "Activer le contrôle de l'antenne", 'hw.motorType': "Type d'antenne", 'hw.motorTransport': 'Connexion', 'hw.motorTcp': 'Réseau (TCP)', 'hw.motorSerial': 'Série (COM)', 'hw.motorCom': 'Port série', 'hw.motorBaud': 'Débit', 'hw.steppirHint': "Les contrôleurs SteppIR sont en RS-232 série (port DB9 « DATA OUT »). Série = un adaptateur USB↔RS-232 (FTDI), vu comme un port COM. Réseau = un pont série-Ethernet (comme pour l'Ultrabeam).", 'hw.steppirRange': 'Plage accordable', 'hw.steppirRangeHint': "La couverture en fréquence de la SteppIR. Sur une bande hors de cette plage (p. ex. 30 m avec une SteppIR 20 m-6 m), OpsLog n'essaie pas d'accorder l'antenne et n'inhibe pas l'émission. Défaut 13-54 MHz (20 m-6 m) ; abaisse la borne basse (p. ex. 6) pour une SteppIR équipée 40 m.", 'hw.ultrabeam': 'Antenne (Ultrabeam)', 'hw.audioVoice': 'Périphériques audio & manipulateur vocal',
|
'hw.motorTxInhibit': "Inhiber la transmission pendant que l'antenne bouge", 'hw.motorTxInhibitHint': "Empêche le FlexRadio d'émettre pendant que les éléments bougent (nécessite le FlexRadio en API + cette antenne activée). Sans effet avec les autres radios.", 'hw.motorAntenna': 'Antenne motorisée', 'hw.motorEnable': "Activer le contrôle de l'antenne", 'hw.motorType': "Type d'antenne", 'hw.motorTransport': 'Connexion', 'hw.motorTcp': 'Réseau (TCP)', 'hw.motorSerial': 'Série (COM)', 'hw.motorCom': 'Port série', 'hw.motorBaud': 'Débit', 'hw.steppirHint': "Les contrôleurs SteppIR sont en RS-232 série (port DB9 « DATA OUT »). Série = un adaptateur USB↔RS-232 (FTDI), vu comme un port COM. Réseau = un pont série-Ethernet (comme pour l'Ultrabeam).", 'hw.steppirRange': 'Plage accordable', 'hw.steppirRangeHint': "La couverture en fréquence de la SteppIR. Sur une bande hors de cette plage (p. ex. 30 m avec une SteppIR 20 m-6 m), OpsLog n'essaie pas d'accorder l'antenne et n'inhibe pas l'émission. Défaut 13-54 MHz (20 m-6 m) ; abaisse la borne basse (p. ex. 6) pour une SteppIR équipée 40 m.", 'hw.motorBands': 'Bandes couvertes', 'hw.ultrabeam': 'Antenne (Ultrabeam)', 'hw.audioVoice': 'Périphériques audio & manipulateur vocal',
|
||||||
'cat.enable': 'Activer le CAT', 'cat.backend': 'Backend', 'cat.optOmnirig': 'OmniRig', 'cat.optFlex': 'FlexRadio (API)', 'cat.share': 'Partager le CAT avec les autres logiciels', 'cat.shareHint': "Un backend CAT natif occupe le port série de la radio, aucun autre logiciel ne peut donc y accéder. Ceci permet à WSJT-X, JTDX, MSHV ou Log4OM de dialoguer avec la radio À TRAVERS OpsLog : dans l'autre logiciel, choisissez le modèle « Hamlib NET rigctl » et saisissez 127.0.0.1:4532. Fonctionne avec tous les backends, pas seulement les natifs.", 'cat.sharePort': 'Port de partage', 'cat.pttKey': 'Activer la touche PTT', 'cat.pttKeyPress': 'Appuyez sur une touche…', 'cat.pttKeyNone': 'Cliquez pour définir une touche', 'cat.pttKeyClear': 'Effacer', 'cat.pttKeyToggle': 'Mode bascule (appui = émission, nouvel appui = arrêt)', 'cat.pttKeyHint': "Quand OpsLog a le focus, cette touche passe la radio en émission — maintenue par défaut (relâcher pour arrêter), ou verrouillée en mode bascule. Elle utilise la méthode PTT de Audio → PTT (CAT / RTS / DTR), avec repli sur le CAT. Choisissez une touche que vous ne tapez jamais en journalisant (ex. Pause, Arrêt défil., ou une pédale mappée dessus) — OpsLog l'intercepte pour qu'elle n'atterrisse pas dans un champ.", 'cat.optXiegu': 'Xiegu (USB)', 'cat.xieguPort': 'Port CAT Xiegu', 'cat.xieguBaudHint': 'Doit correspondre au menu de la radio (G90 par défaut : 19200).', 'cat.xieguAddrHint': "Adresse CI-V d'usine de la famille G90/X6100 : 0x70.", 'cat.xieguPTTLine': 'Passage en \u00e9mission', 'cat.xieguPTTCiv': 'Commande CI-V', 'cat.xieguPTTHint': 'Un G90 ne passe pas en \u00e9mission sur la commande CI-V : les interfaces comme le DE-19 le pilotent par RTS ou DTR. Choisissez la ligne de la v\u00f4tre \u2014 c\u2019est aussi ce qui permet \u00e0 WSJT-X d\u2019\u00e9mettre via le partage CAT.', 'cat.optYaesu': 'Yaesu (USB)', 'cat.optKenwood': 'Kenwood (USB, réseau)', 'cat.civTrace': 'Journaliser le protocole CAT', 'cat.civTraceHint': '\u00c9crit dans le journal chaque trame CAT \u00e9chang\u00e9e avec la radio \u2014 CI-V en hexad\u00e9cimal, Kenwood en texte. Pour signaler une radio qui r\u00e9pond de travers \u2014 un bouton qui fait autre chose, une fr\u00e9quence qui saute. Valable pour la session seulement : c\u2019est un diagnostic, et le journal grossit vite.', 'cat.kenwoodPort': 'Port COM Kenwood', 'cat.kenwoodPortHint': 'Le port s\u00e9rie CAT/USB de la radio (TS-590, TS-890, TS-990, TS-2000, ainsi que les Elecraft K3/K4 qui parlent le m\u00eame dialecte).', 'cat.kenwoodBaudHint': 'Doit correspondre au MENU de la radio : un TS-590 sort d\u2019usine \u00e0 9600, un TS-890 \u00e0 115200.', 'cat.kenwoodHost': 'Ou par le r\u00e9seau (h\u00f4te:port)', 'cat.kenwoodHostHint': 'Un pont s\u00e9rie-r\u00e9seau \u2014 ser2net, un bo\u00eetier Ethernet-s\u00e9rie, un Raspberry Pi pr\u00e8s de la radio. S\u2019il est rempli, il est utilis\u00e9 \u00c0 LA PLACE du port COM ci-dessus. Il ne s\u2019agit pas de la prise RJ45 de la radio, qui parle le protocole KNS de Kenwood et n\u2019est pas prise en charge.', 'cat.yaesuPort': 'Port CAT Yaesu', 'cat.yaesuPortHint': "Le port CAT de la radio — sur un FTDX10/FTDX101 en USB c'est le port COM ENHANCED, pas le standard.", 'cat.yaesuBaudHint': 'Doit correspondre au menu de la radio (FTDX10/FTDX101 par défaut : 38400).', 'cat.lowerLines': 'Abaisser les lignes DTR et RTS à la connexion', 'cat.lowerLinesHint': 'Windows les lève à l’ouverture du port, et certaines interfaces lisent l’une ou l’autre comme PTT — la radio émet alors tant qu’OpsLog tourne. À cocher seulement dans ce cas : d’autres interfaces ont besoin de RTS haut pour émettre, et l’abaisser rend la radio muette.', 'cat.optIcom': 'Icom (CI-V USB)', 'cat.optIcomNet': 'Icom (CI-V réseau)', 'cat.optTci': 'TCI', 'flxpw.title': 'FlexRadio \u2014 puissance par bande et par mode', 'flxpw.hint': 'Puissance d\u2019\u00e9mission appliqu\u00e9e au changement de bande ou de mode. Laissez une case vide pour ne pas toucher \u00e0 la puissance.', 'flxpw.band': 'Bande', 'flxb.title': 'FlexRadio \u2014 antennes et puissance par bande', 'flxb.hint': 'Les antennes sont appliqu\u00e9es au changement de bande ; la puissance au changement de bande ou de mode. Laissez une case de puissance vide pour ne pas y toucher.', 'flxb.rxAnt': 'Antenne RX', 'flxb.txAnt': 'Antenne TX', 'flxb.noRadio': 'Aucune antenne remont\u00e9e \u2014 connectez le FlexRadio, puis rouvrez ce panneau.', 'flxpw.phone': 'Phonie', 'flxpw.digi': 'Num\u00e9rique', 'flxpw.noBands': 'Aucune bande configur\u00e9e \u2014 ajoutez-les dans Listes \u2192 Bandes.', 'flxpw.saved': 'Enregistr\u00e9',
|
'cat.enable': 'Activer le CAT', 'cat.backend': 'Backend', 'cat.optOmnirig': 'OmniRig', 'cat.optFlex': 'FlexRadio (API)', 'cat.share': 'Partager le CAT avec les autres logiciels', 'cat.shareHint': "Dans l'autre logiciel, choisissez le modèle « Hamlib NET rigctl » et saisissez 127.0.0.1:4532. Fonctionne avec tous les backends, pas seulement les natifs.", 'cat.sharePort': 'Port de partage', 'cat.pttKey': 'Activer la touche PTT', 'cat.pttKeyPress': 'Appuyez sur une touche…', 'cat.pttKeyNone': 'Cliquez pour définir une touche', 'cat.pttKeyClear': 'Effacer', 'cat.pttKeyToggle': 'Mode bascule (appui = émission, nouvel appui = arrêt)', 'cat.pttKeyHint': "Quand OpsLog a le focus, cette touche passe la radio en émission — maintenue par défaut (relâcher pour arrêter), ou verrouillée en mode bascule. Elle utilise la méthode PTT de Audio → PTT (CAT / RTS / DTR), avec repli sur le CAT. Choisissez une touche que vous ne tapez jamais en journalisant (ex. Pause, Arrêt défil., ou une pédale mappée dessus) — OpsLog l'intercepte pour qu'elle n'atterrisse pas dans un champ.", 'cat.optXiegu': 'Xiegu (USB)', 'cat.xieguPort': 'Port CAT Xiegu', 'cat.xieguBaudHint': 'Doit correspondre au menu de la radio (G90 par défaut : 19200).', 'cat.xieguAddrHint': "Adresse CI-V d'usine de la famille G90/X6100 : 0x70.", 'cat.xieguPTTLine': 'Passage en \u00e9mission', 'cat.xieguPTTCiv': 'Commande CI-V', 'cat.xieguPTTHint': 'Un G90 ne passe pas en \u00e9mission sur la commande CI-V : les interfaces comme le DE-19 le pilotent par RTS ou DTR. Choisissez la ligne de la v\u00f4tre \u2014 c\u2019est aussi ce qui permet \u00e0 WSJT-X d\u2019\u00e9mettre via le partage CAT.', 'cat.optYaesu': 'Yaesu (USB)', 'cat.optKenwood': 'Kenwood (USB, réseau)', 'cat.civTrace': 'Journaliser le protocole CAT', 'cat.civTraceHint': '\u00c9crit dans le journal chaque trame CAT \u00e9chang\u00e9e avec la radio \u2014 CI-V en hexad\u00e9cimal, Kenwood en texte. Pour signaler une radio qui r\u00e9pond de travers \u2014 un bouton qui fait autre chose, une fr\u00e9quence qui saute. Valable pour la session seulement : c\u2019est un diagnostic, et le journal grossit vite.', 'cat.kenwoodPort': 'Port COM Kenwood', 'cat.kenwoodPortHint': 'Le port s\u00e9rie CAT/USB de la radio (TS-590, TS-890, TS-990, TS-2000, ainsi que les Elecraft K3/K4 qui parlent le m\u00eame dialecte).', 'cat.kenwoodBaudHint': 'Doit correspondre au MENU de la radio : un TS-590 sort d\u2019usine \u00e0 9600, un TS-890 \u00e0 115200.', 'cat.kenwoodHost': 'Ou par le r\u00e9seau (h\u00f4te:port)', 'cat.kenwoodHostHint': 'Un pont s\u00e9rie-r\u00e9seau \u2014 ser2net, un bo\u00eetier Ethernet-s\u00e9rie, un Raspberry Pi pr\u00e8s de la radio. S\u2019il est rempli, il est utilis\u00e9 \u00c0 LA PLACE du port COM ci-dessus. Il ne s\u2019agit pas de la prise RJ45 de la radio, qui parle le protocole KNS de Kenwood et n\u2019est pas prise en charge.', 'cat.yaesuPort': 'Port CAT Yaesu', 'cat.yaesuPortHint': "Le port CAT de la radio — sur un FTDX10/FTDX101 en USB c'est le port COM ENHANCED, pas le standard.", 'cat.yaesuBaudHint': 'Doit correspondre au menu de la radio (FTDX10/FTDX101 par défaut : 38400).', 'cat.lowerLines': 'Abaisser les lignes DTR et RTS à la connexion', 'cat.lowerLinesHint': 'Si votre radio est toujours en émission, cochez ceci.', 'cat.kwDataMode': 'Modes data (FT8/PSK…)', 'cat.kwDataUsb': 'USB', 'cat.kwDataMd6': 'Mode DATA — MD6 (Elecraft K3/K4)', 'cat.kwDataKeep': 'Ne pas changer le mode de la radio', 'cat.kwDataHint': "Ce qu'OpsLog règle sur la radio pour un mode data. Aucune commande unique ne convient à toutes : un Elecraft K3/K4 veut DATA (MD6) ; sur un TS-590SG/TS-990S le mode data est un modificateur d'USB réglé sur la radio, choisissez donc USB ou, plus sûr, « Ne pas changer » et passez la radio en DATA vous-même. En MD6 un Kenwood classique (TS-590/990) tomberait en FSK/RTTY — à ne pas utiliser là.", 'cat.optIcom': 'Icom (CI-V USB)', 'cat.optIcomNet': 'Icom (CI-V réseau)', 'cat.optTci': 'TCI', 'flxpw.title': 'FlexRadio \u2014 puissance par bande et par mode', 'flxpw.hint': 'Puissance d\u2019\u00e9mission appliqu\u00e9e au changement de bande ou de mode. Laissez une case vide pour ne pas toucher \u00e0 la puissance.', 'flxpw.band': 'Bande', 'flxb.title': 'FlexRadio \u2014 antennes et puissance par bande', 'flxb.hint': 'Les antennes sont appliqu\u00e9es au changement de bande ; la puissance au changement de bande ou de mode. Laissez une case de puissance vide pour ne pas y toucher.', 'flxb.rxAnt': 'Antenne RX', 'flxb.txAnt': 'Antenne TX', 'flxb.noRadio': 'Aucune antenne remont\u00e9e \u2014 connectez le FlexRadio, puis rouvrez ce panneau.', 'flxpw.phone': 'Phonie', 'flxpw.digi': 'Num\u00e9rique', 'flxpw.noBands': 'Aucune bande configur\u00e9e \u2014 ajoutez-les dans Listes \u2192 Bandes.', 'flxpw.saved': 'Enregistr\u00e9',
|
||||||
'cat.icomNetHost': 'IP / nom d\'hôte du poste', 'cat.icomNetUser': 'Utilisateur réseau (ID)', 'cat.icomNetPass': 'Mot de passe réseau',
|
'cat.icomNetHost': 'IP / nom d\'hôte du poste', 'cat.icomNetUser': 'Utilisateur réseau (ID)', 'cat.icomNetPass': 'Mot de passe réseau',
|
||||||
'cat.icomNetHint': "Se connecte directement au serveur LAN intégré du poste — sans RS-BA1 ni Remote Utility (ferme-les d'abord). Utilise l'ID/mot de passe Network User1 configurés dans le menu Network du poste. Un poste en veille est allumé automatiquement.",
|
'cat.icomNetHint': "Se connecte directement au serveur LAN intégré du poste — sans RS-BA1 ni Remote Utility (ferme-les d'abord). Utilise l'ID/mot de passe Network User1 configurés dans le menu Network du poste. Un poste en veille est allumé automatiquement.",
|
||||||
'cat.icomNetAudio': 'Diffuser l’audio RX par le réseau (expérimental)',
|
'cat.icomNetAudio': 'Diffuser l’audio RX par le réseau (expérimental)',
|
||||||
@@ -728,7 +734,7 @@ const fr: Dict = {
|
|||||||
'db.mysqlNote': "Seuls les QSO vont dans MySQL ; tes réglages, profils, stations et cluster restent locaux (et rapides). Les QSO locaux existants ne sont pas copiés — importe-les dans le journal partagé si tu veux ton historique là-bas.",
|
'db.mysqlNote': "Seuls les QSO vont dans MySQL ; tes réglages, profils, stations et cluster restent locaux (et rapides). Les QSO locaux existants ne sont pas copiés — importe-les dans le journal partagé si tu veux ton historique là-bas.",
|
||||||
'em.none': 'Aucun', 'em.smtpAuth': 'Le SMTP requiert une authentification', 'em.username': 'Utilisateur', 'em.fromAddr': 'Adresse expéditeur', 'em.replyTo': 'Adresse de réponse', 'em.replyToPh': '(optionnel — où vont les réponses)', 'em.replyToHint': "Vide = utilise l'adresse expéditeur. Renseigne-la pour que les correspondants répondent p. ex. sur ta boîte perso.",
|
'em.none': 'Aucun', 'em.smtpAuth': 'Le SMTP requiert une authentification', 'em.username': 'Utilisateur', 'em.fromAddr': 'Adresse expéditeur', 'em.replyTo': 'Adresse de réponse', 'em.replyToPh': '(optionnel — où vont les réponses)', 'em.replyToHint': "Vide = utilise l'adresse expéditeur. Renseigne-la pour que les correspondants répondent p. ex. sur ta boîte perso.",
|
||||||
'em.sendTest': 'Envoyer un e-mail test', 'em.sendingTest': 'Envoi du test…', 'em.testSent': 'E-mail test envoyé ✓', 'em.testFailed': 'Échec du test : ',
|
'em.sendTest': 'Envoyer un e-mail test', 'em.sendingTest': 'Envoi du test…', 'em.testSent': 'E-mail test envoyé ✓', 'em.testFailed': 'Échec du test : ',
|
||||||
'em.qslCardEmail': 'E-mail de carte QSL OpsLog', 'em.qslVarsHint': 'Message envoyé avec la carte QSL. Variables :', 'em.subject': 'Objet', 'em.body': 'Corps', 'em.autoSend': "Envoyer auto la QSL OpsLog à l'enregistrement d'un QSO", 'em.autoSendHint': "Envoi automatique uniquement si le contact a une adresse e-mail et qu'un modèle QSL par défaut existe.",
|
'em.recEmail': 'E-mail d’enregistrement QSO', 'em.recVarsHint': 'Message envoyé avec l’enregistrement audio du QSO. Variables :', 'em.qslCardEmail': 'E-mail de carte QSL OpsLog', 'em.qslVarsHint': 'Message envoyé avec la carte QSL. Variables :', 'em.subject': 'Objet', 'em.body': 'Corps', 'em.autoSend': "Envoyer auto la QSL OpsLog à l'enregistrement d'un QSO", 'em.autoSendHint': "Envoi automatique uniquement si le contact a une adresse e-mail et qu'un modèle QSL par défaut existe.",
|
||||||
'settings.title': 'Préférences',
|
'settings.title': 'Préférences',
|
||||||
'btn.cancel': 'Annuler', 'btn.save': 'Enregistrer', 'btn.saveClose': 'Enregistrer et fermer', 'btn.savingLong': 'Enregistrement…',
|
'btn.cancel': 'Annuler', 'btn.save': 'Enregistrer', 'btn.saveClose': 'Enregistrer et fermer', 'btn.savingLong': 'Enregistrement…',
|
||||||
'chatp.chat': 'Chat', 'chatp.online': 'En ligne', 'chatp.close': 'Fermer', 'chatp.noMessages': 'Aucun message pour le moment.', 'chatp.messagePh': 'Message…',
|
'chatp.chat': 'Chat', 'chatp.online': 'En ligne', 'chatp.close': 'Fermer', 'chatp.noMessages': 'Aucun message pour le moment.', 'chatp.messagePh': 'Message…',
|
||||||
@@ -775,7 +781,7 @@ const fr: Dict = {
|
|||||||
'detp.propAS': 'Diffusion par avion', 'detp.propAUR': 'Aurore', 'detp.propAUE': 'Aurore-E', 'detp.propBS': 'Rétrodiffusion', 'detp.propEME': 'Terre-Lune-Terre', 'detp.propES': 'Sporadique E', 'detp.propFAI': 'Irrégularités alignées au champ', 'detp.propF2': 'Réflexion F2', 'detp.propGWAVE': 'Onde de sol', 'detp.propINTERNET': 'Assisté par Internet', 'detp.propION': 'Diffusion ionosphérique', 'detp.propLOS': 'Vue directe', 'detp.propMS': 'Diffusion météoritique', 'detp.propRPT': 'Répéteur terrestre / atmosphérique', 'detp.propRS': 'Diffusion par la pluie', 'detp.propSAT': 'Satellite', 'detp.propTEP': 'Trans-équatorial', 'detp.propTR': 'Conduit troposphérique', 'detp.pathShort': 'Chemin court', 'detp.pathLong': 'Chemin long', 'detp.pathGrayline': 'Ligne grise', 'detp.pathOther': 'Autre', 'detp.tabStats': 'Stats', 'detp.tabInfo': 'Info', 'detp.tabAwards': 'Diplômes', 'detp.tabMy': 'Moi', 'detp.tabExtended': 'Étendu', 'detp.statePref': 'État / préf', 'detp.county': 'Comté', 'detp.newCounty': 'NOUV', 'detp.newCountyTip': 'Comté jamais contacté', 'detp.prefix': 'Préfixe', 'detp.cqZone': 'CQ', 'detp.ituZone': 'ITU', 'detp.dxcc': 'DXCC #', 'detp.azimuthLp': 'Azimut LP', 'detp.distanceSp': 'Distance SP', 'detp.distanceLp': 'Distance LP', 'detp.address': 'Adresse', 'detp.qslMessage': 'Message QSL', 'detp.qslVia': 'QSL via', 'detp.detected': 'Détecté — ce contact comptera pour :', 'detp.ambiguous': 'Ambigu — choisissez :', 'detp.azimuth': 'Azimut (°)', 'detp.elevation': 'Élévation (°)', 'detp.txPower': 'Puissance TX (W)', 'detp.satelliteMode': 'Mode satellite', 'detp.antPath': 'Chemin ant.', 'detp.propagation': 'Propagation', 'detp.rig': 'Station', 'detp.antenna': 'Antenne', 'detp.satName': 'Nom du satellite', 'detp.contestId': 'ID contest', 'detp.rcvdExchangePh': 'échange reçu', 'detp.sentExchangePh': 'échange envoyé', 'detp.contactedEmail': 'E-mail du contact',
|
'detp.propAS': 'Diffusion par avion', 'detp.propAUR': 'Aurore', 'detp.propAUE': 'Aurore-E', 'detp.propBS': 'Rétrodiffusion', 'detp.propEME': 'Terre-Lune-Terre', 'detp.propES': 'Sporadique E', 'detp.propFAI': 'Irrégularités alignées au champ', 'detp.propF2': 'Réflexion F2', 'detp.propGWAVE': 'Onde de sol', 'detp.propINTERNET': 'Assisté par Internet', 'detp.propION': 'Diffusion ionosphérique', 'detp.propLOS': 'Vue directe', 'detp.propMS': 'Diffusion météoritique', 'detp.propRPT': 'Répéteur terrestre / atmosphérique', 'detp.propRS': 'Diffusion par la pluie', 'detp.propSAT': 'Satellite', 'detp.propTEP': 'Trans-équatorial', 'detp.propTR': 'Conduit troposphérique', 'detp.pathShort': 'Chemin court', 'detp.pathLong': 'Chemin long', 'detp.pathGrayline': 'Ligne grise', 'detp.pathOther': 'Autre', 'detp.tabStats': 'Stats', 'detp.tabInfo': 'Info', 'detp.tabAwards': 'Diplômes', 'detp.tabMy': 'Moi', 'detp.tabExtended': 'Étendu', 'detp.statePref': 'État / préf', 'detp.county': 'Comté', 'detp.newCounty': 'NOUV', 'detp.newCountyTip': 'Comté jamais contacté', 'detp.prefix': 'Préfixe', 'detp.cqZone': 'CQ', 'detp.ituZone': 'ITU', 'detp.dxcc': 'DXCC #', 'detp.azimuthLp': 'Azimut LP', 'detp.distanceSp': 'Distance SP', 'detp.distanceLp': 'Distance LP', 'detp.address': 'Adresse', 'detp.qslMessage': 'Message QSL', 'detp.qslVia': 'QSL via', 'detp.detected': 'Détecté — ce contact comptera pour :', 'detp.ambiguous': 'Ambigu — choisissez :', 'detp.azimuth': 'Azimut (°)', 'detp.elevation': 'Élévation (°)', 'detp.txPower': 'Puissance TX (W)', 'detp.satelliteMode': 'Mode satellite', 'detp.antPath': 'Chemin ant.', 'detp.propagation': 'Propagation', 'detp.rig': 'Station', 'detp.antenna': 'Antenne', 'detp.satName': 'Nom du satellite', 'detp.contestId': 'ID contest', 'detp.rcvdExchangePh': 'échange reçu', 'detp.sentExchangePh': 'échange envoyé', 'detp.contactedEmail': 'E-mail du contact',
|
||||||
'awrp.remove': 'Retirer', 'awrp.searchLabel': 'Rechercher {label}…', 'awrp.searching': 'Recherche…', 'awrp.noMatch': 'Aucune correspondance.', 'awrp.noMatchDxcc': 'Aucune correspondance pour ce DXCC.',
|
'awrp.remove': 'Retirer', 'awrp.searchLabel': 'Rechercher {label}…', 'awrp.searching': 'Recherche…', 'awrp.noMatch': 'Aucune correspondance.', 'awrp.noMatchDxcc': 'Aucune correspondance pour ce DXCC.',
|
||||||
'awrs.group': 'Groupe', 'awrs.sub': 'Sous', 'awrs.pickReference': '← choisis une référence', 'awrs.add': 'Ajouter', 'awrs.enterCallsignFirst': "Saisis d'abord un indicatif", 'awrs.noRefsAdded': 'Aucune référence ajoutée', 'awrs.references': 'Références', 'awrs.autoMatchTitle': 'Le champ {field} vaut {code} — ce diplôme le compte automatiquement', 'awrs.fromField': 'depuis {field}', 'awrs.autoClickToAdd': 'auto — clic pour ajouter', 'awrs.search': 'Rechercher…', 'awrs.addUnlistedTitle': "Ajouter cette référence même si elle n'est pas encore dans la liste (nouvelle / non listée)", 'awrs.addPrefix': '+ Ajouter', 'awrs.unlisted': '(non listée)', 'awrs.searching': 'Recherche…', 'awrs.typeToSearch': 'Tape 2+ caractères pour chercher', 'awrs.enterCallsignOrSearch': 'Saisis un indicatif, ou tape pour chercher.', 'awrs.noRefsForEntity': 'Aucune référence pour cette entité.', 'awrs.noResults': 'Aucun résultat.', 'awrs.downloadLists': 'Télécharge les listes de références dans le panneau Diplômes → Importer les données.',
|
'awrs.group': 'Groupe', 'awrs.sub': 'Sous', 'awrs.pickReference': '← choisis une référence', 'awrs.add': 'Ajouter', 'awrs.enterCallsignFirst': "Saisis d'abord un indicatif", 'awrs.noRefsAdded': 'Aucune référence ajoutée', 'awrs.references': 'Références', 'awrs.autoMatchTitle': 'Le champ {field} vaut {code} — ce diplôme le compte automatiquement', 'awrs.fromField': 'depuis {field}', 'awrs.autoClickToAdd': 'auto — clic pour ajouter', 'awrs.search': 'Rechercher…', 'awrs.addUnlistedTitle': "Ajouter cette référence même si elle n'est pas encore dans la liste (nouvelle / non listée)", 'awrs.addPrefix': '+ Ajouter', 'awrs.unlisted': '(non listée)', 'awrs.searching': 'Recherche…', 'awrs.typeToSearch': 'Tape 2+ caractères pour chercher', 'awrs.enterCallsignOrSearch': 'Saisis un indicatif, ou tape pour chercher.', 'awrs.noRefsForEntity': 'Aucune référence pour cette entité.', 'awrs.noResults': 'Aucun résultat.', 'awrs.downloadLists': 'Télécharge les listes de références dans le panneau Diplômes → Importer les données.',
|
||||||
'awp.awards': 'Diplômes', 'awp.editAwards': 'Éditer les diplômes', 'awp.rescanTitle': 'Recharger le journal et recalculer (récupère les nouvelles confirmations LoTW/QRZ)', 'awp.rescan': 'Rescan', 'awp.selectAward': 'Sélectionner un diplôme…', 'awp.of': 'sur', 'awp.computing': 'Calcul…', 'awp.noData': 'Aucune donnée', 'awp.worked': 'contacté', 'awp.confirmed': 'confirmé', 'awp.validated': 'validé', 'awp.ofConfirmed': 'sur {total} · {pct}% confirmés', 'awp.byBand': 'Par bande (confirmés / contactés)', 'awp.filterReferences': 'Filtrer les références…', 'awp.filterAll': 'Tous', 'awp.filterWkd': 'Contactés', 'awp.filterNotWkd': 'Non contactés', 'awp.filterWkdNotCfmd': 'Contactés non conf.', 'awp.modePhone': 'Phonie', 'awp.modeDigital': 'Numérique', 'awp.refs': 'réf.', 'awp.missingRefsTitle': "Contacts dans le périmètre de ce diplôme (bon DXCC/bande/mode) mais sans référence — exclus tant que tu n'en ajoutes pas", 'awp.missingRefs': 'Réf. manquantes', 'awp.gridView': 'Vue grille', 'awp.listView': 'Vue liste', 'awp.statistics': 'Statistiques', 'awp.statistic': 'Statistique', 'awp.total': 'Total', 'awp.grand': 'Général', 'awp.ref': 'Réf', 'awp.description': 'Description', 'awp.cellTitle': '{ref} · {band} — clic pour voir les QSO', 'awp.name': 'Nom', 'awp.groupCol': 'Groupe', 'awp.status': 'Statut', 'awp.bands': 'Bandes', 'awp.missing': '— manquant', 'awp.contactsMissingRef': 'contacts sans référence', 'awp.recomputeTitle': 'Recalculer — les contacts corrigés disparaissent de la liste', 'awp.refresh': 'Rafraîchir', 'awp.missingScopeHelp': 'Dans le périmètre de ce diplôme (DXCC / bande / mode / dates) mais aucune référence trouvée — ils ne comptent donc pas encore. Trie par colonne, coche les contacts concernés, puis attribue la référence ci-dessous.', 'awp.orClickRow': '(Ou clique une ligne pour ouvrir le QSO.)', 'awp.selectedArrow': '{n} sélectionné(s) →', 'awp.chooseReference': 'Choisir une référence à attribuer…', 'awp.assignToSelected': 'Attribuer à {n} sélectionné(s)', 'awp.scanning': 'Analyse…', 'awp.noGaps': "Aucun manque trouvé. (La détection de référence manquante s'applique aux diplômes limités à une entité DXCC — ex. DDFM, WAS, RAC, WAJA.)", 'awp.dateUtc': 'Date (UTC)', 'awp.callsign': 'Indicatif', 'awp.band': 'Bande', 'awp.mode': 'Mode', 'awp.country': 'Pays', 'awp.qthNote': 'QTH / Note', 'awp.stations': 'stations', 'awp.contactsWithoutRef': 'contacts sans référence', 'awp.assignedMsg': '{code}@{ref} attribué à {n} contact(s).', 'awp.loading': 'Chargement…', 'awp.noQsos': 'Aucun QSO.',
|
'awp.awards': 'Diplômes', 'awp.editAwards': 'Éditer les diplômes', 'awp.rescanTitle': 'Recharger le journal et recalculer (récupère les nouvelles confirmations LoTW/QRZ)', 'awp.rescan': 'Rescan', 'awp.selectAward': 'Sélectionner un diplôme…', 'awp.of': 'sur', 'awp.computing': 'Calcul…', 'awp.noData': 'Aucune donnée', 'awp.worked': 'contacté', 'awp.confirmed': 'confirmé', 'awp.validated': 'validé', 'awp.ofConfirmed': 'sur {total} · {pct}% confirmés', 'awp.byBand': 'Par bande (confirmés / contactés)', 'awp.filterReferences': 'Filtrer les références…', 'awp.filterAll': 'Tous', 'awp.filterWkd': 'Contactés', 'awp.filterNotWkd': 'Non contactés', 'awp.filterWkdNotCfmd': 'Contactés non conf.', 'awp.modePhone': 'Phonie', 'awp.modeDigital': 'Numérique', 'awp.refs': 'réf.', 'awp.missingRefsTitle': "Contacts dans le périmètre de ce diplôme (bon DXCC/bande/mode) mais sans référence — exclus tant que tu n'en ajoutes pas", 'awp.missingRefs': 'Réf. manquantes', 'awp.gridView': 'Vue grille', 'awp.listView': 'Vue liste', 'awp.statistics': 'Statistiques', 'awp.statistic': 'Statistique', 'awp.total': 'Total', 'awp.grand': 'Général', 'awp.ref': 'Réf', 'awp.description': 'Description', 'awp.cellTitle': '{ref} · {band} — clic pour voir les QSO', 'awp.name': 'Nom', 'awp.groupCol': 'Groupe', 'awp.prefixCol': 'Préfixe', 'awp.status': 'Statut', 'awp.bands': 'Bandes', 'awp.missing': '— manquant', 'awp.contactsMissingRef': 'contacts sans référence', 'awp.recomputeTitle': 'Recalculer — les contacts corrigés disparaissent de la liste', 'awp.refresh': 'Rafraîchir', 'awp.missingScopeHelp': 'Dans le périmètre de ce diplôme (DXCC / bande / mode / dates) mais aucune référence trouvée — ils ne comptent donc pas encore. Trie par colonne, coche les contacts concernés, puis attribue la référence ci-dessous.', 'awp.orClickRow': '(Ou clique une ligne pour ouvrir le QSO.)', 'awp.selectedArrow': '{n} sélectionné(s) →', 'awp.chooseReference': 'Choisir une référence à attribuer…', 'awp.assignToSelected': 'Attribuer à {n} sélectionné(s)', 'awp.scanning': 'Analyse…', 'awp.noGaps': "Aucun manque trouvé. (La détection de référence manquante s'applique aux diplômes limités à une entité DXCC — ex. DDFM, WAS, RAC, WAJA.)", 'awp.dateUtc': 'Date (UTC)', 'awp.callsign': 'Indicatif', 'awp.band': 'Bande', 'awp.mode': 'Mode', 'awp.country': 'Pays', 'awp.qthNote': 'QTH / Note', 'awp.stations': 'stations', 'awp.contactsWithoutRef': 'contacts sans référence', 'awp.assignedMsg': '{code}@{ref} attribué à {n} contact(s).', 'awp.loading': 'Chargement…', 'awp.noQsos': 'Aucun QSO.',
|
||||||
'awed.addCountry': 'Ajouter un pays…', 'awed.exportedTo': 'Diplômes exportés vers :\n{path}', 'awed.importedMsg': '{awards} diplôme(s) et {references} référence(s) importés.', 'awed.awardManagement': 'Gestion des diplômes', 'awed.searchAwards': 'Rechercher un diplôme…', 'awed.newAward': 'Nouveau diplôme', 'awed.clickToDismiss': 'Cliquer pour fermer', 'awed.selectOrCreate': 'Sélectionne ou crée un diplôme.', 'awed.tabInfo': 'Infos diplôme', 'awed.tabType': 'Type de diplôme', 'awed.tabConfirmation': 'Confirmation', 'awed.tabReferences': 'Références', 'awed.awardName': 'Nom du diplôme', 'awed.valid': 'Valide', 'awed.deleteAward': 'Supprimer le diplôme', 'awed.description': 'Description', 'awed.awardUrl': 'URL du diplôme', 'awed.refDisplay': 'La colonne affiche', 'awed.refDisplayRef': 'Référence', 'awed.refDisplayName': 'Description / nom', 'awed.refDisplayBoth': 'Les deux (réf — nom)', 'awed.referenceUrl': 'URL de référence', 'awed.validFrom': 'Valide du', 'awed.validTo': 'Valide au', 'awed.dxccFilter': 'Filtre DXCC', 'awed.validBands': 'Bandes valides (vide = toutes)', 'awed.emission': 'Émission (vide = toutes)', 'awed.validModes': 'Modes valides (vide = tous)', 'awed.awardType': 'Type de diplôme', 'awed.dynamicRefs': 'Références dynamiques (non prédéfinies — toute valeur compte, comme POTA)', 'awed.qsoParams': 'Paramètres QSO (utilisés par les types QSOFIELDS / REFERENCE)', 'awed.searchInField': 'Chercher dans le champ', 'awed.matchBy': 'Correspondance par', 'awed.exactMatch': 'Correspondance exacte (sinon cherche la référence dans le champ)', 'awed.oneRef': 'Une seule référence par QSO', 'awed.oneRefHint': 'Quand plusieurs références correspondent au même contact, n'+'’en affecter aucune et le lister dans les références manquantes. Pour les diplômes où deux entrées partagent une description — deux DOK nommés Gießen — en choisir une au hasard inscrirait la mauvaise dans le journal.', 'awed.patternRegex': 'Motif (regex)', 'awed.patternPlaceholder': 'groupe 1 = référence (pour correspondance par motif / dynamique)', 'awed.leadingString': 'Chaîne de début', 'awed.trailingString': 'Chaîne de fin', 'awed.additionalSearches': 'Recherches de repli', 'awed.orAlsoMatch': "— essayées dans l'ordre, seulement si rien n'a encore été trouvé ; la première qui marche gagne", 'awed.addOr': 'Ajouter OU', 'awed.orSearchIn': 'OU — chercher dans', 'awed.exact': 'exact', 'awed.removeOrSearch': 'Supprimer cette recherche OU', 'awed.orPatternPlaceholder': 'regex — groupe 1 = référence (ex. \\b(\\d{2})\\d{3}\\b pour code postal → dépt)', 'awed.prefixPlaceholder': 'préfixe (D)', 'awed.prefixTitle': 'Ajouté devant chaque référence trouvée, ex. 74 → D74', 'awed.confirmationLabel': 'Confirmation (contacté → confirmé)', 'awed.validationLabel': 'Validation (confirmé → validé)', 'awed.resetDefaults': 'Réinitialiser par défaut', 'awed.exportTitle': 'Exporter toutes les définitions de diplômes + listes de références vers une sauvegarde JSON', 'awed.export': 'Exporter…', 'awed.importTitle': 'Importer un lot de diplômes (définitions + listes de références)', 'awed.import': 'Importer…', 'awed.cancel': 'Annuler', 'awed.save': 'Enregistrer', 'awed.populatedMsg': '{n} références intégrées ajoutées.', 'awed.newRefCodePrompt': 'Nouveau code de référence :', 'awed.importedRefsMsg': '{n} références importées.', 'awed.referenceCount': 'Nombre de références :', 'awed.applyPreset': 'Appliquer un préréglage…', 'awed.pasteCsv': 'Coller / CSV', 'awed.populateBuiltinTitle': 'Remplacer par la liste intégrée fournie (entités DXCC, départements français, …)', 'awed.populateBuiltin': "Charger l'intégrée", 'awed.updateOnline': 'Mettre à jour en ligne', 'awed.add': 'Ajouter', 'awed.onePerLine': 'Une référence par ligne :', 'awed.replacesList': '(virgule/point-virgule/tab). Remplace toute la liste.', 'awed.import2': 'Importer', 'awed.search': 'Rechercher…', 'awed.searching': 'Recherche…', 'awed.tooManyItems': "Trop d'éléments ({total}). Affine la recherche (tape 2+ caractères).", 'awed.noReferences': 'Aucune référence.', 'awed.selectReference': 'Sélectionne une référence, ou Ajouter / importer une liste.', 'awed.group': 'Groupe', 'awed.subgroup': 'Sous-groupe', 'awed.perRefRegex': 'regex optionnelle par référence', 'awed.grid': 'Locator', 'awed.saveReference': 'Enregistrer la référence',
|
'awed.addCountry': 'Ajouter un pays…', 'awed.exportedTo': 'Diplômes exportés vers :\n{path}', 'awed.importedMsg': '{awards} diplôme(s) et {references} référence(s) importés.', 'awed.awardManagement': 'Gestion des diplômes', 'awed.searchAwards': 'Rechercher un diplôme…', 'awed.newAward': 'Nouveau diplôme', 'awed.clickToDismiss': 'Cliquer pour fermer', 'awed.selectOrCreate': 'Sélectionne ou crée un diplôme.', 'awed.tabInfo': 'Infos diplôme', 'awed.tabType': 'Type de diplôme', 'awed.tabConfirmation': 'Confirmation', 'awed.tabReferences': 'Références', 'awed.awardName': 'Nom du diplôme', 'awed.valid': 'Valide', 'awed.deleteAward': 'Supprimer le diplôme', 'awed.description': 'Description', 'awed.awardUrl': 'URL du diplôme', 'awed.refDisplay': 'La colonne affiche', 'awed.refDisplayRef': 'Référence', 'awed.refDisplayName': 'Description / nom', 'awed.refDisplayBoth': 'Les deux (réf — nom)', 'awed.referenceUrl': 'URL de référence', 'awed.validFrom': 'Valide du', 'awed.validTo': 'Valide au', 'awed.dxccFilter': 'Filtre DXCC', 'awed.validBands': 'Bandes valides (vide = toutes)', 'awed.emission': 'Émission (vide = toutes)', 'awed.validModes': 'Modes valides (vide = tous)', 'awed.awardType': 'Type de diplôme', 'awed.dynamicRefs': 'Références dynamiques (non prédéfinies — toute valeur compte, comme POTA)', 'awed.qsoParams': 'Paramètres QSO (utilisés par les types QSOFIELDS / REFERENCE)', 'awed.searchInField': 'Chercher dans le champ', 'awed.matchBy': 'Correspondance par', 'awed.exactMatch': 'Correspondance exacte (sinon cherche la référence dans le champ)', 'awed.oneRef': 'Une seule référence par QSO', 'awed.oneRefHint': 'Quand plusieurs références correspondent au même contact, n'+'’en affecter aucune et le lister dans les références manquantes. Pour les diplômes où deux entrées partagent une description — deux DOK nommés Gießen — en choisir une au hasard inscrirait la mauvaise dans le journal.', 'awed.patternRegex': 'Motif (regex)', 'awed.patternPlaceholder': 'groupe 1 = référence (pour correspondance par motif / dynamique)', 'awed.leadingString': 'Chaîne de début', 'awed.trailingString': 'Chaîne de fin', 'awed.additionalSearches': 'Recherches de repli', 'awed.orAlsoMatch': "— essayées dans l'ordre, seulement si rien n'a encore été trouvé ; la première qui marche gagne", 'awed.addOr': 'Ajouter OU', 'awed.orSearchIn': 'OU — chercher dans', 'awed.exact': 'exact', 'awed.removeOrSearch': 'Supprimer cette recherche OU', 'awed.orPatternPlaceholder': 'regex — groupe 1 = référence (ex. \\b(\\d{2})\\d{3}\\b pour code postal → dépt)', 'awed.prefixPlaceholder': 'préfixe (D)', 'awed.prefixTitle': 'Ajouté devant chaque référence trouvée, ex. 74 → D74', 'awed.confirmationLabel': 'Confirmation (contacté → confirmé)', 'awed.validationLabel': 'Validation (confirmé → validé)', 'awed.resetDefaults': 'Réinitialiser par défaut', 'awed.exportTitle': 'Exporter toutes les définitions de diplômes + listes de références vers une sauvegarde JSON', 'awed.export': 'Exporter…', 'awed.importTitle': 'Importer un lot de diplômes (définitions + listes de références)', 'awed.import': 'Importer…', 'awed.cancel': 'Annuler', 'awed.save': 'Enregistrer', 'awed.populatedMsg': '{n} références intégrées ajoutées.', 'awed.newRefCodePrompt': 'Nouveau code de référence :', 'awed.importedRefsMsg': '{n} références importées.', 'awed.referenceCount': 'Nombre de références :', 'awed.applyPreset': 'Appliquer un préréglage…', 'awed.pasteCsv': 'Coller / CSV', 'awed.populateBuiltinTitle': 'Remplacer par la liste intégrée fournie (entités DXCC, départements français, …)', 'awed.populateBuiltin': "Charger l'intégrée", 'awed.updateOnline': 'Mettre à jour en ligne', 'awed.add': 'Ajouter', 'awed.onePerLine': 'Une référence par ligne :', 'awed.replacesList': '(virgule/point-virgule/tab). Remplace toute la liste.', 'awed.import2': 'Importer', 'awed.search': 'Rechercher…', 'awed.searching': 'Recherche…', 'awed.tooManyItems': "Trop d'éléments ({total}). Affine la recherche (tape 2+ caractères).", 'awed.noReferences': 'Aucune référence.', 'awed.selectReference': 'Sélectionne une référence, ou Ajouter / importer une liste.', 'awed.group': 'Groupe', 'awed.subgroup': 'Sous-groupe', 'awed.perRefRegex': 'regex optionnelle par référence', 'awed.grid': 'Locator', 'awed.saveReference': 'Enregistrer la référence',
|
||||||
'awed.updateAvailable': 'Une nouvelle version de ce diplôme est disponible', 'awed.updateOverwrites': "Tu as modifié ce diplôme, la mise à jour n'a donc pas été appliquée. L'accepter remplacera ta définition et ta liste de références.", 'awed.updateApply': 'Mettre à jour', 'awed.updateKeepMine': 'Garder les miennes',
|
'awed.updateAvailable': 'Une nouvelle version de ce diplôme est disponible', 'awed.updateOverwrites': "Tu as modifié ce diplôme, la mise à jour n'a donc pas été appliquée. L'accepter remplacera ta définition et ta liste de références.", 'awed.updateApply': 'Mettre à jour', 'awed.updateKeepMine': 'Garder les miennes',
|
||||||
'awed.tabTest': 'Test', 'awed.testCallsign': 'Tester avec un indicatif', 'awed.testRun': 'Tester', 'awed.testSavedOnly': 'Teste le diplôme ENREGISTRÉ — enregistre tes modifications avant.', 'awed.testNoMatch': 'aucune correspondance', 'awed.testOutOfScope': "QSO hors périmètre — aucune règle n'a été exécutée.", 'awed.testSkipped': "non exécutée : une règle précédente a déjà trouvé", 'awed.testFieldValue': 'Champ', 'awed.testEmptyField': 'vide', 'awed.testNoCandidate': "n'a produit aucun candidat", 'awed.testManual': 'Référence forcée à la main', 'awed.testAmbiguous': 'Ambigu', 'awed.testAmbiguousHint': '— aucune retenue, ce diplôme n’admet qu’une référence par QSO. Affectez la bonne à la main.', 'awed.testSameAs': '+{n} autre(s) QSO, même résultat',
|
'awed.tabTest': 'Test', 'awed.testCallsign': 'Tester avec un indicatif', 'awed.testRun': 'Tester', 'awed.testSavedOnly': 'Teste le diplôme ENREGISTRÉ — enregistre tes modifications avant.', 'awed.testNoMatch': 'aucune correspondance', 'awed.testOutOfScope': "QSO hors périmètre — aucune règle n'a été exécutée.", 'awed.testSkipped': "non exécutée : une règle précédente a déjà trouvé", 'awed.testFieldValue': 'Champ', 'awed.testEmptyField': 'vide', 'awed.testNoCandidate': "n'a produit aucun candidat", 'awed.testManual': 'Référence forcée à la main', 'awed.testAmbiguous': 'Ambigu', 'awed.testAmbiguousHint': '— aucune retenue, ce diplôme n’admet qu’une référence par QSO. Affectez la bonne à la main.', 'awed.testSameAs': '+{n} autre(s) QSO, même résultat',
|
||||||
|
|||||||
@@ -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.23.3';
|
export const APP_VERSION = '0.23.8';
|
||||||
|
|
||||||
// Author / credits, shown in Help -> About.
|
// Author / credits, shown in Help -> About.
|
||||||
export const APP_AUTHOR = 'F4BPO';
|
export const APP_AUTHOR = 'F4BPO';
|
||||||
|
|||||||
Vendored
+8
@@ -87,6 +87,8 @@ export function AwardsFolder():Promise<string>;
|
|||||||
|
|
||||||
export function BackfillUSCounties():Promise<main.BackfillUSCountiesResult>;
|
export function BackfillUSCounties():Promise<main.BackfillUSCountiesResult>;
|
||||||
|
|
||||||
|
export function BandSlotQSOs(arg1:string,arg2:number,arg3:string,arg4:string):Promise<Array<qso.QSO>>;
|
||||||
|
|
||||||
export function BrowseExecutable():Promise<string>;
|
export function BrowseExecutable():Promise<string>;
|
||||||
|
|
||||||
export function BulkUpdateField(arg1:Array<number>,arg2:string,arg3:string):Promise<number>;
|
export function BulkUpdateField(arg1:Array<number>,arg2:string,arg3:string):Promise<number>;
|
||||||
@@ -97,6 +99,8 @@ export function CIVTraceEnabled():Promise<boolean>;
|
|||||||
|
|
||||||
export function CWDecoderRunning():Promise<boolean>;
|
export function CWDecoderRunning():Promise<boolean>;
|
||||||
|
|
||||||
|
export function CancelConfirmations():Promise<void>;
|
||||||
|
|
||||||
export function ChatAvailable():Promise<boolean>;
|
export function ChatAvailable():Promise<boolean>;
|
||||||
|
|
||||||
export function CheckForUpdate():Promise<main.UpdateInfo>;
|
export function CheckForUpdate():Promise<main.UpdateInfo>;
|
||||||
@@ -491,6 +495,8 @@ export function GetStationStatus():Promise<Array<main.StationDeviceStatus>>;
|
|||||||
|
|
||||||
export function GetTelemetryEnabled():Promise<boolean>;
|
export function GetTelemetryEnabled():Promise<boolean>;
|
||||||
|
|
||||||
|
export function GetTrackedAwards():Promise<Array<string>>;
|
||||||
|
|
||||||
export function GetTunerGeniusSettings():Promise<main.TunerGeniusSettings>;
|
export function GetTunerGeniusSettings():Promise<main.TunerGeniusSettings>;
|
||||||
|
|
||||||
export function GetTunerGeniusStatus():Promise<tunergenius.Status>;
|
export function GetTunerGeniusStatus():Promise<tunergenius.Status>;
|
||||||
@@ -893,6 +899,8 @@ export function SaveStationDevices(arg1:Array<main.StationDevice>):Promise<void>
|
|||||||
|
|
||||||
export function SaveStationSettings(arg1:main.StationSettings):Promise<void>;
|
export function SaveStationSettings(arg1:main.StationSettings):Promise<void>;
|
||||||
|
|
||||||
|
export function SaveTrackedAwards(arg1:Array<string>):Promise<void>;
|
||||||
|
|
||||||
export function SaveTunerGeniusSettings(arg1:main.TunerGeniusSettings):Promise<void>;
|
export function SaveTunerGeniusSettings(arg1:main.TunerGeniusSettings):Promise<void>;
|
||||||
|
|
||||||
export function SaveUDPIntegration(arg1:udp.Config):Promise<udp.Config>;
|
export function SaveUDPIntegration(arg1:udp.Config):Promise<udp.Config>;
|
||||||
|
|||||||
@@ -122,6 +122,10 @@ export function BackfillUSCounties() {
|
|||||||
return window['go']['main']['App']['BackfillUSCounties']();
|
return window['go']['main']['App']['BackfillUSCounties']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function BandSlotQSOs(arg1, arg2, arg3, arg4) {
|
||||||
|
return window['go']['main']['App']['BandSlotQSOs'](arg1, arg2, arg3, arg4);
|
||||||
|
}
|
||||||
|
|
||||||
export function BrowseExecutable() {
|
export function BrowseExecutable() {
|
||||||
return window['go']['main']['App']['BrowseExecutable']();
|
return window['go']['main']['App']['BrowseExecutable']();
|
||||||
}
|
}
|
||||||
@@ -142,6 +146,10 @@ export function CWDecoderRunning() {
|
|||||||
return window['go']['main']['App']['CWDecoderRunning']();
|
return window['go']['main']['App']['CWDecoderRunning']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function CancelConfirmations() {
|
||||||
|
return window['go']['main']['App']['CancelConfirmations']();
|
||||||
|
}
|
||||||
|
|
||||||
export function ChatAvailable() {
|
export function ChatAvailable() {
|
||||||
return window['go']['main']['App']['ChatAvailable']();
|
return window['go']['main']['App']['ChatAvailable']();
|
||||||
}
|
}
|
||||||
@@ -930,6 +938,10 @@ export function GetTelemetryEnabled() {
|
|||||||
return window['go']['main']['App']['GetTelemetryEnabled']();
|
return window['go']['main']['App']['GetTelemetryEnabled']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function GetTrackedAwards() {
|
||||||
|
return window['go']['main']['App']['GetTrackedAwards']();
|
||||||
|
}
|
||||||
|
|
||||||
export function GetTunerGeniusSettings() {
|
export function GetTunerGeniusSettings() {
|
||||||
return window['go']['main']['App']['GetTunerGeniusSettings']();
|
return window['go']['main']['App']['GetTunerGeniusSettings']();
|
||||||
}
|
}
|
||||||
@@ -1734,6 +1746,10 @@ export function SaveStationSettings(arg1) {
|
|||||||
return window['go']['main']['App']['SaveStationSettings'](arg1);
|
return window['go']['main']['App']['SaveStationSettings'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function SaveTrackedAwards(arg1) {
|
||||||
|
return window['go']['main']['App']['SaveTrackedAwards'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function SaveTunerGeniusSettings(arg1) {
|
export function SaveTunerGeniusSettings(arg1) {
|
||||||
return window['go']['main']['App']['SaveTunerGeniusSettings'](arg1);
|
return window['go']['main']['App']['SaveTunerGeniusSettings'](arg1);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1930,6 +1930,7 @@ export namespace main {
|
|||||||
kenwood_host: string;
|
kenwood_host: string;
|
||||||
kenwood_port: string;
|
kenwood_port: string;
|
||||||
kenwood_baud: number;
|
kenwood_baud: number;
|
||||||
|
kenwood_data_mode: string;
|
||||||
yaesu_low_lines: boolean;
|
yaesu_low_lines: boolean;
|
||||||
kenwood_low_lines: boolean;
|
kenwood_low_lines: boolean;
|
||||||
icom_port: string;
|
icom_port: string;
|
||||||
@@ -1975,6 +1976,7 @@ export namespace main {
|
|||||||
this.kenwood_host = source["kenwood_host"];
|
this.kenwood_host = source["kenwood_host"];
|
||||||
this.kenwood_port = source["kenwood_port"];
|
this.kenwood_port = source["kenwood_port"];
|
||||||
this.kenwood_baud = source["kenwood_baud"];
|
this.kenwood_baud = source["kenwood_baud"];
|
||||||
|
this.kenwood_data_mode = source["kenwood_data_mode"];
|
||||||
this.yaesu_low_lines = source["yaesu_low_lines"];
|
this.yaesu_low_lines = source["yaesu_low_lines"];
|
||||||
this.kenwood_low_lines = source["kenwood_low_lines"];
|
this.kenwood_low_lines = source["kenwood_low_lines"];
|
||||||
this.icom_port = source["icom_port"];
|
this.icom_port = source["icom_port"];
|
||||||
@@ -3154,6 +3156,7 @@ export namespace main {
|
|||||||
follow: boolean;
|
follow: boolean;
|
||||||
step_khz: number;
|
step_khz: number;
|
||||||
tx_inhibit: boolean;
|
tx_inhibit: boolean;
|
||||||
|
bands: string[];
|
||||||
freq_min_mhz: number;
|
freq_min_mhz: number;
|
||||||
freq_max_mhz: number;
|
freq_max_mhz: number;
|
||||||
|
|
||||||
@@ -3173,6 +3176,7 @@ export namespace main {
|
|||||||
this.follow = source["follow"];
|
this.follow = source["follow"];
|
||||||
this.step_khz = source["step_khz"];
|
this.step_khz = source["step_khz"];
|
||||||
this.tx_inhibit = source["tx_inhibit"];
|
this.tx_inhibit = source["tx_inhibit"];
|
||||||
|
this.bands = source["bands"];
|
||||||
this.freq_min_mhz = source["freq_min_mhz"];
|
this.freq_min_mhz = source["freq_min_mhz"];
|
||||||
this.freq_max_mhz = source["freq_max_mhz"];
|
this.freq_max_mhz = source["freq_max_mhz"];
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -44,7 +44,7 @@ func DefaultFolder(dataDir string) string {
|
|||||||
// statement (no torn-copy window while the app keeps writing), and compacts
|
// statement (no torn-copy window while the app keeps writing), and compacts
|
||||||
// the destination as a bonus. It replaces the old "checkpoint + raw io.Copy",
|
// the destination as a bonus. It replaces the old "checkpoint + raw io.Copy",
|
||||||
// which could capture a half-written page during a concurrent write.
|
// which could capture a half-written page during a concurrent write.
|
||||||
func Run(ctx context.Context, dbConn *sql.DB, dbPath, folder string, rotation int, doZip bool) (string, error) {
|
func Run(ctx context.Context, dbConn *sql.DB, dbPath, folder string, rotation int, doZip bool, prefix string) (string, error) {
|
||||||
if dbConn == nil {
|
if dbConn == nil {
|
||||||
return "", fmt.Errorf("nil db connection")
|
return "", fmt.Errorf("nil db connection")
|
||||||
}
|
}
|
||||||
@@ -54,12 +54,15 @@ func Run(ctx context.Context, dbConn *sql.DB, dbPath, folder string, rotation in
|
|||||||
if folder == "" {
|
if folder == "" {
|
||||||
return "", fmt.Errorf("backup folder not set")
|
return "", fmt.Errorf("backup folder not set")
|
||||||
}
|
}
|
||||||
|
if prefix == "" {
|
||||||
|
prefix = "opslog"
|
||||||
|
}
|
||||||
if err := os.MkdirAll(folder, 0o755); err != nil {
|
if err := os.MkdirAll(folder, 0o755); err != nil {
|
||||||
return "", fmt.Errorf("create backup folder: %w", err)
|
return "", fmt.Errorf("create backup folder: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
stamp := time.Now().Format("2006-01-02")
|
stamp := time.Now().Format("2006-01-02")
|
||||||
base := fmt.Sprintf("opslog-%s", stamp)
|
base := fmt.Sprintf("%s-%s", prefix, stamp)
|
||||||
|
|
||||||
// VACUUM INTO requires a non-existent target → use a temp file, then
|
// VACUUM INTO requires a non-existent target → use a temp file, then
|
||||||
// move/zip it into place.
|
// move/zip it into place.
|
||||||
@@ -92,7 +95,7 @@ func Run(ctx context.Context, dbConn *sql.DB, dbPath, folder string, rotation in
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := rotate(folder, rotation); err != nil {
|
if err := rotateMatch(folder, rotation, prefix+"-", ".db", ".db.zip"); err != nil {
|
||||||
// Rotation errors are non-fatal — the backup itself succeeded.
|
// Rotation errors are non-fatal — the backup itself succeeded.
|
||||||
return dstPath, fmt.Errorf("rotate: %w (backup OK at %s)", err, dstPath)
|
return dstPath, fmt.Errorf("rotate: %w (backup OK at %s)", err, dstPath)
|
||||||
}
|
}
|
||||||
@@ -203,12 +206,6 @@ func copyZipped(src, dst, innerName string) error {
|
|||||||
return out.Close()
|
return out.Close()
|
||||||
}
|
}
|
||||||
|
|
||||||
// rotate keeps the most recent `keep` SQLite backups (opslog-*.db /
|
|
||||||
// opslog-*.db.zip) and deletes the rest.
|
|
||||||
func rotate(folder string, keep int) error {
|
|
||||||
return rotateMatch(folder, keep, "opslog-", ".db", ".db.zip")
|
|
||||||
}
|
|
||||||
|
|
||||||
// rotateMatch keeps the most recent `keep` files in folder whose name has the
|
// rotateMatch keeps the most recent `keep` files in folder whose name has the
|
||||||
// given prefix and one of the given suffixes, deleting older ones. Only matching
|
// given prefix and one of the given suffixes, deleting older ones. Only matching
|
||||||
// files are touched — never unrelated user files in the same folder. The suffix
|
// files are touched — never unrelated user files in the same folder. The suffix
|
||||||
|
|||||||
+74
-9
@@ -56,6 +56,12 @@ type Kenwood struct {
|
|||||||
// a wire, which is how most operators actually put a rig on the network.
|
// a wire, which is how most operators actually put a rig on the network.
|
||||||
host string
|
host string
|
||||||
digital string // mode name logged for data (FT8 by default)
|
digital string // mode name logged for data (FT8 by default)
|
||||||
|
// dataMode chooses what CAT mode a DATA/digital mode (FT8, PSK…) sets, because
|
||||||
|
// no single Kenwood mode digit is right for every rig: "usb" → USB (the SSB-data
|
||||||
|
// base, default), "data" → the DATA mode digit MD6 (Elecraft K3/K4), "keep" →
|
||||||
|
// leave the rig's current mode untouched (safest for a TS-590SG/TS-990S whose
|
||||||
|
// data mode is a USB modifier the operator sets on the rig). See SetMode.
|
||||||
|
dataMode string
|
||||||
|
|
||||||
mu sync.Mutex
|
mu sync.Mutex
|
||||||
port serial.Port
|
port serial.Port
|
||||||
@@ -109,6 +115,17 @@ type Kenwood struct {
|
|||||||
// nothing. Off by default: that is how this backend behaved for its whole
|
// nothing. Off by default: that is how this backend behaved for its whole
|
||||||
// life before the question came up.
|
// life before the question came up.
|
||||||
lowerLines bool
|
lowerLines bool
|
||||||
|
|
||||||
|
// tx tracks whether we currently hold PTT (SetPTT true). A Kenwood/Elecraft rig
|
||||||
|
// answers "?;" to a status poll (IF;) WHILE TRANSMITTING; OpsLog used to read
|
||||||
|
// that as "the rig doesn't support IF;", latch it off and drop the whole CAT
|
||||||
|
// link — which tore down the shared-CAT PTT that WSJT-X / JTDX key through, so a
|
||||||
|
// K3 keyed but the logger's transmission fell apart. While PTT is held we skip
|
||||||
|
// the wire poll and hand back the last good state (lastState) instead. txAt caps
|
||||||
|
// the skip so a missed SetPTT(false) can't freeze the state for ever.
|
||||||
|
tx bool
|
||||||
|
txAt time.Time
|
||||||
|
lastState RigState
|
||||||
}
|
}
|
||||||
|
|
||||||
// SetLowerLines chooses whether DTR and RTS are deasserted on connect. Set
|
// SetLowerLines chooses whether DTR and RTS are deasserted on connect. Set
|
||||||
@@ -249,6 +266,15 @@ func (k *Kenwood) ReadState() (RigState, error) {
|
|||||||
if k.port == nil {
|
if k.port == nil {
|
||||||
return RigState{}, fmt.Errorf("kenwood: not connected")
|
return RigState{}, fmt.Errorf("kenwood: not connected")
|
||||||
}
|
}
|
||||||
|
// While transmitting, don't poll: the rig returns "?;" to IF; during TX, and
|
||||||
|
// treating that as a fault dropped the shared CAT link the digital-mode
|
||||||
|
// software keys through. Hand back the last known state. The 30 s cap resyncs
|
||||||
|
// if a SetPTT(false) was somehow missed, so a stuck TX can't freeze state.
|
||||||
|
if k.tx && !k.txAt.IsZero() && time.Since(k.txAt) < 30*time.Second {
|
||||||
|
s := k.lastState
|
||||||
|
s.Connected = true
|
||||||
|
return s, nil
|
||||||
|
}
|
||||||
raw, err := k.ask("IF;")
|
raw, err := k.ask("IF;")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return RigState{}, err
|
return RigState{}, err
|
||||||
@@ -333,6 +359,7 @@ func (k *Kenwood) ReadState() (RigState, error) {
|
|||||||
if s.Split {
|
if s.Split {
|
||||||
k.curRXFreq = s.RxFreqHz
|
k.curRXFreq = s.RxFreqHz
|
||||||
}
|
}
|
||||||
|
k.lastState = s // cache for the transmit window, where we can't poll
|
||||||
return s, nil
|
return s, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -360,6 +387,17 @@ func (k *Kenwood) SetMode(mode string) error {
|
|||||||
if k.port == nil {
|
if k.port == nil {
|
||||||
return fmt.Errorf("kenwood: not connected")
|
return fmt.Errorf("kenwood: not connected")
|
||||||
}
|
}
|
||||||
|
// Honour the operator's DATA-mode preference for a digital mode. No single
|
||||||
|
// mode digit fits every rig, so the operator picks: keep the rig's mode, use
|
||||||
|
// MD6 (K3/K4 DATA), or fall through to the default USB from kenwoodModeDigit.
|
||||||
|
if isKenwoodDataMode(mode) {
|
||||||
|
switch k.dataMode {
|
||||||
|
case "keep":
|
||||||
|
return nil // leave whatever data mode the operator set on the rig
|
||||||
|
case "data":
|
||||||
|
return k.write("MD6;") // Elecraft K3/K4 DATA mode
|
||||||
|
}
|
||||||
|
}
|
||||||
d := kenwoodModeDigit(mode, k.curFreq)
|
d := kenwoodModeDigit(mode, k.curFreq)
|
||||||
if d == 0 {
|
if d == 0 {
|
||||||
return fmt.Errorf("kenwood: no CAT mode for %q", mode)
|
return fmt.Errorf("kenwood: no CAT mode for %q", mode)
|
||||||
@@ -367,13 +405,34 @@ func (k *Kenwood) SetMode(mode string) error {
|
|||||||
return k.write(fmt.Sprintf("MD%c;", d))
|
return k.write(fmt.Sprintf("MD%c;", d))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// SetDataMode configures how a DATA/digital mode is set: "usb" (default), "data"
|
||||||
|
// (MD6, Elecraft K3/K4) or "keep" (don't change the rig's mode).
|
||||||
|
func (k *Kenwood) SetDataMode(m string) {
|
||||||
|
k.mu.Lock()
|
||||||
|
k.dataMode = strings.ToLower(strings.TrimSpace(m))
|
||||||
|
k.mu.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
// isKenwoodDataMode reports whether a mode name is a soundcard/data mode (FT8,
|
||||||
|
// PSK, JT…) rather than a voice/CW/RTTY mode the rig sets natively.
|
||||||
|
func isKenwoodDataMode(mode string) bool {
|
||||||
|
switch strings.ToUpper(strings.TrimSpace(mode)) {
|
||||||
|
case "", "LSB", "USB", "SSB", "CW", "CW-R", "CWR", "FM", "NFM", "AM",
|
||||||
|
"RTTY", "FSK", "RTTY-R", "FSK-R":
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
func (k *Kenwood) SetPTT(on bool) error {
|
func (k *Kenwood) SetPTT(on bool) error {
|
||||||
k.mu.Lock()
|
k.mu.Lock()
|
||||||
defer k.mu.Unlock()
|
defer k.mu.Unlock()
|
||||||
if k.port == nil {
|
if k.port == nil {
|
||||||
return fmt.Errorf("kenwood: not connected")
|
return fmt.Errorf("kenwood: not connected")
|
||||||
}
|
}
|
||||||
|
k.tx = on
|
||||||
if on {
|
if on {
|
||||||
|
k.txAt = time.Now()
|
||||||
return k.write("TX;")
|
return k.write("TX;")
|
||||||
}
|
}
|
||||||
return k.write("RX;")
|
return k.write("RX;")
|
||||||
@@ -431,10 +490,15 @@ func (k *Kenwood) ask(cmd string) (string, error) {
|
|||||||
k.rx = k.rx[i+1:]
|
k.rx = k.rx[i+1:]
|
||||||
traceText("kenwood", "RX", frame)
|
traceText("kenwood", "RX", frame)
|
||||||
if frame == "?;" {
|
if frame == "?;" {
|
||||||
// The rig rejected the command. Remember it so the poll loop stops
|
// IF; and ID; are universal on Kenwood/Elecraft — a "?;" to them is a
|
||||||
// paying a 600 ms timeout for it on every cycle.
|
// transient "busy" (typically mid-transmit, or a menu open on the rig),
|
||||||
k.unsupported[want] = true
|
// NOT "unsupported". Latching them off would blind the poll loop for
|
||||||
debugLog.Printf("kenwood: this rig does not support %q — not asking again", cmd)
|
// good and read as "lost the rig". Only remember the OPTIONAL commands
|
||||||
|
// (FR/FT/…) so the poll loop stops paying a 600 ms timeout for those.
|
||||||
|
if want != "IF" && want != "ID" {
|
||||||
|
k.unsupported[want] = true
|
||||||
|
debugLog.Printf("kenwood: this rig does not support %q — not asking again", cmd)
|
||||||
|
}
|
||||||
return "", fmt.Errorf("kenwood: %s rejected", want)
|
return "", fmt.Errorf("kenwood: %s rejected", want)
|
||||||
}
|
}
|
||||||
if strings.HasPrefix(frame, want) {
|
if strings.HasPrefix(frame, want) {
|
||||||
@@ -551,11 +615,12 @@ func kenwoodModeDigit(mode string, hz int64) byte {
|
|||||||
}
|
}
|
||||||
return '2'
|
return '2'
|
||||||
}
|
}
|
||||||
// Any other digital mode (FT8, PSK, JT…) rides the DATA input, and by universal
|
// Any other digital mode (FT8, PSK, JT…) → USB on every band. There is NO single
|
||||||
// convention that is ALWAYS the UPPER sideband, on every band. The SSB rule
|
// mode digit that is right for both families: a K3 wants DATA (MD6), a TS-590SG
|
||||||
// (LSB below 10 MHz) must NOT be applied here: doing so put a 40/80 m data spot
|
// wants USB-DATA (MD2 + its DATA modifier), and MD6 on the TS-590SG is FSK/RTTY
|
||||||
// on LSB, which an Elecraft K3 shows as "DATA REV" — the reversed sideband.
|
// — wrong for FT8. USB is the safe common base (the reversed-sideband "DATA REV"
|
||||||
// (RTTY/FSK is handled above as its own FSK mode, so it isn't affected.)
|
// only came from the old LSB-below-10-MHz rule). A rig-specific DATA mode is a
|
||||||
|
// follow-up that needs the model, not a blind default.
|
||||||
return '2'
|
return '2'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -111,6 +111,23 @@ func TestKenwoodModeDigit(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// The DATA-mode preference only applies to soundcard/data modes, never to voice,
|
||||||
|
// CW or native RTTY — getting this wrong would hijack an SSB or CW mode change.
|
||||||
|
func TestIsKenwoodDataMode(t *testing.T) {
|
||||||
|
data := []string{"FT8", "FT4", "PSK31", "JT65", "DATA", "DIGITAL", "OLIVIA"}
|
||||||
|
notData := []string{"", "LSB", "USB", "SSB", "CW", "CW-R", "FM", "AM", "RTTY", "FSK", "RTTY-R"}
|
||||||
|
for _, m := range data {
|
||||||
|
if !isKenwoodDataMode(m) {
|
||||||
|
t.Errorf("isKenwoodDataMode(%q) = false, want true", m)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for _, m := range notData {
|
||||||
|
if isKenwoodDataMode(m) {
|
||||||
|
t.Errorf("isKenwoodDataMode(%q) = true, want false", m)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// What the log records for each mode digit the rig reports.
|
// What the log records for each mode digit the rig reports.
|
||||||
func TestKenwoodModeToADIF(t *testing.T) {
|
func TestKenwoodModeToADIF(t *testing.T) {
|
||||||
cases := []struct {
|
cases := []struct {
|
||||||
|
|||||||
@@ -173,6 +173,39 @@ func (m *Manager) EntityNames() []string {
|
|||||||
return out
|
return out
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// PrefixByDXCC maps ADIF DXCC entity number → canonical primary prefix (F, DL,
|
||||||
|
// XE…) from the loaded cty.dat. cty.dat is keyed by entity NAME, so the join
|
||||||
|
// goes through EntityDXCC; entries whose name doesn't resolve are skipped
|
||||||
|
// rather than guessed. Empty until cty.dat has loaded.
|
||||||
|
func (m *Manager) PrefixByDXCC() map[int]string {
|
||||||
|
m.mu.RLock()
|
||||||
|
db := m.db
|
||||||
|
m.mu.RUnlock()
|
||||||
|
if db == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
out := make(map[int]string, 400)
|
||||||
|
for _, e := range db.Entities() {
|
||||||
|
p := strings.TrimSpace(e.Primary)
|
||||||
|
if p == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
// cty.dat marks non-DXCC sub-entities with a leading '*' — they report
|
||||||
|
// under a parent entity and must not overwrite the parent's prefix.
|
||||||
|
if strings.HasPrefix(p, "*") {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if n := EntityDXCC(e.Name); n > 0 {
|
||||||
|
if _, dup := out[n]; !dup {
|
||||||
|
// DXCC prefixes are conventionally upper-case; cty.dat spells some
|
||||||
|
// sub-entity suffixes in lower case (3D2/c → 3D2/C).
|
||||||
|
out[n] = strings.ToUpper(p)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
// Info returns metadata about the currently-loaded cty.dat (or zero value
|
// Info returns metadata about the currently-loaded cty.dat (or zero value
|
||||||
// if nothing loaded).
|
// if nothing loaded).
|
||||||
func (m *Manager) Info() ctySource {
|
func (m *Manager) Info() ctySource {
|
||||||
|
|||||||
@@ -125,14 +125,19 @@ func (c *Client) SetFanMode(mode string) error {
|
|||||||
default:
|
default:
|
||||||
return fmt.Errorf("powergenius: invalid fan mode %q", mode)
|
return fmt.Errorf("powergenius: invalid fan mode %q", mode)
|
||||||
}
|
}
|
||||||
// Set with the bare "key=value" verb the amp uses for its own status fields
|
// The verb the amp wants is "setup fanmode=VALUE" — confirmed LIVE: with the
|
||||||
// (same convention as "operate=1"). The earlier "setup fanmode=…" carried a
|
// "setup " prefix the amp replies code 0 (accepted), while the bare
|
||||||
// bogus prefix the amp silently ignored, so the fan never changed and the next
|
// "fanmode=VALUE" we switched to earlier is rejected (reply code 0x50000015).
|
||||||
// status kept reporting the old mode — the revert-to-Contest the operator saw.
|
// That regression is what stopped the fan from changing; restoring "setup "
|
||||||
reply, err := c.command("fanmode=" + m)
|
// fixes it.
|
||||||
|
reply, err := c.command("setup fanmode=" + m)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
if code := replyCode(reply); code != "" && code != "0" {
|
||||||
|
applog.Printf("pgxl: set fanmode=%s REJECTED, reply=%q", m, reply)
|
||||||
|
return fmt.Errorf("powergenius: amp rejected fanmode=%s (code %s)", m, code)
|
||||||
|
}
|
||||||
applog.Printf("pgxl: set fanmode=%s reply=%q", m, reply)
|
applog.Printf("pgxl: set fanmode=%s reply=%q", m, reply)
|
||||||
c.statusMu.Lock()
|
c.statusMu.Lock()
|
||||||
c.status.FanMode = m // optimistic
|
c.status.FanMode = m // optimistic
|
||||||
@@ -141,6 +146,19 @@ func (c *Client) SetFanMode(mode string) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// replyCode returns the result code from an "R<id>|<code>|…" reply — "0" means
|
||||||
|
// the amp accepted the command. Returns "" when the line isn't an R reply.
|
||||||
|
func replyCode(reply string) string {
|
||||||
|
if !strings.HasPrefix(reply, "R") {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
p := strings.SplitN(reply, "|", 3)
|
||||||
|
if len(p) < 2 {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
return strings.TrimSpace(p[1])
|
||||||
|
}
|
||||||
|
|
||||||
// SetOperate puts the amp in OPERATE (1) or STANDBY (0).
|
// SetOperate puts the amp in OPERATE (1) or STANDBY (0).
|
||||||
func (c *Client) SetOperate(on bool) error {
|
func (c *Client) SetOperate(on bool) error {
|
||||||
v := "0"
|
v := "0"
|
||||||
|
|||||||
@@ -1461,6 +1461,51 @@ func (r *Repo) IterateByIDs(ctx context.Context, ids []int64, fn func(QSO) error
|
|||||||
return rows.Err()
|
return rows.Err()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// BandSlotQSOs returns every contact on one band that belongs to a slot of the
|
||||||
|
// entry matrix: the exact callsign, or any callsign in the same DXCC entity.
|
||||||
|
// Mode is NOT filtered here — the class (phone / CW / digital) is a derived
|
||||||
|
// notion the caller owns, so it filters the (small) band-scoped result itself.
|
||||||
|
//
|
||||||
|
// The DXCC arm matches the stored dxcc column only. A QSO logged before the
|
||||||
|
// entity was resolved has a NULL there and is genuinely unattributed; guessing
|
||||||
|
// it back from the callsign here would disagree with the matrix above, which is
|
||||||
|
// built from the same column.
|
||||||
|
func (r *Repo) BandSlotQSOs(ctx context.Context, callsign string, dxccNum int, band string) ([]QSO, error) {
|
||||||
|
call := upperTrim(callsign)
|
||||||
|
b := strings.TrimSpace(band)
|
||||||
|
if b == "" || (call == "" && dxccNum <= 0) {
|
||||||
|
return []QSO{}, nil
|
||||||
|
}
|
||||||
|
where := "band = ?"
|
||||||
|
args := []any{b}
|
||||||
|
switch {
|
||||||
|
case call != "" && dxccNum > 0:
|
||||||
|
where += " AND (callsign = ? OR dxcc = ?)"
|
||||||
|
args = append(args, call, dxccNum)
|
||||||
|
case call != "":
|
||||||
|
where += " AND callsign = ?"
|
||||||
|
args = append(args, call)
|
||||||
|
default:
|
||||||
|
where += " AND dxcc = ?"
|
||||||
|
args = append(args, dxccNum)
|
||||||
|
}
|
||||||
|
rows, err := r.db.QueryContext(ctx,
|
||||||
|
`SELECT `+selectCols+` FROM qso WHERE `+where+` ORDER BY qso_date DESC, id DESC LIMIT 500`, args...)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("query band slot: %w", err)
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
out := []QSO{}
|
||||||
|
for rows.Next() {
|
||||||
|
q, err := scanQSO(rows)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
out = append(out, q)
|
||||||
|
}
|
||||||
|
return out, rows.Err()
|
||||||
|
}
|
||||||
|
|
||||||
// WorkedBefore summarises prior contacts at two granularities:
|
// WorkedBefore summarises prior contacts at two granularities:
|
||||||
// - by exact callsign → shown as "this call worked N×"
|
// - by exact callsign → shown as "this call worked N×"
|
||||||
// - by DXCC entity → drives NEW ONE / NEW BAND / NEW MODE / NEW SLOT
|
// - by DXCC entity → drives NEW ONE / NEW BAND / NEW MODE / NEW SLOT
|
||||||
@@ -2118,6 +2163,36 @@ func (r *Repo) WorkedCallBandModeKeys(ctx context.Context) (map[string]struct{},
|
|||||||
return out, rows.Err()
|
return out, rows.Err()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// WorkedCallSlotKeys backs the cluster "already worked only on the same slot"
|
||||||
|
// option. It returns each worked slot keyed BOTH as "CALL|band" (mode-agnostic,
|
||||||
|
// for a spot whose mode couldn't be inferred) and "CALL|band|MODE" with the mode
|
||||||
|
// run through normMode — so when digital grouping is on, FT8/FT4/RTTY fold into
|
||||||
|
// one "DIG" and a call worked on 20m FT8 also matches a 20m FT4 spot. Call is
|
||||||
|
// upper-cased and band lower-cased to match the spot keys ClusterSpotStatuses
|
||||||
|
// builds. normMode may be nil (no grouping).
|
||||||
|
func (r *Repo) WorkedCallSlotKeys(ctx context.Context, normMode func(string) string) (map[string]struct{}, error) {
|
||||||
|
rows, err := r.db.QueryContext(ctx,
|
||||||
|
`SELECT upper(callsign), lower(band), upper(mode) FROM qso
|
||||||
|
WHERE callsign != '' AND band IS NOT NULL AND band != '' AND mode IS NOT NULL AND mode != ''`)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
out := make(map[string]struct{}, 4096)
|
||||||
|
for rows.Next() {
|
||||||
|
var c, b, m string
|
||||||
|
if err := rows.Scan(&c, &b, &m); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if normMode != nil {
|
||||||
|
m = normMode(m)
|
||||||
|
}
|
||||||
|
out[c+"|"+b] = struct{}{}
|
||||||
|
out[c+"|"+b+"|"+m] = struct{}{}
|
||||||
|
}
|
||||||
|
return out, rows.Err()
|
||||||
|
}
|
||||||
|
|
||||||
// WorkedPOTARefs returns the set of POTA park references already worked
|
// WorkedPOTARefs returns the set of POTA park references already worked
|
||||||
// (upper-cased). A QSO's pota_ref may hold several comma-separated parks
|
// (upper-cased). A QSO's pota_ref may hold several comma-separated parks
|
||||||
// (an n-fer); each is added separately.
|
// (an n-fer); each is added separately.
|
||||||
|
|||||||
@@ -61,6 +61,22 @@ func get(ctx context.Context, url, user, pass string) ([]byte, error) {
|
|||||||
return body, nil
|
return body, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// relayBase turns a configured host into the base URL of a network relay board.
|
||||||
|
// A bare host or host:port keeps the default http:// (the boards serve plain
|
||||||
|
// HTTP on their LAN). A host that already carries a scheme is used verbatim, so
|
||||||
|
// a board can be reached through an HTTPS reverse proxy — e.g. a Nginx Proxy
|
||||||
|
// Manager entry "https://relay.example.com" fronting the LAN board's port 80,
|
||||||
|
// which is how an operator reaches shack relays from outside when 80/443 are
|
||||||
|
// already taken by the proxy. A trailing slash is trimmed so path parts append
|
||||||
|
// cleanly; an optional sub-path in the host is preserved (a sub-path proxy).
|
||||||
|
func relayBase(host string) string {
|
||||||
|
h := strings.TrimSpace(host)
|
||||||
|
if strings.HasPrefix(h, "http://") || strings.HasPrefix(h, "https://") {
|
||||||
|
return strings.TrimRight(h, "/")
|
||||||
|
}
|
||||||
|
return "http://" + h
|
||||||
|
}
|
||||||
|
|
||||||
// ── WebSwitch 1216H ────────────────────────────────────────────────────
|
// ── WebSwitch 1216H ────────────────────────────────────────────────────
|
||||||
|
|
||||||
type webswitch struct {
|
type webswitch struct {
|
||||||
@@ -82,7 +98,7 @@ func (w *webswitch) Set(ctx context.Context, relay int, on bool) error {
|
|||||||
if on {
|
if on {
|
||||||
action = "on"
|
action = "on"
|
||||||
}
|
}
|
||||||
_, err := get(ctx, fmt.Sprintf("http://%s/relaycontrol/%s/%d", w.host, action, relay), "", "")
|
_, err := get(ctx, fmt.Sprintf("%s/relaycontrol/%s/%d", relayBase(w.host), action, relay), "", "")
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -93,7 +109,7 @@ func (w *webswitch) Status(ctx context.Context) ([]bool, error) {
|
|||||||
sel.WriteString(strconv.Itoa(i))
|
sel.WriteString(strconv.Itoa(i))
|
||||||
sel.WriteByte('$')
|
sel.WriteByte('$')
|
||||||
}
|
}
|
||||||
body, err := get(ctx, fmt.Sprintf("http://%s/relaystate/get2/%s", w.host, sel.String()), "", "")
|
body, err := get(ctx, fmt.Sprintf("%s/relaystate/get2/%s", relayBase(w.host), sel.String()), "", "")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -140,7 +156,7 @@ func (k *kmtronic) Set(ctx context.Context, relay int, on bool) error {
|
|||||||
state = "01"
|
state = "01"
|
||||||
}
|
}
|
||||||
// FF<rr><ss>: e.g. FF0101 = relay 1 on, FF0800 = relay 8 off.
|
// FF<rr><ss>: e.g. FF0101 = relay 1 on, FF0800 = relay 8 off.
|
||||||
_, err := get(ctx, fmt.Sprintf("http://%s/FF%02d%s", k.host, relay, state), k.user, k.pass)
|
_, err := get(ctx, fmt.Sprintf("%s/FF%02d%s", relayBase(k.host), relay, state), k.user, k.pass)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -154,7 +170,7 @@ type kmStatus struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (k *kmtronic) Status(ctx context.Context) ([]bool, error) {
|
func (k *kmtronic) Status(ctx context.Context) ([]bool, error) {
|
||||||
body, err := get(ctx, fmt.Sprintf("http://%s/status.xml", k.host), k.user, k.pass)
|
body, err := get(ctx, fmt.Sprintf("%s/status.xml", relayBase(k.host)), k.user, k.pass)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -259,8 +275,8 @@ func (d *dingtian) Set(ctx context.Context, relay int, on bool) error {
|
|||||||
}
|
}
|
||||||
// type=0 is plain ON/OFF (1 = jogging, 2 = delay, 3 = flash, 4 = toggle),
|
// type=0 is plain ON/OFF (1 = jogging, 2 = delay, 3 = flash, 4 = toggle),
|
||||||
// and time is then unused.
|
// and time is then unused.
|
||||||
body, err := d.getCGI(ctx, fmt.Sprintf("http://%s/relay_cgi.cgi?type=0&relay=%d&on=%d&time=0&pwd=%s&",
|
body, err := d.getCGI(ctx, fmt.Sprintf("%s/relay_cgi.cgi?type=0&relay=%d&on=%d&time=0&pwd=%s&",
|
||||||
d.host, relay-1, state, d.pwd))
|
relayBase(d.host), relay-1, state, d.pwd))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -274,7 +290,7 @@ func (d *dingtian) Set(ctx context.Context, relay int, on bool) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (d *dingtian) Status(ctx context.Context) ([]bool, error) {
|
func (d *dingtian) Status(ctx context.Context) ([]bool, error) {
|
||||||
body, err := d.getCGI(ctx, fmt.Sprintf("http://%s/relay_cgi_load.cgi", d.host))
|
body, err := d.getCGI(ctx, fmt.Sprintf("%s/relay_cgi_load.cgi", relayBase(d.host)))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -172,3 +172,19 @@ func TestDingtianSetRefusalIsAnError(t *testing.T) {
|
|||||||
t.Fatal("a refused command answered HTTP 200 and was reported as success")
|
t.Fatal("a refused command answered HTTP 200 and was reported as success")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestRelayBase(t *testing.T) {
|
||||||
|
cases := map[string]string{
|
||||||
|
"192.168.1.5": "http://192.168.1.5",
|
||||||
|
"192.168.1.5:8080": "http://192.168.1.5:8080",
|
||||||
|
"https://relay.example.com": "https://relay.example.com",
|
||||||
|
"https://relay.example.com/": "https://relay.example.com",
|
||||||
|
"http://relay.example.com/sw/": "http://relay.example.com/sw",
|
||||||
|
" relay.local ": "http://relay.local",
|
||||||
|
}
|
||||||
|
for in, want := range cases {
|
||||||
|
if got := relayBase(in); got != want {
|
||||||
|
t.Errorf("relayBase(%q) = %q, want %q", in, got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -36,6 +36,7 @@ import (
|
|||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
|
"sync/atomic"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -59,6 +60,13 @@ type Server struct {
|
|||||||
ln net.Listener
|
ln net.Listener
|
||||||
conns map[net.Conn]struct{}
|
conns map[net.Conn]struct{}
|
||||||
closed bool
|
closed bool
|
||||||
|
|
||||||
|
// ptt mirrors the last PTT state a client commanded via set_ptt. WSJT-X/JTDX
|
||||||
|
// poll get_ptt DURING transmit to confirm the rig is keyed; if get_ptt reads
|
||||||
|
// RX they conclude PTT failed and abort the over after a second or two. We
|
||||||
|
// don't read PTT back from every backend, so echo what the client last set —
|
||||||
|
// always consistent with its own command, and enough to satisfy the check.
|
||||||
|
ptt atomic.Bool
|
||||||
}
|
}
|
||||||
|
|
||||||
func New(port int, rig Rig, logf func(string, ...any)) *Server {
|
func New(port int, rig Rig, logf func(string, ...any)) *Server {
|
||||||
@@ -228,10 +236,12 @@ func (s *Server) handle(line string) (resp string, quit bool) {
|
|||||||
return rprt(0), false
|
return rprt(0), false
|
||||||
|
|
||||||
case "t", "\\get_ptt":
|
case "t", "\\get_ptt":
|
||||||
// We do not read PTT back from every backend, and answering "transmitting"
|
// Echo the last commanded PTT state. WSJT-X/JTDX poll this WHILE
|
||||||
// wrongly would make a client hold off for ever. Reporting RX is the safe
|
// transmitting to confirm the rig is keyed; answering a blanket "0" (RX)
|
||||||
// direction: the worst case is a client that transmits when we said it
|
// made them decide PTT had failed and abort the over after ~1-2 s.
|
||||||
// could, which is what it was going to do anyway.
|
if s.ptt.Load() {
|
||||||
|
return "1\n", false
|
||||||
|
}
|
||||||
return "0\n", false
|
return "0\n", false
|
||||||
case "T", "\\set_ptt":
|
case "T", "\\set_ptt":
|
||||||
if len(args) < 1 {
|
if len(args) < 1 {
|
||||||
@@ -242,6 +252,7 @@ func (s *Server) handle(line string) (resp string, quit bool) {
|
|||||||
s.log("rigctld: set_ptt %v failed: %v", on, err)
|
s.log("rigctld: set_ptt %v failed: %v", on, err)
|
||||||
return rprt(-9), false
|
return rprt(-9), false
|
||||||
}
|
}
|
||||||
|
s.ptt.Store(on)
|
||||||
return rprt(0), false
|
return rprt(0), false
|
||||||
|
|
||||||
case "v", "\\get_vfo":
|
case "v", "\\get_vfo":
|
||||||
|
|||||||
@@ -138,6 +138,28 @@ func TestHandleReportsBackendFailure(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// get_ptt must echo the last commanded PTT state. WSJT-X/JTDX poll get_ptt while
|
||||||
|
// transmitting to confirm the rig is keyed; a blanket "0" made them decide PTT
|
||||||
|
// had failed and abort the over after a second or two.
|
||||||
|
func TestGetPTTEchoesSetPTT(t *testing.T) {
|
||||||
|
s := New(0, &fakeRig{}, nil)
|
||||||
|
if got, _ := s.handle("t"); got != "0\n" {
|
||||||
|
t.Fatalf("initial get_ptt = %q, want 0", got)
|
||||||
|
}
|
||||||
|
if got, _ := s.handle("T 1"); got != "RPRT 0\n" {
|
||||||
|
t.Fatalf("set_ptt 1 = %q, want RPRT 0", got)
|
||||||
|
}
|
||||||
|
if got, _ := s.handle("t"); got != "1\n" {
|
||||||
|
t.Fatalf("get_ptt after T 1 = %q, want 1 — client would abort TX", got)
|
||||||
|
}
|
||||||
|
if got, _ := s.handle("T 0"); got != "RPRT 0\n" {
|
||||||
|
t.Fatalf("set_ptt 0 = %q, want RPRT 0", got)
|
||||||
|
}
|
||||||
|
if got, _ := s.handle("t"); got != "0\n" {
|
||||||
|
t.Fatalf("get_ptt after T 0 = %q, want 0", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// dump_state is parsed POSITIONALLY by Hamlib clients: WSJT-X reads the first
|
// dump_state is parsed POSITIONALLY by Hamlib clients: WSJT-X reads the first
|
||||||
// line as the protocol version and refuses to continue if the block is short or
|
// line as the protocol version and refuses to continue if the block is short or
|
||||||
// misshapen. Pinning its shape is what stops a well-meaning edit from silently
|
// misshapen. Pinning its shape is what stops a well-meaning edit from silently
|
||||||
|
|||||||
@@ -0,0 +1,158 @@
|
|||||||
|
// Package dcu1 drives rotator controllers that speak the Hy-Gain DCU-1 protocol,
|
||||||
|
// over a serial COM port (or a raw TCP socket, e.g. a serial-over-IP bridge).
|
||||||
|
//
|
||||||
|
// DCU-1 is used by the Hy-Gain DCU-1, the Idiom Press Rotor-EZ, Green Heron
|
||||||
|
// controllers, and the RotorCard DXA (hamsupply) for Yaesu DXA rotors. It is a
|
||||||
|
// DIFFERENT command set from Yaesu GS-232 (see internal/rotator/gs232):
|
||||||
|
// semicolon-terminated, azimuth only.
|
||||||
|
//
|
||||||
|
// Commands (';' terminated — roundTrip appends the ';'):
|
||||||
|
//
|
||||||
|
// AP1nnn set the target bearing nnn (000-359)
|
||||||
|
// AM1 rotate to the target (some controllers move on AP1 alone; AM1 is
|
||||||
|
// harmless and makes the Rotor-EZ/DCU-1 variants that need it work)
|
||||||
|
// AI1 query the current bearing → the reply carries the 3-digit azimuth
|
||||||
|
//
|
||||||
|
// The base DCU-1 set has no dedicated stop; Stop re-commands the current bearing,
|
||||||
|
// which halts rotation.
|
||||||
|
package dcu1
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"net"
|
||||||
|
"regexp"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"go.bug.st/serial"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
dialTimeout = 3 * time.Second
|
||||||
|
ioTimeout = 2 * time.Second
|
||||||
|
)
|
||||||
|
|
||||||
|
// Client is a stateless per-call sender, mirroring the gs232/pst/rotgenius idiom.
|
||||||
|
// Exactly one of (Host, Port) or ComPort is used.
|
||||||
|
type Client struct {
|
||||||
|
Host string
|
||||||
|
Port int
|
||||||
|
ComPort string // serial transport: "COM5" etc.
|
||||||
|
// Baud varies by controller (a Hy-Gain DCU-1 is 4800; Green Heron / RotorCard
|
||||||
|
// can differ). Zero keeps 4800.
|
||||||
|
Baud int
|
||||||
|
}
|
||||||
|
|
||||||
|
// New returns a TCP Client (a serial-over-IP bridge in front of the controller).
|
||||||
|
func New(host string, port int) *Client {
|
||||||
|
if host == "" {
|
||||||
|
host = "127.0.0.1"
|
||||||
|
}
|
||||||
|
if port <= 0 || port > 65535 {
|
||||||
|
port = 4001
|
||||||
|
}
|
||||||
|
return &Client{Host: host, Port: port}
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewSerial returns a Client over the controller's COM port.
|
||||||
|
func NewSerial(comPort string, baud int) *Client {
|
||||||
|
return &Client{ComPort: comPort, Baud: baud}
|
||||||
|
}
|
||||||
|
|
||||||
|
// roundTrip opens a connection, sends one ';'-terminated command and (when
|
||||||
|
// wantReply) reads until a 3-digit bearing is present. cmd must NOT carry the
|
||||||
|
// ';'.
|
||||||
|
func (c *Client) roundTrip(cmd string, wantReply bool) (string, error) {
|
||||||
|
var conn io.ReadWriteCloser
|
||||||
|
if c.ComPort != "" {
|
||||||
|
baud := c.Baud
|
||||||
|
if baud <= 0 {
|
||||||
|
baud = 4800
|
||||||
|
}
|
||||||
|
sp, err := serial.Open(c.ComPort, &serial.Mode{BaudRate: baud})
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("open rotator %s @ %d baud: %w", c.ComPort, baud, err)
|
||||||
|
}
|
||||||
|
_ = sp.SetReadTimeout(200 * time.Millisecond)
|
||||||
|
conn = sp
|
||||||
|
} else {
|
||||||
|
nc, err := net.DialTimeout("tcp", net.JoinHostPort(c.Host, strconv.Itoa(c.Port)), dialTimeout)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("connect DCU-1 %s:%d: %w", c.Host, c.Port, err)
|
||||||
|
}
|
||||||
|
_ = nc.SetDeadline(time.Now().Add(ioTimeout))
|
||||||
|
conn = nc
|
||||||
|
}
|
||||||
|
defer conn.Close()
|
||||||
|
if _, err := conn.Write([]byte(cmd + ";")); err != nil {
|
||||||
|
return "", fmt.Errorf("send %q: %w", cmd, err)
|
||||||
|
}
|
||||||
|
if !wantReply {
|
||||||
|
return "", nil
|
||||||
|
}
|
||||||
|
buf := make([]byte, 64)
|
||||||
|
var sb strings.Builder
|
||||||
|
deadline := time.Now().Add(ioTimeout)
|
||||||
|
for time.Now().Before(deadline) {
|
||||||
|
n, err := conn.Read(buf)
|
||||||
|
if n > 0 {
|
||||||
|
sb.Write(buf[:n])
|
||||||
|
// The DCU-1 reply carries the bearing as three digits (framing varies —
|
||||||
|
// ";nnn", "nnn;", "+0nnn"). Stop once we have them rather than on a
|
||||||
|
// specific terminator, so any flavour reads cleanly.
|
||||||
|
if azRe.MatchString(sb.String()) {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// A serial read that times out returns (0, nil) — keep polling until the
|
||||||
|
// overall deadline; a real error ends the read.
|
||||||
|
if err != nil {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
line := strings.TrimSpace(sb.String())
|
||||||
|
if line == "" {
|
||||||
|
return "", fmt.Errorf("no reply to %q", cmd)
|
||||||
|
}
|
||||||
|
return line, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// GoTo points the antenna at az (0-359): set the target, then rotate.
|
||||||
|
func (c *Client) GoTo(az int) error {
|
||||||
|
az = ((az % 360) + 360) % 360
|
||||||
|
if _, err := c.roundTrip(fmt.Sprintf("AP1%03d", az), false); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
_, err := c.roundTrip("AM1", false)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Stop halts rotation. The base DCU-1 set has no stop command, so re-command the
|
||||||
|
// current bearing — the controller stops when the target equals where it is.
|
||||||
|
func (c *Client) Stop() error {
|
||||||
|
az, _, err := c.Heading()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
_, err = c.roundTrip(fmt.Sprintf("AP1%03d", az), false)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// azRe matches the 3-digit bearing in any of the DCU-1 reply framings.
|
||||||
|
var azRe = regexp.MustCompile(`(\d{3})`)
|
||||||
|
|
||||||
|
// Heading queries the current azimuth. Returns the raw reply for diagnostics.
|
||||||
|
func (c *Client) Heading() (az int, raw string, err error) {
|
||||||
|
raw, err = c.roundTrip("AI1", true)
|
||||||
|
if err != nil {
|
||||||
|
return 0, raw, err
|
||||||
|
}
|
||||||
|
m := azRe.FindStringSubmatch(raw)
|
||||||
|
if m == nil {
|
||||||
|
return 0, raw, fmt.Errorf("unrecognised azimuth reply %q", raw)
|
||||||
|
}
|
||||||
|
az, _ = strconv.Atoi(m[1])
|
||||||
|
return az % 360, raw, nil
|
||||||
|
}
|
||||||
@@ -228,6 +228,18 @@ func (c *Client) PowerOn() error {
|
|||||||
func (c *Client) PowerOff() error {
|
func (c *Client) PowerOff() error {
|
||||||
err := c.sendCmd(cmdOff)
|
err := c.sendCmd(cmdOff)
|
||||||
applog.Printf("spe: power OFF — SWITCH OFF key sent (err=%v)", err)
|
applog.Printf("spe: power OFF — SWITCH OFF key sent (err=%v)", err)
|
||||||
|
// Drop the link and mark the amp offline at once, exactly as a fresh start
|
||||||
|
// would see it. The amp stops answering its UART once off, but the connection
|
||||||
|
// that was already open BEFORE the off keystroke kept reading as "connected"
|
||||||
|
// (stale/queued frames), so the UI never showed OFF and PowerOn — which only
|
||||||
|
// wakes a DISCONNECTED amp — did nothing until the operator restarted OpsLog.
|
||||||
|
// The poll loop reopens the port on its next tick; a plain reopen never wakes a
|
||||||
|
// switched-off amp (only PowerOn's RTS/DTR edge does), so it stays offline.
|
||||||
|
time.Sleep(100 * time.Millisecond) // let the 6-byte OFF command flush before we close
|
||||||
|
c.mu.Lock()
|
||||||
|
c.dropLocked()
|
||||||
|
c.mu.Unlock()
|
||||||
|
c.setErr(fmt.Errorf("switched off"))
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+127
-40
@@ -23,6 +23,12 @@ const (
|
|||||||
ubReadTimeout = 4 * time.Second // was 1s — too tight for a remote link
|
ubReadTimeout = 4 * time.Second // was 1s — too tight for a remote link
|
||||||
ubKeepAlive = 15 * time.Second // OS-level TCP keepalive
|
ubKeepAlive = 15 * time.Second // OS-level TCP keepalive
|
||||||
ubMaxPollTimeout = 3 // consecutive read timeouts tolerated before reconnecting
|
ubMaxPollTimeout = 3 // consecutive read timeouts tolerated before reconnecting
|
||||||
|
// How long a just-commanded direction is trusted AFTER the motors have stopped
|
||||||
|
// but before the antenna's status confirms it. The timer is held off entirely
|
||||||
|
// while the motors are still moving, so this is only the grace period for the
|
||||||
|
// confirmation poll to arrive once the elements have settled — generous, because
|
||||||
|
// over a remote link that poll lags by several seconds.
|
||||||
|
ubPendingDirGrace = 8 * time.Second
|
||||||
)
|
)
|
||||||
|
|
||||||
// Protocol constants
|
// Protocol constants
|
||||||
@@ -82,8 +88,22 @@ type Client struct {
|
|||||||
// yet (Frequency==0) — otherwise the deadband is bypassed and every small QSY
|
// yet (Frequency==0) — otherwise the deadband is bypassed and every small QSY
|
||||||
// re-tunes the motors.
|
// re-tunes the motors.
|
||||||
lastSetKHz int
|
lastSetKHz int
|
||||||
|
|
||||||
|
// moveCmdAt is when a move (frequency or direction) was last COMMANDED. The
|
||||||
|
// status poll runs every couple of seconds, so without this the "moving" flag
|
||||||
|
// — which drives the UI indicator and the Flex TX-inhibit — appeared up to a
|
||||||
|
// poll late even though the elements start moving at once. GetStatus reports
|
||||||
|
// motion during a short window after a command so both react immediately.
|
||||||
|
moveCmdAt time.Time
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ubMoveOptimisticWindow is how long after a commanded move GetStatus reports
|
||||||
|
// "moving" before the status poll has had a chance to read the real motor state.
|
||||||
|
// It only needs to bridge one poll interval; once a poll sees real motion, that
|
||||||
|
// takes over. Bounded, so if the antenna never reports motion the flag still
|
||||||
|
// clears rather than latching the TX-inhibit on for ever.
|
||||||
|
const ubMoveOptimisticWindow = 3 * time.Second
|
||||||
|
|
||||||
// LastSetKHz returns the frequency (kHz) most recently commanded to the antenna,
|
// LastSetKHz returns the frequency (kHz) most recently commanded to the antenna,
|
||||||
// or 0 if none yet.
|
// or 0 if none yet.
|
||||||
func (c *Client) LastSetKHz() int {
|
func (c *Client) LastSetKHz() int {
|
||||||
@@ -221,12 +241,30 @@ func (c *Client) pollLoop() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
c.statusMu.Lock()
|
c.statusMu.Lock()
|
||||||
// Keep a just-commanded direction until the antenna reports it.
|
// Keep a just-commanded direction until the antenna actually reports it.
|
||||||
|
// Over a remote link the confirmation arrives several seconds after the
|
||||||
|
// command — the motors flip the elements first — so the old fixed 4 s
|
||||||
|
// timeout expired WHILE the change was still in flight, and the stale poll
|
||||||
|
// reverted the UI to the old pattern even though the antenna was on its way
|
||||||
|
// to the new one. Now: while the motors are still moving the change is in
|
||||||
|
// progress, so hold the commanded pattern and keep resetting the timer;
|
||||||
|
// only once the motors have stopped does the short grace window run, giving
|
||||||
|
// the confirmation poll time to land. The poll only wins if the motors are
|
||||||
|
// idle AND the antenna still reports a different pattern past that window —
|
||||||
|
// i.e. the command genuinely did not take.
|
||||||
if c.pendingDirSet {
|
if c.pendingDirSet {
|
||||||
if time.Since(c.pendingDirAt) > 4*time.Second || status.Direction == c.pendingDir {
|
if status.MotorsMoving != 0 {
|
||||||
c.pendingDirSet = false
|
c.pendingDirAt = time.Now() // still repositioning — don't start the grace timer
|
||||||
} else {
|
}
|
||||||
status.Direction = c.pendingDir
|
switch {
|
||||||
|
case status.Direction == c.pendingDir:
|
||||||
|
c.pendingDirSet = false // confirmed by the antenna
|
||||||
|
case time.Since(c.pendingDirAt) > ubPendingDirGrace:
|
||||||
|
c.pendingDirSet = false // motors idle, still unconfirmed → accept the poll
|
||||||
|
log.Printf("Ultrabeam: antenna never confirmed direction %d (reports %d) — dropping the hold",
|
||||||
|
c.pendingDir, status.Direction)
|
||||||
|
default:
|
||||||
|
status.Direction = c.pendingDir // still changing, or within the grace window
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
c.lastStatus = status
|
c.lastStatus = status
|
||||||
@@ -246,7 +284,19 @@ func (c *Client) GetStatus() (*Status, error) {
|
|||||||
return &Status{Connected: false}, nil
|
return &Status{Connected: false}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
return c.lastStatus, nil
|
// Copy so the optimistic-motion tweak below never mutates the cached status
|
||||||
|
// the poll goroutine owns.
|
||||||
|
st := *c.lastStatus
|
||||||
|
// Optimistic motion: right after a commanded move, report "moving" until a
|
||||||
|
// status poll can read the real motor state (~one poll interval). The elements
|
||||||
|
// start moving the instant the operator clicks a band/pattern, so this makes
|
||||||
|
// the UI indicator and the Flex TX-inhibit react immediately instead of a poll
|
||||||
|
// later. Real polled motion takes over once seen; the window is bounded so the
|
||||||
|
// flag can't latch the inhibit on for ever.
|
||||||
|
if st.Connected && st.MotorsMoving == 0 && !c.moveCmdAt.IsZero() && time.Since(c.moveCmdAt) < ubMoveOptimisticWindow {
|
||||||
|
st.MotorsMoving = 1 // sentinel: optimistically moving (read only as != 0)
|
||||||
|
}
|
||||||
|
return &st, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// getNextSeq returns the next sequence number
|
// getNextSeq returns the next sequence number
|
||||||
@@ -277,10 +327,9 @@ func quoteByte(b byte) []byte {
|
|||||||
return []byte{b}
|
return []byte{b}
|
||||||
}
|
}
|
||||||
|
|
||||||
// buildPacket creates a complete packet with checksum and escaping
|
// buildPacket creates a complete packet with checksum and escaping. The seq is
|
||||||
func (c *Client) buildPacket(cmd byte, data []byte) []byte {
|
// supplied by the caller so sendCommand can match the reply against it.
|
||||||
seq := c.getNextSeq()
|
func (c *Client) buildPacket(seq, cmd byte, data []byte) []byte {
|
||||||
|
|
||||||
// Calculate checksum on unquoted data
|
// Calculate checksum on unquoted data
|
||||||
payload := append([]byte{seq, cmd}, data...)
|
payload := append([]byte{seq, cmd}, data...)
|
||||||
chk := calculateChecksum(payload)
|
chk := calculateChecksum(payload)
|
||||||
@@ -365,39 +414,27 @@ func (c *Client) sendCommand(cmd byte, data []byte) ([]byte, error) {
|
|||||||
return nil, fmt.Errorf("not connected")
|
return nil, fmt.Errorf("not connected")
|
||||||
}
|
}
|
||||||
|
|
||||||
// Build and send packet
|
// Flush anything already sitting in the stream before we send. The antenna
|
||||||
packet := c.buildPacket(cmd, data)
|
// does NOT echo our sequence number — its replies carry their own counter — so
|
||||||
|
// a reply cannot be matched to its request. Instead we keep the exchange 1:1:
|
||||||
|
// a reply left behind by an earlier timed-out command is discarded here, so
|
||||||
|
// the reply we read next belongs to THIS command. Reading a stale reply as the
|
||||||
|
// current one crossed STATUS with READ_BANDS/PROGRESS — phantom frequencies (a
|
||||||
|
// spurious follow-loop re-tune), dropped connections and wrong element lengths.
|
||||||
|
c.drainStale()
|
||||||
|
|
||||||
_, err := c.conn.Write(packet)
|
seq := c.getNextSeq()
|
||||||
if err != nil {
|
packet := c.buildPacket(seq, cmd, data)
|
||||||
|
if _, err := c.conn.Write(packet); err != nil {
|
||||||
return nil, fmt.Errorf("failed to write: %w", err)
|
return nil, fmt.Errorf("failed to write: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Read reply with timeout (generous — tolerates remote-link latency).
|
// Read the reply with a timeout generous enough for a remote link.
|
||||||
c.conn.SetReadDeadline(time.Now().Add(ubReadTimeout))
|
c.conn.SetReadDeadline(time.Now().Add(ubReadTimeout))
|
||||||
|
buffer, err := c.readPacket()
|
||||||
// Read until we get a complete packet
|
if err != nil {
|
||||||
var buffer []byte
|
return nil, err
|
||||||
for {
|
|
||||||
b, err := c.reader.ReadByte()
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("failed to read: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
buffer = append(buffer, b)
|
|
||||||
|
|
||||||
// Check if we have a complete packet
|
|
||||||
if b == ETX && len(buffer) > 0 && buffer[0] == STX {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
|
|
||||||
// Prevent infinite loop
|
|
||||||
if len(buffer) > 256 {
|
|
||||||
return nil, fmt.Errorf("packet too long")
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Parse reply
|
|
||||||
_, replyCmd, payload, err := parsePacket(buffer)
|
_, replyCmd, payload, err := parsePacket(buffer)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("failed to parse reply: %w", err)
|
return nil, fmt.Errorf("failed to parse reply: %w", err)
|
||||||
@@ -426,6 +463,45 @@ func (c *Client) sendCommand(cmd byte, data []byte) ([]byte, error) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// drainStale discards any bytes already waiting in the stream — a reply left
|
||||||
|
// behind by a command that timed out. A short read deadline lets it consume what
|
||||||
|
// is there and stop quickly when the stream is clean. Caller holds connMu.
|
||||||
|
func (c *Client) drainStale() {
|
||||||
|
c.conn.SetReadDeadline(time.Now().Add(5 * time.Millisecond))
|
||||||
|
buf := make([]byte, 256)
|
||||||
|
for {
|
||||||
|
n, err := c.reader.Read(buf)
|
||||||
|
if n == 0 || err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// readPacket reads one complete STX…ETX frame, skipping any leading bytes until
|
||||||
|
// an STX so a partial/garbage remnant left in the stream can't derail the parse.
|
||||||
|
// STX/ETX/DLE are all high-bit (0xF5/0xFA/0xF6) and the escaping clears the MSB,
|
||||||
|
// so a raw ETX only ever appears as the real terminator. Caller holds connMu and
|
||||||
|
// has set a read deadline.
|
||||||
|
func (c *Client) readPacket() ([]byte, error) {
|
||||||
|
var buffer []byte
|
||||||
|
for {
|
||||||
|
b, err := c.reader.ReadByte()
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("failed to read: %w", err)
|
||||||
|
}
|
||||||
|
if len(buffer) == 0 && b != STX {
|
||||||
|
continue // resync to the start of a frame
|
||||||
|
}
|
||||||
|
buffer = append(buffer, b)
|
||||||
|
if b == ETX {
|
||||||
|
return buffer, nil
|
||||||
|
}
|
||||||
|
if len(buffer) > 256 {
|
||||||
|
return nil, fmt.Errorf("packet too long")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// queryStatus queries general status (command 1)
|
// queryStatus queries general status (command 1)
|
||||||
func (c *Client) queryStatus() (*Status, error) {
|
func (c *Client) queryStatus() (*Status, error) {
|
||||||
reply, err := c.sendCommand(CMD_STATUS, nil)
|
reply, err := c.sendCommand(CMD_STATUS, nil)
|
||||||
@@ -433,7 +509,13 @@ func (c *Client) queryStatus() (*Status, error) {
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(reply) < 12 {
|
// An RCU-06 controller — seen behind an RS232-to-Ethernet bridge — answers with
|
||||||
|
// an 11-byte status frame: the standard one WITHOUT the trailing FreqMax byte.
|
||||||
|
// The packet checksum was already verified, so a short-but-valid frame is real,
|
||||||
|
// not a fragment. Accept it and default the missing tail fields instead of
|
||||||
|
// reconnect-looping on "reply too short". reply[9]/[10] (MotorsMoving, FreqMin)
|
||||||
|
// are the last we truly need, so 10 bytes is the floor.
|
||||||
|
if len(reply) < 10 {
|
||||||
return nil, fmt.Errorf("status reply too short: %d bytes", len(reply))
|
return nil, fmt.Errorf("status reply too short: %d bytes", len(reply))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -446,8 +528,12 @@ func (c *Client) queryStatus() (*Status, error) {
|
|||||||
Direction: int(reply[6] & 0x0F),
|
Direction: int(reply[6] & 0x0F),
|
||||||
OffState: (reply[7] & 0x02) != 0,
|
OffState: (reply[7] & 0x02) != 0,
|
||||||
MotorsMoving: int(reply[9]),
|
MotorsMoving: int(reply[9]),
|
||||||
FreqMin: int(reply[10]),
|
}
|
||||||
FreqMax: int(reply[11]),
|
if len(reply) > 10 {
|
||||||
|
status.FreqMin = int(reply[10])
|
||||||
|
}
|
||||||
|
if len(reply) > 11 {
|
||||||
|
status.FreqMax = int(reply[11])
|
||||||
}
|
}
|
||||||
|
|
||||||
return status, nil
|
return status, nil
|
||||||
@@ -513,6 +599,7 @@ func (c *Client) SetFrequency(freqKhz int, direction int) error {
|
|||||||
c.statusMu.Lock()
|
c.statusMu.Lock()
|
||||||
c.pendingDir, c.pendingDirAt, c.pendingDirSet = direction, time.Now(), true
|
c.pendingDir, c.pendingDirAt, c.pendingDirSet = direction, time.Now(), true
|
||||||
c.lastSetKHz = freqKhz
|
c.lastSetKHz = freqKhz
|
||||||
|
c.moveCmdAt = time.Now() // start reporting motion at once — see ubMoveOptimisticWindow
|
||||||
if c.lastStatus != nil {
|
if c.lastStatus != nil {
|
||||||
c.lastStatus.Direction = direction // reflect immediately
|
c.lastStatus.Direction = direction // reflect immediately
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,94 @@
|
|||||||
|
package ultrabeam
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bufio"
|
||||||
|
"bytes"
|
||||||
|
"net"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// sendCommand must flush any bytes already in the stream (a reply left by an
|
||||||
|
// earlier timed-out command) before reading, then return the reply to THIS
|
||||||
|
// command. The antenna does not echo our sequence number, so keeping the stream
|
||||||
|
// clean is the only way to stay in sync.
|
||||||
|
func TestSendCommandFlushesStaleThenReadsReply(t *testing.T) {
|
||||||
|
srvConn, cliConn := net.Pipe()
|
||||||
|
defer srvConn.Close()
|
||||||
|
defer cliConn.Close()
|
||||||
|
|
||||||
|
c := &Client{conn: cliConn, reader: bufio.NewReader(cliConn)}
|
||||||
|
srv := &Client{reader: bufio.NewReader(srvConn)}
|
||||||
|
|
||||||
|
errc := make(chan error, 1)
|
||||||
|
go func() {
|
||||||
|
// Leftover from a "previous" command still sitting in the stream. The Write
|
||||||
|
// blocks until drainStale consumes it, so it is guaranteed flushed before
|
||||||
|
// the real exchange.
|
||||||
|
if _, err := srvConn.Write(c.buildPacket(9, UB_OK, []byte{0xDE, 0xAD})); err != nil {
|
||||||
|
errc <- err
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// Now serve the actual request.
|
||||||
|
req, err := srv.readPacket()
|
||||||
|
if err != nil {
|
||||||
|
errc <- err
|
||||||
|
return
|
||||||
|
}
|
||||||
|
seq, _, _, err := parsePacket(req)
|
||||||
|
if err != nil {
|
||||||
|
errc <- err
|
||||||
|
return
|
||||||
|
}
|
||||||
|
_, err = srvConn.Write(c.buildPacket(seq, UB_OK, []byte{0x11, 0x22, 0x33}))
|
||||||
|
errc <- err
|
||||||
|
}()
|
||||||
|
|
||||||
|
payload, err := c.sendCommand(CMD_STATUS, nil)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("sendCommand: %v", err)
|
||||||
|
}
|
||||||
|
if !bytes.Equal(payload, []byte{0x11, 0x22, 0x33}) {
|
||||||
|
t.Fatalf("payload = % X, want 11 22 33 — stale reply not flushed", payload)
|
||||||
|
}
|
||||||
|
if err := <-errc; err != nil {
|
||||||
|
t.Fatalf("server: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// readPacket must resynchronise to the next STX, dropping any partial/garbage
|
||||||
|
// bytes left in the stream, so one corrupt frame can't misalign every frame
|
||||||
|
// after it.
|
||||||
|
func TestReadPacketResyncsToSTX(t *testing.T) {
|
||||||
|
frame := (&Client{}).buildPacket(5, UB_OK, []byte{0x01, 0x02})
|
||||||
|
stream := append([]byte{0x11, 0x22, 0x33}, frame...) // leading garbage, then a real frame
|
||||||
|
c := &Client{reader: bufio.NewReader(bytes.NewReader(stream))}
|
||||||
|
|
||||||
|
got, err := c.readPacket()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("readPacket: %v", err)
|
||||||
|
}
|
||||||
|
seq, cmd, payload, err := parsePacket(got)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("parsePacket: %v", err)
|
||||||
|
}
|
||||||
|
if seq != 5 || cmd != UB_OK || !bytes.Equal(payload, []byte{0x01, 0x02}) {
|
||||||
|
t.Fatalf("seq=%d cmd=%d payload=% X, want 5 / OK / 01 02", seq, cmd, payload)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A commanded move must report motion immediately (before the next status poll),
|
||||||
|
// then fall back to the real motor state once the window elapses.
|
||||||
|
func TestOptimisticMotionAfterCommand(t *testing.T) {
|
||||||
|
c := &Client{lastStatus: &Status{Connected: true, MotorsMoving: 0}}
|
||||||
|
|
||||||
|
c.moveCmdAt = time.Now()
|
||||||
|
if st, _ := c.GetStatus(); st.MotorsMoving == 0 {
|
||||||
|
t.Fatal("just after a move command, GetStatus should report motion")
|
||||||
|
}
|
||||||
|
|
||||||
|
c.moveCmdAt = time.Now().Add(-ubMoveOptimisticWindow - time.Second)
|
||||||
|
if st, _ := c.GetStatus(); st.MotorsMoving != 0 {
|
||||||
|
t.Fatal("past the window with motors idle, GetStatus must report no motion")
|
||||||
|
}
|
||||||
|
}
|
||||||
+1
-1
@@ -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.23.3"
|
appVersion = "0.23.8"
|
||||||
|
|
||||||
// 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.
|
||||||
|
|||||||
@@ -6,19 +6,54 @@ export modes.
|
|||||||
|
|
||||||
## Import
|
## Import
|
||||||
|
|
||||||
Import an `.adi` / `.adif` file into the active profile's logbook. On import,
|
**File → Import** (`Ctrl+O`) → pick an `.adi` / `.adif` file → the **Import ADIF**
|
||||||
OpsLog parses every field, maps standard fields to columns and keeps unknown but
|
dialog opens with the options below. Import runs into the **active profile's**
|
||||||
valid ADIF fields in a per-QSO **extras** store (editable later). Country /
|
logbook. A file **without a header** (records pasted from another log) imports
|
||||||
zones are enriched from `cty.dat` where missing. A file **without a header**
|
fine. Progress shows live; a summary follows — imported / updated / duplicates /
|
||||||
(records pasted from another log) imports fine.
|
skipped / total — with expandable **error** and **duplicate** lists.
|
||||||
|
|
||||||
- **Field remapping**: the import dialog can move a field as it reads it —
|
### Duplicate handling
|
||||||
e.g. the RSGB IOTA contest exports the island reference in `STATE`; add a
|
|
||||||
`STATE → IOTA` row and it lands where the award looks.
|
A **duplicate** is a record with the same **callsign + UTC minute + band + mode**
|
||||||
- **Fill from profile**: optionally stamps your station fields *and* your
|
as a QSO already in the logbook. Pick how they are treated:
|
||||||
default confirmation statuses (paper QSL, LoTW, eQSL, Club Log, HRDLog,
|
|
||||||
QRZ.com) on QSOs the file leaves empty — a WSJT-X log carries almost none.
|
| Mode | What it does |
|
||||||
Existing values are never overwritten.
|
|------|--------------|
|
||||||
|
| **Skip duplicates** *(default)* | Adds only new QSOs; existing ones left untouched. Safe default. |
|
||||||
|
| **Update duplicates** | Merges the file's non-empty fields (QSL / LoTW / eQSL / QRZ statuses & dates, etc.) onto the matching QSO — fields the file omits are kept. Use to re-sync from Log4OM or LoTW. |
|
||||||
|
| **Import everything** | Inserts every record, duplicates included. For deliberately merging two overlapping logs. |
|
||||||
|
|
||||||
|
### Enrichment options
|
||||||
|
|
||||||
|
- **Fix country & zones (cty.dat + ClubLog)** *(on by default)* — recompute
|
||||||
|
Country, DXCC and CQ/ITU zones from `cty.dat`, overriding the file. Corrects
|
||||||
|
what contest software exports wrong (e.g. RG2Y tagged Asiatic instead of
|
||||||
|
European Russia). ClubLog's date-ranged DXpedition overrides are applied on top
|
||||||
|
per QSO date (e.g. TO2A in 2012 → French Guiana) whenever the ClubLog data is
|
||||||
|
downloaded. Everything else in the ADIF is kept as-is. *Tip: combine with
|
||||||
|
**Update duplicates** to re-fix QSOs already in your log.*
|
||||||
|
- **Fill my station fields from my profile** *(off by default)* — backfill empty
|
||||||
|
`MY_*` fields (grid, rig, antenna, address, city, state, county, SOTA/POTA ref,
|
||||||
|
TX power…) plus Operator and Owner callsign from the active profile. Existing
|
||||||
|
values are kept; only `STATION_CALLSIGN` is left untouched so a mixed-call log
|
||||||
|
isn't re-routed. It **also** stamps your default confirmation statuses (paper
|
||||||
|
QSL, LoTW, eQSL, Club Log, HRDLog, QRZ.com — sent & received) on QSOs the file
|
||||||
|
leaves empty. Enable when importing **your own** log; leave off for someone
|
||||||
|
else's.
|
||||||
|
|
||||||
|
### Field remapping (move fields on import)
|
||||||
|
|
||||||
|
Contest software stores the exchange where its own module keeps it. The RSGB IOTA
|
||||||
|
contest, for example, exports the island reference in `STATE` — imported as-is it
|
||||||
|
becomes a US state and the IOTA award stays empty. Click **"The file puts a field
|
||||||
|
in the wrong place…"**, then add a `STATE → IOTA` row (add as many rows as you
|
||||||
|
need). The destination is filled **only where the file left it blank**.
|
||||||
|
|
||||||
|
### Unknown fields
|
||||||
|
|
||||||
|
Any valid ADIF field OpsLog doesn't promote to a column is preserved in a per-QSO
|
||||||
|
**extras** store — editable later and re-exported intact. Nothing valid is
|
||||||
|
dropped.
|
||||||
|
|
||||||
## Export
|
## Export
|
||||||
|
|
||||||
@@ -41,4 +76,7 @@ not lose your award-reference assignments.
|
|||||||
|
|
||||||
- To move a batch of QSOs between logs, export selected → import into the other
|
- To move a batch of QSOs between logs, export selected → import into the other
|
||||||
profile.
|
profile.
|
||||||
|
- Re-syncing statuses from another logger (Log4OM, LoTW, QRZ)? Import the file
|
||||||
|
with **Update duplicates** — it merges the new confirmations onto your existing
|
||||||
|
QSOs without creating copies.
|
||||||
- Use **Find duplicates** (Tools) after importing to catch overlaps.
|
- Use **Find duplicates** (Tools) after importing to catch overlaps.
|
||||||
|
|||||||
Reference in New Issue
Block a user