Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
778db0542e | ||
|
|
f50806fbd9 | ||
|
|
bcfb3bfd37 | ||
|
|
cb430a22ee | ||
|
|
abfed4afa2 | ||
|
|
d48420485f | ||
|
|
0cd243fe00 | ||
|
|
c49faf9a14 | ||
|
|
d01c288454 | ||
|
|
c31ab05c80 | ||
|
|
f45952d7fb | ||
|
|
e6889caae9 | ||
|
|
e3b7a35e2c | ||
|
|
1e507225dd | ||
|
|
47992b5f03 | ||
|
|
453e0df27b | ||
|
|
6ed38014ed | ||
|
|
f832d1ba07 | ||
|
|
f0e00c63a3 | ||
|
|
40ecfb9fa9 | ||
|
|
8c68a7d711 | ||
|
|
628d1e8490 | ||
|
|
0881c72c0f | ||
|
|
6da30f91c4 | ||
|
|
f833ff6d04 | ||
|
|
fba7e79a1c | ||
|
|
d829726679 | ||
|
|
c48edd7898 | ||
|
|
ffaf6fc869 | ||
|
|
4f77d51ffe | ||
|
|
a197d124dc | ||
|
|
9599c3e0b9 | ||
|
|
a81125eab1 | ||
|
|
bbe1b3ce80 | ||
|
|
5e80c27f61 | ||
|
|
7be6f64596 | ||
|
|
0bab7f05b9 | ||
|
|
dc898ce2af | ||
|
|
e5c9ca1a7d | ||
|
|
21a0d560de | ||
|
|
2941121f4b | ||
|
|
6c75ff345b | ||
|
|
d5e25244ee | ||
|
|
4095455e66 | ||
|
|
3f95763ca6 | ||
|
|
72ec3cbb97 | ||
|
|
a8bca8c316 | ||
|
|
8b75166dbe | ||
|
|
d9e03d9de3 | ||
|
|
491546c7f4 | ||
|
|
91b21a4a36 | ||
|
|
eab11db766 | ||
|
|
0c64bdcaf9 | ||
|
|
f0d7a07ed6 | ||
|
|
2aceb99948 | ||
|
|
c48294b0ca | ||
|
|
747c2b9105 | ||
|
|
724e68b38d | ||
|
|
7d664bd1de | ||
|
|
93732ee563 | ||
|
|
5293bb18c5 | ||
|
|
14ac73028e | ||
|
|
b5a88ee5a2 | ||
|
|
e81500f809 | ||
|
|
37805fe3ed | ||
|
|
7578e49573 | ||
|
|
564d97b692 | ||
|
|
99599458ff | ||
|
|
191e92ad62 | ||
|
|
f405e71d7d | ||
|
|
0924062ced | ||
|
|
8683a450a7 | ||
|
|
9f8e3c73d9 | ||
|
|
423cf1f998 | ||
|
|
c0dc1bfcc4 | ||
|
|
46d6531cf5 | ||
|
|
3ed2d957e5 | ||
|
|
5770c40d89 | ||
|
|
5e2c452753 | ||
|
|
f3f966f5b7 | ||
|
|
38c838d232 | ||
|
|
7eb734d86f | ||
|
|
b49599150c | ||
|
|
331db58705 | ||
|
|
62e20de69c | ||
|
|
480d24384b | ||
|
|
c2ff0f714a | ||
|
|
fe2affc72f | ||
|
|
be0326c862 | ||
|
|
8113557015 | ||
|
|
3def789742 | ||
|
|
92ea98bcfa |
+76
-1
@@ -1,6 +1,11 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import "testing"
|
import (
|
||||||
|
"errors"
|
||||||
|
"sync"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
// The coupling is a SET, not a global switch.
|
// The coupling is a SET, not a global switch.
|
||||||
//
|
//
|
||||||
@@ -61,3 +66,73 @@ func TestLinkedAmpsNeedsTwo(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Two combined amplifiers must be commanded AT THE SAME TIME, not one after the
|
||||||
|
// other.
|
||||||
|
//
|
||||||
|
// Sequentially, the second was commanded only once the first had answered — and
|
||||||
|
// an SPE answers over its own link, in its own time. The combiner heard power
|
||||||
|
// appear on one input before the other and beeped about it, on every OFF and
|
||||||
|
// every ON. This is what an operator hears, so it is worth a test that would
|
||||||
|
// hear it too.
|
||||||
|
func TestLinkedAmpCommandsLeaveTogether(t *testing.T) {
|
||||||
|
a := &App{}
|
||||||
|
const slow = 150 * time.Millisecond
|
||||||
|
|
||||||
|
var mu sync.Mutex
|
||||||
|
starts := map[string]time.Time{}
|
||||||
|
err := a.ampFanOut([]string{"one", "two"}, func(id string) error {
|
||||||
|
mu.Lock()
|
||||||
|
starts[id] = time.Now()
|
||||||
|
mu.Unlock()
|
||||||
|
time.Sleep(slow) // an amplifier taking its time to answer
|
||||||
|
return nil
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("fan-out: %v", err)
|
||||||
|
}
|
||||||
|
if len(starts) != 2 {
|
||||||
|
t.Fatalf("%d amplifiers were commanded, want both", len(starts))
|
||||||
|
}
|
||||||
|
// Both goroutines wait on one channel and are released by closing it, so the
|
||||||
|
// gap is scheduling noise. Sequential execution would put a full command
|
||||||
|
// between them.
|
||||||
|
gap := starts["one"].Sub(starts["two"])
|
||||||
|
if gap < 0 {
|
||||||
|
gap = -gap
|
||||||
|
}
|
||||||
|
if gap > slow/3 {
|
||||||
|
t.Errorf("the two amplifiers were commanded %v apart — the combiner hears that as one input arriving late", gap)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The amplifier the operator clicked comes first, and its failure is the one
|
||||||
|
// reported: "the amp I pressed did not respond" beats the same message about
|
||||||
|
// its silent partner.
|
||||||
|
func TestLinkedAmpErrorNamesTheOneClicked(t *testing.T) {
|
||||||
|
a := &App{}
|
||||||
|
clicked := errors.New("the one clicked")
|
||||||
|
other := errors.New("the other one")
|
||||||
|
err := a.ampFanOut([]string{"clicked", "other"}, func(id string) error {
|
||||||
|
if id == "clicked" {
|
||||||
|
return clicked
|
||||||
|
}
|
||||||
|
return other
|
||||||
|
})
|
||||||
|
if !errors.Is(err, clicked) {
|
||||||
|
t.Errorf("fan-out reported %v, want the amplifier the operator pressed", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// One amplifier is the ordinary case and must not change: run inline, no
|
||||||
|
// goroutine, no barrier, and the error straight back.
|
||||||
|
func TestSingleAmpRunsInline(t *testing.T) {
|
||||||
|
a := &App{}
|
||||||
|
boom := errors.New("not running")
|
||||||
|
if err := a.ampFanOut([]string{"solo"}, func(string) error { return boom }); !errors.Is(err, boom) {
|
||||||
|
t.Errorf("a single amplifier reported %v, want the error itself", err)
|
||||||
|
}
|
||||||
|
if err := a.ampFanOut(nil, func(string) error { return boom }); err != nil {
|
||||||
|
t.Errorf("an empty group reported %v, want nothing to do", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ var deniedCallHashes = map[string]struct{}{
|
|||||||
"46fb61e71afb40627cb6493a6a59c9d4d0231ee3cad1a2bf3fcc4cdfce36fabc": {},
|
"46fb61e71afb40627cb6493a6a59c9d4d0231ee3cad1a2bf3fcc4cdfce36fabc": {},
|
||||||
"d1ae6212ec057f9d5c6f379fb57acedac7c94142c9d49667dc04b2016d03d1b6": {},
|
"d1ae6212ec057f9d5c6f379fb57acedac7c94142c9d49667dc04b2016d03d1b6": {},
|
||||||
"0741c9e394b42f43191899105553b47155ddc3026da12b5360701f9c181ff123": {},
|
"0741c9e394b42f43191899105553b47155ddc3026da12b5360701f9c181ff123": {},
|
||||||
|
"ab4926a3a0ab76d41b5b99cd3ad0683584970c341c29427c1dfa4b3c329ce415": {},
|
||||||
}
|
}
|
||||||
|
|
||||||
// callDenied reports whether a callsign is on deniedCallHashes. The call is
|
// callDenied reports whether a callsign is on deniedCallHashes. The call is
|
||||||
|
|||||||
+128
@@ -0,0 +1,128 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"hamlog/internal/applog"
|
||||||
|
"hamlog/internal/psu"
|
||||||
|
)
|
||||||
|
|
||||||
|
// ── Bench power supply (Modbus RTU) ──────────────────────────────────────────
|
||||||
|
//
|
||||||
|
// A programmable supply feeding the shack, switched on and off from OpsLog so
|
||||||
|
// the station comes up and goes down with the logbook rather than by reaching
|
||||||
|
// behind the desk.
|
||||||
|
//
|
||||||
|
// OpsLog READS the supply's measurements and its set points, and WRITES exactly
|
||||||
|
// one thing: the output on/off. The register map has the voltage and current
|
||||||
|
// set points and the three protection trip levels as writable too, and none of
|
||||||
|
// them belong to a logbook — a wrong value there is 30 V where a radio expected
|
||||||
|
// 13.8. See internal/psu for the map and where it comes from.
|
||||||
|
|
||||||
|
const (
|
||||||
|
keyPSUEnabled = "psu.enabled"
|
||||||
|
keyPSUPort = "psu.com_port"
|
||||||
|
keyPSUBaud = "psu.baud"
|
||||||
|
keyPSUAddress = "psu.address" // Modbus slave address, 1…15 on this family
|
||||||
|
)
|
||||||
|
|
||||||
|
// PSUSettings is the JSON shape for the Hardware → Power supply panel.
|
||||||
|
type PSUSettings struct {
|
||||||
|
Enabled bool `json:"enabled"`
|
||||||
|
ComPort string `json:"com_port"`
|
||||||
|
Baud int `json:"baud"` // 9600 from the factory
|
||||||
|
Address int `json:"address"` // 1 from the factory
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetPSUSettings returns the persisted supply config.
|
||||||
|
func (a *App) GetPSUSettings() (PSUSettings, error) {
|
||||||
|
out := PSUSettings{Baud: 9600, Address: 1}
|
||||||
|
if a.settings == nil {
|
||||||
|
return out, fmt.Errorf("db not initialized")
|
||||||
|
}
|
||||||
|
m, err := a.settings.GetMany(a.ctx, keyPSUEnabled, keyPSUPort, keyPSUBaud, keyPSUAddress)
|
||||||
|
if err != nil {
|
||||||
|
return out, err
|
||||||
|
}
|
||||||
|
out.Enabled = m[keyPSUEnabled] == "1"
|
||||||
|
out.ComPort = m[keyPSUPort]
|
||||||
|
if v, e := strconv.Atoi(m[keyPSUBaud]); e == nil && v > 0 {
|
||||||
|
out.Baud = v
|
||||||
|
}
|
||||||
|
if v, e := strconv.Atoi(m[keyPSUAddress]); e == nil && v >= 1 && v <= 250 {
|
||||||
|
out.Address = v
|
||||||
|
}
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// SavePSUSettings persists the config and (re)starts or stops the client.
|
||||||
|
func (a *App) SavePSUSettings(s PSUSettings) error {
|
||||||
|
if a.settings == nil {
|
||||||
|
return fmt.Errorf("db not initialized")
|
||||||
|
}
|
||||||
|
if s.Baud <= 0 {
|
||||||
|
s.Baud = 9600
|
||||||
|
}
|
||||||
|
// The manual gives 1…15 for the address field and 1…250 for the address
|
||||||
|
// SETTING register. Clamped to the wider range and defaulted to 1: an
|
||||||
|
// address of 0 is the Modbus broadcast, which never answers, so accepting it
|
||||||
|
// would give a supply that is present and permanently "not responding".
|
||||||
|
if s.Address < 1 || s.Address > 250 {
|
||||||
|
s.Address = 1
|
||||||
|
}
|
||||||
|
for k, v := range map[string]string{
|
||||||
|
keyPSUEnabled: boolStr(s.Enabled),
|
||||||
|
keyPSUPort: strings.TrimSpace(s.ComPort),
|
||||||
|
keyPSUBaud: strconv.Itoa(s.Baud),
|
||||||
|
keyPSUAddress: strconv.Itoa(s.Address),
|
||||||
|
} {
|
||||||
|
if err := a.settings.Set(a.ctx, k, v); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
a.restartAsync("psu", a.startPSU)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// startPSU stops any running client and starts a fresh one if the supply is
|
||||||
|
// enabled and has a port. Safe to call repeatedly (startup, settings save,
|
||||||
|
// profile switch).
|
||||||
|
func (a *App) startPSU() {
|
||||||
|
if a.psu != nil {
|
||||||
|
go a.psu.Stop()
|
||||||
|
a.psu = nil
|
||||||
|
}
|
||||||
|
s, err := a.GetPSUSettings()
|
||||||
|
if err != nil {
|
||||||
|
applog.Printf("psu: not started — settings unavailable: %v", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if !s.Enabled {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if strings.TrimSpace(s.ComPort) == "" {
|
||||||
|
applog.Printf("psu: not started — no serial port configured")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
applog.Printf("psu: starting on %s @ %d baud, Modbus address %d", s.ComPort, s.Baud, s.Address)
|
||||||
|
a.psu = psu.New(psu.Config{ComPort: s.ComPort, Baud: s.Baud, Address: byte(s.Address)})
|
||||||
|
_ = a.psu.Start()
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetPSUStatus returns the supply's last polled state for the UI.
|
||||||
|
func (a *App) GetPSUStatus() psu.Status {
|
||||||
|
if a.psu == nil {
|
||||||
|
return psu.Status{}
|
||||||
|
}
|
||||||
|
return a.psu.GetStatus()
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetPSUOutput switches the supply's output. The only write OpsLog makes to it.
|
||||||
|
func (a *App) SetPSUOutput(on bool) error {
|
||||||
|
if a.psu == nil {
|
||||||
|
return fmt.Errorf("the power supply is not enabled in Settings")
|
||||||
|
}
|
||||||
|
return a.psu.SetOutput(on)
|
||||||
|
}
|
||||||
+25
-2
@@ -45,9 +45,20 @@ const appQSLCardSentField = "APP_OPSLOG_QSL_SENT"
|
|||||||
// (please send one). Independent of ADIF qsl_rcvd, like the sent field.
|
// (please send one). Independent of ADIF qsl_rcvd, like the sent field.
|
||||||
const appQSLCardRcvdField = "APP_OPSLOG_QSL_RCVD"
|
const appQSLCardRcvdField = "APP_OPSLOG_QSL_RCVD"
|
||||||
|
|
||||||
|
// qslCredit closes the default QSL e-mail: who made the card, and where the
|
||||||
|
// recipient can get the same program.
|
||||||
|
//
|
||||||
|
// A DEFAULT, not a signature. It lives in the body template like every other
|
||||||
|
// line, so an operator who does not want it deletes it once and it is gone —
|
||||||
|
// and one who has already written their own body never sees it appear, because
|
||||||
|
// a stored template is returned verbatim and the default is only the fallback.
|
||||||
|
// Appending it at send time instead would have made it unremovable, which is
|
||||||
|
// not a thing to do to someone's outgoing mail.
|
||||||
|
const qslCredit = "--\nDesigned & sent by OpsLog — " + releasesPageURL
|
||||||
|
|
||||||
const (
|
const (
|
||||||
defaultQSLEmailSubject = "eQSL — {CALL} de {MYCALL}"
|
defaultQSLEmailSubject = "eQSL — {CALL} de {MYCALL}"
|
||||||
defaultQSLEmailBody = "Hi,\n\nThank you for our QSO! Please find attached your eQSL card.\n\n{DATE} · {BAND} · {MODE}\n\n73,\n{MYCALL}"
|
defaultQSLEmailBody = "Hi,\n\nThank you for our QSO! Please find attached your eQSL card.\n\n{DATE} · {BAND} · {MODE}\n\n73,\n{MYCALL}\n\n" + qslCredit
|
||||||
)
|
)
|
||||||
|
|
||||||
// qslDir is the root of all designer artifacts: templates/<id>/ and outbox/.
|
// qslDir is the root of all designer artifacts: templates/<id>/ and outbox/.
|
||||||
@@ -705,7 +716,10 @@ func (a *App) qslVars(q qso.QSO) (map[string]string, qslcard.CountryInfo, error)
|
|||||||
}
|
}
|
||||||
vars["qso.my_rig"], vars["qso.my_antenna"] = a.qslRigAntenna(q)
|
vars["qso.my_rig"], vars["qso.my_antenna"] = a.qslRigAntenna(q)
|
||||||
if q.FreqHz != nil {
|
if q.FreqHz != nil {
|
||||||
vars["qso.freq"] = strconv.FormatFloat(float64(*q.FreqHz)/1e6, 'f', 3, 64) + " MHz"
|
// Megahertz, without the unit. The column is labelled FREQ and the box is
|
||||||
|
// narrow — "10.136 MHz" ran into the MODE column beside it, and a card that
|
||||||
|
// says FREQ 10.136 has never confused anybody.
|
||||||
|
vars["qso.freq"] = strconv.FormatFloat(float64(*q.FreqHz)/1e6, 'f', 3, 64)
|
||||||
}
|
}
|
||||||
return vars, a.qslCountryInfo(), nil
|
return vars, a.qslCountryInfo(), nil
|
||||||
}
|
}
|
||||||
@@ -738,12 +752,21 @@ func (a *App) qslCountryInfo() qslcard.CountryInfo {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// sampleQSO is the canned contact used by the editor's live preview.
|
// sampleQSO is the canned contact used by the editor's live preview.
|
||||||
|
//
|
||||||
|
// Every field the QSO box can show must be FILLED here, and filled with a value
|
||||||
|
// of realistic width. The preview is the only place an operator can see whether
|
||||||
|
// a column fits before printing a card — a blank one silently promises room it
|
||||||
|
// will not have. The frequency is the widest of them, hence a real 20 m SSB one
|
||||||
|
// rather than a round number.
|
||||||
func sampleQSO() qso.QSO {
|
func sampleQSO() qso.QSO {
|
||||||
|
hz := int64(14285000)
|
||||||
return qso.QSO{
|
return qso.QSO{
|
||||||
Callsign: "DL1ABC",
|
Callsign: "DL1ABC",
|
||||||
QSODate: time.Date(2026, 5, 17, 14, 2, 0, 0, time.UTC),
|
QSODate: time.Date(2026, 5, 17, 14, 2, 0, 0, time.UTC),
|
||||||
Band: "20m",
|
Band: "20m",
|
||||||
Mode: "SSB",
|
Mode: "SSB",
|
||||||
|
Submode: "USB",
|
||||||
|
FreqHz: &hz,
|
||||||
RSTSent: "59",
|
RSTSent: "59",
|
||||||
QSLMsg: "TNX FB QSO — 73!",
|
QSLMsg: "TNX FB QSO — 73!",
|
||||||
}
|
}
|
||||||
|
|||||||
+83
-2
@@ -49,8 +49,18 @@ type RowColorSettings struct {
|
|||||||
// Configured distinguishes "saved with this off" from "saved before the
|
// Configured distinguishes "saved with this off" from "saved before the
|
||||||
// option existed", so a new marker can default ON without silently turning
|
// option existed", so a new marker can default ON without silently turning
|
||||||
// itself back on for an operator who switched it off.
|
// itself back on for an operator who switched it off.
|
||||||
Configured bool `json:"configured"`
|
// RecentZebra decides whether the Recent QSOs grid alternates its row
|
||||||
Rules []RowColorRule `json:"rules"`
|
// background. "" (or "on") keeps the banding, which is what the grid has
|
||||||
|
// always done; "off" makes every row the same colour.
|
||||||
|
//
|
||||||
|
// A string with an empty default rather than a bool: a bool would have to
|
||||||
|
// mean "true when absent", and every reader would have to remember that.
|
||||||
|
RecentZebra string `json:"recent_zebra,omitempty"`
|
||||||
|
// RecentZebraColor is the alternate row's colour. Empty follows the theme,
|
||||||
|
// which is the only answer that stays right across all four of them.
|
||||||
|
RecentZebraColor string `json:"recent_zebra_color,omitempty"`
|
||||||
|
Configured bool `json:"configured"`
|
||||||
|
Rules []RowColorRule `json:"rules"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// The rule ids, in priority order. The frontend matches on these and holds the
|
// The rule ids, in priority order. The frontend matches on these and holds the
|
||||||
@@ -94,6 +104,13 @@ func normRowColors(s RowColorSettings) RowColorSettings {
|
|||||||
out := RowColorSettings{
|
out := RowColorSettings{
|
||||||
Enabled: s.Enabled, Style: s.Style, Intensity: s.Intensity,
|
Enabled: s.Enabled, Style: s.Style, Intensity: s.Intensity,
|
||||||
BandMapLotw: s.BandMapLotw, Configured: true,
|
BandMapLotw: s.BandMapLotw, Configured: true,
|
||||||
|
RecentZebra: strings.ToLower(strings.TrimSpace(s.RecentZebra)),
|
||||||
|
}
|
||||||
|
if out.RecentZebra != "off" {
|
||||||
|
out.RecentZebra = "" // anything unrecognised means the default banding
|
||||||
|
}
|
||||||
|
if c := strings.TrimSpace(s.RecentZebraColor); hexColor.MatchString(c) {
|
||||||
|
out.RecentZebraColor = c
|
||||||
}
|
}
|
||||||
if !s.Configured {
|
if !s.Configured {
|
||||||
out.BandMapLotw = true // new option, on unless the operator says otherwise
|
out.BandMapLotw = true // new option, on unless the operator says otherwise
|
||||||
@@ -138,6 +155,70 @@ func normRowColors(s RowColorSettings) RowColorSettings {
|
|||||||
return out
|
return out
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// MatrixColors recolours the band/mode matrix — the PH/CW/DIG grid in the Stats
|
||||||
|
// panel, whose five fills and current-entry ring are the fastest read in the
|
||||||
|
// whole app and the one an operator is most likely to want in their own colours.
|
||||||
|
//
|
||||||
|
// Every colour is OPTIONAL and an empty one keeps whatever the active theme
|
||||||
|
// paints. That is why this stores OVERRIDES rather than a palette: each of the
|
||||||
|
// twelve themes ships a matrix ramp tuned to its own background, and an operator
|
||||||
|
// who only wants a different green must not thereby freeze the other four to the
|
||||||
|
// theme they happened to be using the day they picked it.
|
||||||
|
type MatrixColors struct {
|
||||||
|
// Enabled off leaves the theme's own ramp untouched, so switching it off is a
|
||||||
|
// genuine revert and not "some other set of colours".
|
||||||
|
Enabled bool `json:"enabled"`
|
||||||
|
CallConfirmed string `json:"call_confirmed"`
|
||||||
|
CallWorked string `json:"call_worked"`
|
||||||
|
EntityConfirmed string `json:"entity_confirmed"`
|
||||||
|
EntityWorked string `json:"entity_worked"`
|
||||||
|
NotWorked string `json:"not_worked"`
|
||||||
|
CurrentEntry string `json:"current_entry"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// normMatrixColors keeps only plain hex values. Anything else becomes "" — i.e.
|
||||||
|
// "use the theme's" — because these are written straight into a CSS custom
|
||||||
|
// property, and the same rule as hexColor's own comment applies: what cannot be
|
||||||
|
// trusted into a stylesheet is refused rather than passed through.
|
||||||
|
func normMatrixColors(c MatrixColors) MatrixColors {
|
||||||
|
clean := func(s string) string {
|
||||||
|
s = strings.TrimSpace(s)
|
||||||
|
if hexColor.MatchString(s) {
|
||||||
|
return strings.ToLower(s)
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
return MatrixColors{
|
||||||
|
Enabled: c.Enabled,
|
||||||
|
CallConfirmed: clean(c.CallConfirmed),
|
||||||
|
CallWorked: clean(c.CallWorked),
|
||||||
|
EntityConfirmed: clean(c.EntityConfirmed),
|
||||||
|
EntityWorked: clean(c.EntityWorked),
|
||||||
|
NotWorked: clean(c.NotWorked),
|
||||||
|
CurrentEntry: clean(c.CurrentEntry),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetMatrixColors returns the operator's matrix palette overrides. All-empty
|
||||||
|
// (the default) means "whatever the theme says".
|
||||||
|
func (a *App) GetMatrixColors() MatrixColors {
|
||||||
|
var c MatrixColors
|
||||||
|
if raw := a.settingOr(keyMatrixColors, ""); raw != "" {
|
||||||
|
_ = json.Unmarshal([]byte(raw), &c)
|
||||||
|
}
|
||||||
|
return normMatrixColors(c)
|
||||||
|
}
|
||||||
|
|
||||||
|
// SaveMatrixColors persists them.
|
||||||
|
func (a *App) SaveMatrixColors(c MatrixColors) error {
|
||||||
|
b, err := json.Marshal(normMatrixColors(c))
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
a.setSetting(keyMatrixColors, string(b))
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
// GetRowColors returns the row-colouring configuration, defaults included so the
|
// GetRowColors returns the row-colouring configuration, defaults included so the
|
||||||
// panel never has to invent one.
|
// panel never has to invent one.
|
||||||
func (a *App) GetRowColors() RowColorSettings {
|
func (a *App) GetRowColors() RowColorSettings {
|
||||||
|
|||||||
@@ -6,7 +6,9 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
"sync"
|
||||||
"syscall"
|
"syscall"
|
||||||
|
|
||||||
"hamlog/internal/applog"
|
"hamlog/internal/applog"
|
||||||
@@ -26,6 +28,12 @@ type AutostartProgram struct {
|
|||||||
Path string `json:"path"`
|
Path string `json:"path"`
|
||||||
Args string `json:"args"`
|
Args string `json:"args"`
|
||||||
Enabled bool `json:"enabled"`
|
Enabled bool `json:"enabled"`
|
||||||
|
// CloseOnExit asks for this program to be closed when OpsLog closes.
|
||||||
|
//
|
||||||
|
// Per program and not one switch for the list, because the answer differs
|
||||||
|
// inside one station: an operator wants WSJT-X gone with the logger and the
|
||||||
|
// rotator controller left running.
|
||||||
|
CloseOnExit bool `json:"close_on_exit,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// AutostartLaunchResult reports what happened for one program when launching.
|
// AutostartLaunchResult reports what happened for one program when launching.
|
||||||
@@ -106,6 +114,52 @@ func (a *App) LaunchAutostartProgram(id string) (AutostartLaunchResult, error) {
|
|||||||
return AutostartLaunchResult{}, fmt.Errorf("program %q not found", id)
|
return AutostartLaunchResult{}, fmt.Errorf("program %q not found", id)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// launched remembers the process id of every program OPSLOG started, keyed by
|
||||||
|
// program id.
|
||||||
|
//
|
||||||
|
// Only what we started is ever closed. A copy of WSJT-X the operator opened
|
||||||
|
// themselves — before OpsLog, for something else entirely — is theirs, and
|
||||||
|
// closing it because a logger happened to quit would be taking a decision that
|
||||||
|
// was never asked for. That is also why "already running" stores nothing.
|
||||||
|
var launched = struct {
|
||||||
|
sync.Mutex
|
||||||
|
pid map[string]int
|
||||||
|
}{pid: map[string]int{}}
|
||||||
|
|
||||||
|
// CloseAutostartPrograms closes the programs marked "close with OpsLog" — the
|
||||||
|
// ones OpsLog itself launched this session.
|
||||||
|
//
|
||||||
|
// A polite close, never a kill: taskkill without /F posts WM_CLOSE, so WSJT-X
|
||||||
|
// writes its settings and its log the way it would if the operator had clicked
|
||||||
|
// the cross. Forcing it would lose exactly the state an operator cares about,
|
||||||
|
// and a program that ignores a close request is entitled to.
|
||||||
|
func (a *App) CloseAutostartPrograms() {
|
||||||
|
progs, _ := a.GetAutostartPrograms()
|
||||||
|
for _, p := range progs {
|
||||||
|
if !p.CloseOnExit {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
launched.Lock()
|
||||||
|
pid, ok := launched.pid[p.ID]
|
||||||
|
delete(launched.pid, p.ID)
|
||||||
|
launched.Unlock()
|
||||||
|
if !ok || pid <= 0 {
|
||||||
|
continue // not started by us this session — not ours to close
|
||||||
|
}
|
||||||
|
name := strings.TrimSpace(p.Name)
|
||||||
|
if name == "" {
|
||||||
|
name = filepath.Base(p.Path)
|
||||||
|
}
|
||||||
|
cmd := exec.Command("taskkill", "/PID", strconv.Itoa(pid))
|
||||||
|
cmd.SysProcAttr = &syscall.SysProcAttr{HideWindow: true, CreationFlags: 0x08000000}
|
||||||
|
if out, err := cmd.CombinedOutput(); err != nil {
|
||||||
|
applog.Printf("autostart: could not close %s (pid %d): %v — %s", name, pid, err, strings.TrimSpace(string(out)))
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
applog.Printf("autostart: asked %s (pid %d) to close", name, pid)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// launchProgram starts one program unless its executable is already running.
|
// launchProgram starts one program unless its executable is already running.
|
||||||
func launchProgram(p AutostartProgram, running map[string]bool) AutostartLaunchResult {
|
func launchProgram(p AutostartProgram, running map[string]bool) AutostartLaunchResult {
|
||||||
res := AutostartLaunchResult{ID: p.ID, Name: p.Name}
|
res := AutostartLaunchResult{ID: p.ID, Name: p.Name}
|
||||||
@@ -131,6 +185,13 @@ func launchProgram(p AutostartProgram, running map[string]bool) AutostartLaunchR
|
|||||||
res.Status, res.Message = "error", err.Error()
|
res.Status, res.Message = "error", err.Error()
|
||||||
return res
|
return res
|
||||||
}
|
}
|
||||||
|
// Remembered so it can be closed again on exit, if asked. Recorded BEFORE
|
||||||
|
// the wait goroutine, which releases the handle.
|
||||||
|
if cmd.Process != nil {
|
||||||
|
launched.Lock()
|
||||||
|
launched.pid[p.ID] = cmd.Process.Pid
|
||||||
|
launched.Unlock()
|
||||||
|
}
|
||||||
// Don't wait on the child — it runs independently of OpsLog. Release the
|
// Don't wait on the child — it runs independently of OpsLog. Release the
|
||||||
// handle so we don't accumulate zombies.
|
// handle so we don't accumulate zombies.
|
||||||
go func() { _ = cmd.Wait() }()
|
go func() { _ = cmd.Wait() }()
|
||||||
|
|||||||
+235
@@ -0,0 +1,235 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
// "Have I worked this reference before?" — the NEW badge on a QSO's award
|
||||||
|
// references.
|
||||||
|
//
|
||||||
|
// # Where the answer comes from, and where it must NOT come from
|
||||||
|
//
|
||||||
|
// The obvious source is the materialised award_refs column: it is already on
|
||||||
|
// every row and one query reads it. It is also the wrong answer twice over.
|
||||||
|
// That column holds DISPLAY LABELS, not references — depending on the award's
|
||||||
|
// RefDisplay it can read "Krasnogvardeysky" or "ST-25 — Krasnogvardeysky", and
|
||||||
|
// DXCC stores a country name — and it is a derived cache that lags: a QSO whose
|
||||||
|
// references were back-filled (see BackfillRDA) counts on the Awards grid long
|
||||||
|
// before anything recomputes its column. The first build of this badge used it
|
||||||
|
// and marked a district worked on five bands as NEW.
|
||||||
|
//
|
||||||
|
// So the answer comes from the same place the Awards grid's answer comes from:
|
||||||
|
// award.MatchQSO over the logbook. What is engineered here is the COST of that,
|
||||||
|
// because the question is asked while the operator is logging:
|
||||||
|
//
|
||||||
|
// - the set is per award CODE, and built only for codes actually asked about;
|
||||||
|
// - it reuses the award snapshot when one is already in memory, which it
|
||||||
|
// usually is (the Awards tab, the cluster status index);
|
||||||
|
// - otherwise it STREAMS the logbook rather than materialising a second copy
|
||||||
|
// of it — the references of one award are a few thousand short strings;
|
||||||
|
// - and it is built in the BACKGROUND. A caller that asks before the set is
|
||||||
|
// ready is told so and gets no badge, never a wait and never a wrong badge.
|
||||||
|
//
|
||||||
|
// A freshly logged QSO's references are folded into the sets, so a normal
|
||||||
|
// evening of logging never rebuilds anything.
|
||||||
|
|
||||||
|
import (
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"hamlog/internal/award"
|
||||||
|
"hamlog/internal/qso"
|
||||||
|
)
|
||||||
|
|
||||||
|
// workedRefIndex is the per-code set of references already in the log, plus the
|
||||||
|
// logbook revision it describes.
|
||||||
|
type workedRefIndex struct {
|
||||||
|
rev string
|
||||||
|
byCode map[string]map[string]struct{}
|
||||||
|
building map[string]bool
|
||||||
|
}
|
||||||
|
|
||||||
|
// AwardRefNewResult answers one badge request.
|
||||||
|
type AwardRefNewResult struct {
|
||||||
|
// New maps "CODE@REF" to "never worked". An entry whose award set is still
|
||||||
|
// building is ABSENT rather than false: "not worked" and "not known yet"
|
||||||
|
// must not look the same to the badge.
|
||||||
|
New map[string]bool `json:"new"`
|
||||||
|
// Pending is true when at least one award set is still being built, and the
|
||||||
|
// caller should ask again shortly.
|
||||||
|
Pending bool `json:"pending"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// AwardRefsNew reports which of the given "CODE@REF" entries have never been
|
||||||
|
// worked. Returns immediately, always.
|
||||||
|
func (a *App) AwardRefsNew(entries []string) AwardRefNewResult {
|
||||||
|
res := AwardRefNewResult{New: map[string]bool{}}
|
||||||
|
if a.qso == nil || len(entries) == 0 {
|
||||||
|
return res
|
||||||
|
}
|
||||||
|
rev, err := a.qso.Revision(a.ctx)
|
||||||
|
if err != nil {
|
||||||
|
return res // logbook unreachable: no badge is the honest answer
|
||||||
|
}
|
||||||
|
|
||||||
|
// Group the request by award code, so one code is looked up once however
|
||||||
|
// many of its references are on the QSO.
|
||||||
|
want := map[string][]string{}
|
||||||
|
for _, e := range entries {
|
||||||
|
code, _, ok := splitRefEntry(e)
|
||||||
|
if !ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
want[code] = append(want[code], e)
|
||||||
|
}
|
||||||
|
|
||||||
|
a.workedRefMu.Lock()
|
||||||
|
if a.workedRef.rev != rev || a.workedRef.byCode == nil {
|
||||||
|
// The logbook moved on: every set describes a log that no longer exists.
|
||||||
|
a.workedRef = workedRefIndex{rev: rev, byCode: map[string]map[string]struct{}{}, building: map[string]bool{}}
|
||||||
|
}
|
||||||
|
var build []string
|
||||||
|
for code := range want {
|
||||||
|
set, ready := a.workedRef.byCode[code]
|
||||||
|
if !ready {
|
||||||
|
if !a.workedRef.building[code] {
|
||||||
|
a.workedRef.building[code] = true
|
||||||
|
build = append(build, code)
|
||||||
|
}
|
||||||
|
res.Pending = true
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
for _, e := range want[code] {
|
||||||
|
_, ref, _ := splitRefEntry(e)
|
||||||
|
_, worked := set[ref]
|
||||||
|
res.New[e] = !worked
|
||||||
|
}
|
||||||
|
}
|
||||||
|
a.workedRefMu.Unlock()
|
||||||
|
|
||||||
|
for _, code := range build {
|
||||||
|
go a.buildWorkedRefs(code, rev)
|
||||||
|
}
|
||||||
|
return res
|
||||||
|
}
|
||||||
|
|
||||||
|
// splitRefEntry splits "RDA@ST-25" into its uppercased code and reference.
|
||||||
|
func splitRefEntry(e string) (code, ref string, ok bool) {
|
||||||
|
at := strings.Index(e, "@")
|
||||||
|
if at <= 0 {
|
||||||
|
return "", "", false
|
||||||
|
}
|
||||||
|
code = strings.ToUpper(strings.TrimSpace(e[:at]))
|
||||||
|
ref = strings.ToUpper(strings.TrimSpace(e[at+1:]))
|
||||||
|
return code, ref, code != "" && ref != ""
|
||||||
|
}
|
||||||
|
|
||||||
|
// buildWorkedRefs collects every reference of one award already in the log.
|
||||||
|
func (a *App) buildWorkedRefs(code string, rev string) {
|
||||||
|
set := map[string]struct{}{}
|
||||||
|
defer func() {
|
||||||
|
a.workedRefMu.Lock()
|
||||||
|
// Publish only against the revision we were asked for: a QSO logged while
|
||||||
|
// this ran has already reset the index, and a set built from the older log
|
||||||
|
// would claim to describe the newer one.
|
||||||
|
if a.workedRef.rev == rev && a.workedRef.byCode != nil {
|
||||||
|
a.workedRef.byCode[code] = set
|
||||||
|
}
|
||||||
|
delete(a.workedRef.building, code)
|
||||||
|
a.workedRefMu.Unlock()
|
||||||
|
}()
|
||||||
|
|
||||||
|
var def *award.Def
|
||||||
|
for _, d := range a.awardDefs() {
|
||||||
|
if strings.EqualFold(d.Code, code) {
|
||||||
|
dd := d
|
||||||
|
def = &dd
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if def == nil {
|
||||||
|
return // unknown award: an empty set, so nothing is ever badged NEW
|
||||||
|
}
|
||||||
|
metas := a.awardRefMetas([]award.Def{*def})[strings.ToUpper(def.Code)]
|
||||||
|
collect := func(q *qso.QSO) {
|
||||||
|
for _, r := range award.MatchQSO(*def, metas, q) {
|
||||||
|
set[strings.ToUpper(strings.TrimSpace(r))] = struct{}{}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The snapshot is already enriched and already in memory whenever the Awards
|
||||||
|
// tab has been open — by far the common case, and free.
|
||||||
|
if snap := a.awardSnapshotIfLoaded(); snap != nil {
|
||||||
|
for i := range snap {
|
||||||
|
collect(&snap[i])
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// Otherwise stream. One pass, nothing retained but the reference strings.
|
||||||
|
_ = a.qso.IterateForAwards(a.ctx, func(q qso.QSO) error {
|
||||||
|
a.enrichQSOForAwards(&q)
|
||||||
|
collect(&q)
|
||||||
|
return nil
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// awardSnapshotIfLoaded returns the award snapshot ONLY if one is already built
|
||||||
|
// and current. Never builds one: the caller is a background convenience, and
|
||||||
|
// reading the whole logbook for it is the cost this file exists to avoid.
|
||||||
|
func (a *App) awardSnapshotIfLoaded() []qso.QSO {
|
||||||
|
rev, err := a.qso.Revision(a.ctx)
|
||||||
|
if err != nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
a.awardSnapMu.Lock()
|
||||||
|
defer a.awardSnapMu.Unlock()
|
||||||
|
if a.awardSnap != nil && a.awardSnapRev == rev {
|
||||||
|
return a.awardSnap
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// noteWorkedQSO folds a just-logged contact's references into the built sets, so
|
||||||
|
// logging does not throw away work already done.
|
||||||
|
func (a *App) noteWorkedQSO(q qso.QSO) {
|
||||||
|
a.workedRefMu.Lock()
|
||||||
|
codes := make(map[string]bool, len(a.workedRef.byCode))
|
||||||
|
for c := range a.workedRef.byCode {
|
||||||
|
codes[c] = true
|
||||||
|
}
|
||||||
|
a.workedRefMu.Unlock()
|
||||||
|
if len(codes) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
rev, err := a.qso.Revision(a.ctx)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
a.enrichQSOForAwards(&q)
|
||||||
|
found := map[string][]string{}
|
||||||
|
for _, d := range a.awardDefs() {
|
||||||
|
code := strings.ToUpper(d.Code)
|
||||||
|
if !codes[code] {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
metas := a.awardRefMetas([]award.Def{d})[code]
|
||||||
|
for _, r := range award.MatchQSO(d, metas, &q) {
|
||||||
|
found[code] = append(found[code], strings.ToUpper(strings.TrimSpace(r)))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
a.workedRefMu.Lock()
|
||||||
|
defer a.workedRefMu.Unlock()
|
||||||
|
// Carry the sets forward to the new revision rather than dropping them: they
|
||||||
|
// were correct one contact ago, and that contact is what is being added.
|
||||||
|
a.workedRef.rev = rev
|
||||||
|
for code, refs := range found {
|
||||||
|
if set := a.workedRef.byCode[code]; set != nil {
|
||||||
|
for _, r := range refs {
|
||||||
|
set[r] = struct{}{}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// invalidateWorkedRefs drops every set. For the changes a revision cannot see —
|
||||||
|
// award definitions edited, reference lists updated, QSLs confirmed.
|
||||||
|
func (a *App) invalidateWorkedRefs() {
|
||||||
|
a.workedRefMu.Lock()
|
||||||
|
a.workedRef = workedRefIndex{}
|
||||||
|
a.workedRefMu.Unlock()
|
||||||
|
}
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
func TestSplitRefEntry(t *testing.T) {
|
||||||
|
code, ref, ok := splitRefEntry("rda@st-25")
|
||||||
|
if !ok || code != "RDA" || ref != "ST-25" {
|
||||||
|
t.Fatalf("got %q %q %v", code, ref, ok)
|
||||||
|
}
|
||||||
|
// The picker writes what the operator typed, spacing included.
|
||||||
|
if _, ref, _ = splitRefEntry("POTA@ fr-1234 "); ref != "FR-1234" {
|
||||||
|
t.Fatalf("not trimmed: %q", ref)
|
||||||
|
}
|
||||||
|
// A reference can contain the separator characters of a label; only the
|
||||||
|
// FIRST @ splits, so "IOTA@EU-064" survives and a stray one does not create
|
||||||
|
// an award out of nothing.
|
||||||
|
for _, bad := range []string{"", "RDA", "@ST-25", "RDA@", "RDA@ "} {
|
||||||
|
if _, _, ok := splitRefEntry(bad); ok {
|
||||||
|
t.Fatalf("%q accepted", bad)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,65 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"hamlog/internal/award"
|
||||||
|
)
|
||||||
|
|
||||||
|
// relabelOnly decides whether a save can take the cheap path. A wrong "yes"
|
||||||
|
// leaves stale references in the log, so every case that is not purely a
|
||||||
|
// display change must fall through to the full recompute.
|
||||||
|
func TestRelabelOnly(t *testing.T) {
|
||||||
|
base := []award.Def{
|
||||||
|
{Code: "DDFM", Field: "note", RefDisplay: "ref", Valid: true},
|
||||||
|
{Code: "IOTA", Field: "iota", RefDisplay: "", Valid: true},
|
||||||
|
}
|
||||||
|
cp := func() []award.Def { out := make([]award.Def, len(base)); copy(out, base); return out }
|
||||||
|
|
||||||
|
// The case this exists for: one award's column switches to the description.
|
||||||
|
next := cp()
|
||||||
|
next[0].RefDisplay = "name"
|
||||||
|
codes, ok := relabelOnly(base, next)
|
||||||
|
if !ok || len(codes) != 1 || codes[0] != "DDFM" {
|
||||||
|
t.Errorf("display-only change = (%v, %v), want ([DDFM], true)", codes, ok)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Two at once is still a relabel.
|
||||||
|
next = cp()
|
||||||
|
next[0].RefDisplay = "both"
|
||||||
|
next[1].RefDisplay = "name"
|
||||||
|
if codes, ok := relabelOnly(base, next); !ok || len(codes) != 2 {
|
||||||
|
t.Errorf("two display changes = (%v, %v), want two codes", codes, ok)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Nothing changed: no relabel to do, and no full recompute claimed either.
|
||||||
|
if codes, ok := relabelOnly(base, cp()); ok || codes != nil {
|
||||||
|
t.Errorf("identical definitions must not report a relabel, got (%v, %v)", codes, ok)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Anything that can change WHICH QSOs match must fail the test.
|
||||||
|
for name, mutate := range map[string]func([]award.Def){
|
||||||
|
"field": func(d []award.Def) { d[0].Field = "comment" },
|
||||||
|
"pattern": func(d []award.Def) { d[0].Pattern = `\d{2}` },
|
||||||
|
"exact": func(d []award.Def) { d[0].ExactMatch = true },
|
||||||
|
"validity": func(d []award.Def) { d[0].ValidFrom = "2020-01-01" },
|
||||||
|
"dxcc": func(d []award.Def) { d[0].DXCCFilter = []int{227} },
|
||||||
|
"disabled": func(d []award.Def) { d[0].Valid = false },
|
||||||
|
"or rule": func(d []award.Def) { d[0].OrRules = []award.OrRule{{Field: "qth"}} },
|
||||||
|
"with disp": func(d []award.Def) { d[0].RefDisplay = "name"; d[0].Field = "comment" },
|
||||||
|
} {
|
||||||
|
n := cp()
|
||||||
|
mutate(n)
|
||||||
|
if _, ok := relabelOnly(base, n); ok {
|
||||||
|
t.Errorf("%s: took the relabel path — stale references would stay in the log", name)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// An award added or removed changes the set, never a relabel.
|
||||||
|
if _, ok := relabelOnly(base, append(cp(), award.Def{Code: "WWFF"})); ok {
|
||||||
|
t.Errorf("an added award must force a full recompute")
|
||||||
|
}
|
||||||
|
if _, ok := relabelOnly(base, cp()[:1]); ok {
|
||||||
|
t.Errorf("a removed award must force a full recompute")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,84 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"sync"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// The award snapshot must be built ONCE however many callers ask at once.
|
||||||
|
//
|
||||||
|
// The cache lock is released before the logbook is read, so every caller that
|
||||||
|
// arrives during a build used to miss the cache and start its own. Opening the
|
||||||
|
// Awards panel does exactly that: a field log showed three pulls of the same
|
||||||
|
// 123 615 QSOs inside ten seconds, and three copies alive together took the Go
|
||||||
|
// heap from 725 MB to 2.5 GB.
|
||||||
|
//
|
||||||
|
// This models the same shape — a cheap cache check, a slow build, a shared
|
||||||
|
// result — against the pattern awardSnapshot now uses, so the invariant is
|
||||||
|
// pinned without needing a logbook.
|
||||||
|
func TestSnapshotBuildsOncePerRevision(t *testing.T) {
|
||||||
|
var (
|
||||||
|
cacheMu sync.Mutex
|
||||||
|
buildMu sync.Mutex
|
||||||
|
cached []int
|
||||||
|
rev = "r1"
|
||||||
|
gotRev string
|
||||||
|
builds int
|
||||||
|
)
|
||||||
|
|
||||||
|
get := func() []int {
|
||||||
|
cacheMu.Lock()
|
||||||
|
if cached != nil && gotRev == rev {
|
||||||
|
defer cacheMu.Unlock()
|
||||||
|
return cached
|
||||||
|
}
|
||||||
|
cacheMu.Unlock()
|
||||||
|
|
||||||
|
buildMu.Lock()
|
||||||
|
defer buildMu.Unlock()
|
||||||
|
// Re-check: whoever held the build lock has just finished.
|
||||||
|
cacheMu.Lock()
|
||||||
|
if cached != nil && gotRev == rev {
|
||||||
|
defer cacheMu.Unlock()
|
||||||
|
return cached
|
||||||
|
}
|
||||||
|
cacheMu.Unlock()
|
||||||
|
|
||||||
|
time.Sleep(50 * time.Millisecond) // the logbook read
|
||||||
|
out := []int{1, 2, 3}
|
||||||
|
|
||||||
|
cacheMu.Lock()
|
||||||
|
builds++
|
||||||
|
cached, gotRev = out, rev
|
||||||
|
cacheMu.Unlock()
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
var wg sync.WaitGroup
|
||||||
|
results := make([][]int, 8)
|
||||||
|
for i := range results {
|
||||||
|
wg.Add(1)
|
||||||
|
go func(i int) { defer wg.Done(); results[i] = get() }(i)
|
||||||
|
}
|
||||||
|
wg.Wait()
|
||||||
|
|
||||||
|
if builds != 1 {
|
||||||
|
t.Errorf("%d builds for one revision — each concurrent caller pulled the whole logbook again", builds)
|
||||||
|
}
|
||||||
|
for i, r := range results {
|
||||||
|
if len(r) != 3 {
|
||||||
|
t.Errorf("caller %d got %v", i, r)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A new revision must rebuild: the guard is against duplicate work, not
|
||||||
|
// against a logbook that changed.
|
||||||
|
cacheMu.Lock()
|
||||||
|
rev = "r2"
|
||||||
|
cacheMu.Unlock()
|
||||||
|
get()
|
||||||
|
if builds != 2 {
|
||||||
|
t.Errorf("builds = %d after the revision moved, want 2 — a changed logbook must be re-read", builds)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
// A band change now has two sources: the rig, and the entry strip on a station
|
||||||
|
// whose rig OpsLog does not control. They share one memory of the last band, so
|
||||||
|
// a station that has both commands its antenna switch once per QSY rather than
|
||||||
|
// twice — the entry selector pushes a QSY, the rig reports the same band back,
|
||||||
|
// and only the first of the two is a change.
|
||||||
|
func TestBandChangeIsNotedOncePerBand(t *testing.T) {
|
||||||
|
lastTriggerBandMu.Lock()
|
||||||
|
lastTriggerBand = ""
|
||||||
|
lastTriggerBandMu.Unlock()
|
||||||
|
|
||||||
|
if b, changed := noteBandChange("20m"); !changed || b != "20m" {
|
||||||
|
t.Fatalf("first 20m = (%q,%v), want (\"20m\",true)", b, changed)
|
||||||
|
}
|
||||||
|
// The same band from the other source — the rig echoing the QSY back.
|
||||||
|
if _, changed := noteBandChange("20M"); changed {
|
||||||
|
t.Error("the rig echoing the band back counted as a second change — the switch would be commanded twice")
|
||||||
|
}
|
||||||
|
if _, changed := noteBandChange(" 20m "); changed {
|
||||||
|
t.Error("whitespace made the same band look new")
|
||||||
|
}
|
||||||
|
if b, changed := noteBandChange("40m"); !changed || b != "40m" {
|
||||||
|
t.Errorf("40m = (%q,%v), want (\"40m\",true)", b, changed)
|
||||||
|
}
|
||||||
|
// An unknown band must not be recorded, or the next real one would look
|
||||||
|
// unchanged against it.
|
||||||
|
if _, changed := noteBandChange(""); changed {
|
||||||
|
t.Error("an empty band was treated as a change")
|
||||||
|
}
|
||||||
|
if _, changed := noteBandChange("40m"); changed {
|
||||||
|
t.Error("the empty band overwrote the last one")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"hamlog/internal/pskr"
|
||||||
|
)
|
||||||
|
|
||||||
|
// The receiver radius is what makes an opening report evidence about the
|
||||||
|
// OPERATOR's path rather than someone else's. Both ends of the range destroy
|
||||||
|
// that: too small and no receiver is ever near enough, too large and the
|
||||||
|
// reports are about a different part of the world. A stored value that would do
|
||||||
|
// either has to fall back rather than be honoured.
|
||||||
|
func TestBandOpenNearKmClamps(t *testing.T) {
|
||||||
|
for _, tc := range []struct {
|
||||||
|
name string
|
||||||
|
raw string
|
||||||
|
want int
|
||||||
|
}{
|
||||||
|
{"unset falls back", "", pskr.DefaultNearKm},
|
||||||
|
{"not a number falls back", "soon", pskr.DefaultNearKm},
|
||||||
|
{"zero falls back", "0", pskr.DefaultNearKm},
|
||||||
|
{"negative falls back", "-100", pskr.DefaultNearKm},
|
||||||
|
{"absurdly tight falls back", "5", pskr.DefaultNearKm},
|
||||||
|
{"absurdly wide falls back", "5000", pskr.DefaultNearKm},
|
||||||
|
{"a real choice is kept", "100", 100},
|
||||||
|
{"the lower bound is kept", "25", 25},
|
||||||
|
{"the upper bound is kept", "1000", 1000},
|
||||||
|
{"surrounding space is ignored", " 150 ", 150},
|
||||||
|
} {
|
||||||
|
t.Run(tc.name, func(t *testing.T) {
|
||||||
|
if got := bandOpenNearKm(tc.raw); got != tc.want {
|
||||||
|
t.Errorf("bandOpenNearKm(%q) = %d, want %d", tc.raw, got, tc.want)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
+31
-1
@@ -16,6 +16,7 @@ package main
|
|||||||
// they no longer need.
|
// they no longer need.
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"hamlog/internal/applog"
|
"hamlog/internal/applog"
|
||||||
@@ -28,7 +29,8 @@ import (
|
|||||||
|
|
||||||
const (
|
const (
|
||||||
keyBandOpenEnabled = "bandopen.enabled"
|
keyBandOpenEnabled = "bandopen.enabled"
|
||||||
keyBandOpenBands = "bandopen.bands" // comma-separated; empty = the default set
|
keyBandOpenBands = "bandopen.bands" // comma-separated; empty = the default set
|
||||||
|
keyBandOpenNearKm = "bandopen.nearkm" // receiver radius; empty = pskr.DefaultNearKm
|
||||||
)
|
)
|
||||||
|
|
||||||
// rbnNodes are the two Reverse Beacon Network endpoints the watch wants: CW and
|
// rbnNodes are the two Reverse Beacon Network endpoints the watch wants: CW and
|
||||||
@@ -45,6 +47,18 @@ type BandOpenSettings struct {
|
|||||||
// Available is every band that can be watched, so the UI does not carry its
|
// Available is every band that can be watched, so the UI does not carry its
|
||||||
// own copy of a list that belongs to the detector.
|
// own copy of a list that belongs to the detector.
|
||||||
Available []string `json:"available"`
|
Available []string `json:"available"`
|
||||||
|
// NearKm is how close a RECEIVER has to be for its report to count as
|
||||||
|
// evidence about the operator's own path. An opening on these bands reaches
|
||||||
|
// an AREA, and the right radius is a judgement about how big that area is —
|
||||||
|
// a 2 m tropo duct is not a 10 m Es footprint — so it is the operator's to
|
||||||
|
// make rather than a constant.
|
||||||
|
//
|
||||||
|
// Tightening it costs nothing in traffic: the broker subscription is one
|
||||||
|
// ring of squares whatever this says, and this only decides what survives
|
||||||
|
// once the messages are here. It costs SENSITIVITY — too small a radius in a
|
||||||
|
// thinly-populated region leaves no receivers at all, and a watch with
|
||||||
|
// nothing to look at reports nothing while appearing to work.
|
||||||
|
NearKm int `json:"near_km"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a *App) GetBandOpenSettings() BandOpenSettings {
|
func (a *App) GetBandOpenSettings() BandOpenSettings {
|
||||||
@@ -52,6 +66,7 @@ func (a *App) GetBandOpenSettings() BandOpenSettings {
|
|||||||
Enabled: a.settingOr(keyBandOpenEnabled, "") == "1",
|
Enabled: a.settingOr(keyBandOpenEnabled, "") == "1",
|
||||||
Bands: splitCSV(a.settingOr(keyBandOpenBands, "")),
|
Bands: splitCSV(a.settingOr(keyBandOpenBands, "")),
|
||||||
Available: pskr.Bands,
|
Available: pskr.Bands,
|
||||||
|
NearKm: bandOpenNearKm(a.settingOr(keyBandOpenNearKm, "")),
|
||||||
}
|
}
|
||||||
// Keep only bands that are still offered. A saved selection outlives the code
|
// Keep only bands that are still offered. A saved selection outlives the code
|
||||||
// that made it: 12 m was dropped from the watched set, but every operator who
|
// that made it: 12 m was dropped from the watched set, but every operator who
|
||||||
@@ -78,9 +93,23 @@ func keepKnownBands(want []string) []string {
|
|||||||
return out
|
return out
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// bandOpenNearKm reads the stored receiver radius, falling back to the default
|
||||||
|
// for anything unset or out of range. The bounds are the two ways to make the
|
||||||
|
// watch useless: below 25 km almost nobody is ever near enough to hear anything,
|
||||||
|
// and past 1000 km the reports stop being about the operator's own path — which
|
||||||
|
// is the entire premise of measuring from a receiver rather than a transmitter.
|
||||||
|
func bandOpenNearKm(raw string) int {
|
||||||
|
n, err := strconv.Atoi(strings.TrimSpace(raw))
|
||||||
|
if err != nil || n < 25 || n > 1000 {
|
||||||
|
return pskr.DefaultNearKm
|
||||||
|
}
|
||||||
|
return n
|
||||||
|
}
|
||||||
|
|
||||||
func (a *App) SaveBandOpenSettings(s BandOpenSettings) error {
|
func (a *App) SaveBandOpenSettings(s BandOpenSettings) error {
|
||||||
a.setSetting(keyBandOpenEnabled, map[bool]string{true: "1", false: "0"}[s.Enabled])
|
a.setSetting(keyBandOpenEnabled, map[bool]string{true: "1", false: "0"}[s.Enabled])
|
||||||
a.setSetting(keyBandOpenBands, strings.Join(s.Bands, ","))
|
a.setSetting(keyBandOpenBands, strings.Join(s.Bands, ","))
|
||||||
|
a.setSetting(keyBandOpenNearKm, strconv.Itoa(bandOpenNearKm(strconv.Itoa(s.NearKm))))
|
||||||
if s.Enabled {
|
if s.Enabled {
|
||||||
a.ensureRBNNodes()
|
a.ensureRBNNodes()
|
||||||
}
|
}
|
||||||
@@ -184,6 +213,7 @@ func (a *App) startBandOpenFeed() {
|
|||||||
a.pskr = pskr.New(pskr.Config{
|
a.pskr = pskr.New(pskr.Config{
|
||||||
Bands: bands,
|
Bands: bands,
|
||||||
RxGrids: rxGrids,
|
RxGrids: rxGrids,
|
||||||
|
NearKm: s.NearKm,
|
||||||
OpLat: a.opLat, OpLon: a.opLon,
|
OpLat: a.opLat, OpLon: a.opLon,
|
||||||
Geo: func(grid string) (int, int, bool) {
|
Geo: func(grid string) (int, int, bool) {
|
||||||
lat, lon, ok := gridToLatLon(grid)
|
lat, lon, ok := gridToLatLon(grid)
|
||||||
|
|||||||
@@ -0,0 +1,73 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
// The whole point of the signature is that pressing Save in Preferences must
|
||||||
|
// not drop the rig — and with it every WSJT-X/JTDX client of the shared CAT
|
||||||
|
// server, mid-QSO, with an error box. Only a change to the LINK may reconnect.
|
||||||
|
func TestCatLinkSigIgnoresNonLinkSettings(t *testing.T) {
|
||||||
|
base := CATSettings{
|
||||||
|
Enabled: true, Backend: "flex", FlexHost: "192.168.1.20", FlexPort: 4992,
|
||||||
|
PollMs: 250, DigitalDefault: "FT8",
|
||||||
|
}
|
||||||
|
same := base
|
||||||
|
// Everything here is applied to the RUNNING manager; none of it justifies a
|
||||||
|
// reconnection, and a spot option in particular must not wipe the panadapter
|
||||||
|
// (a Flex reconnect clears every spot on it).
|
||||||
|
same.PollMs = 500
|
||||||
|
same.DelayMs = 20
|
||||||
|
same.OffsetOn = true
|
||||||
|
same.OffsetHz = 116_000_000
|
||||||
|
same.FlexDecodeSpots = !base.FlexDecodeSpots
|
||||||
|
same.FlexDecodeSecs = 300
|
||||||
|
same.FlexDVKDax = !base.FlexDVKDax
|
||||||
|
same.PTTHotkeyEnabled = true
|
||||||
|
same.PTTHotkey = "Pause"
|
||||||
|
if catLinkSig(base) != catLinkSig(same) {
|
||||||
|
t.Errorf("non-link settings changed the signature:\n%s\n%s", catLinkSig(base), catLinkSig(same))
|
||||||
|
}
|
||||||
|
|
||||||
|
// And the ones that DO describe the connection must still force a restart.
|
||||||
|
for name, mutate := range map[string]func(*CATSettings){
|
||||||
|
"backend": func(c *CATSettings) { c.Backend = "kenwood" },
|
||||||
|
"flex host": func(c *CATSettings) { c.FlexHost = "192.168.1.21" },
|
||||||
|
"flex port": func(c *CATSettings) { c.FlexPort = 4993 },
|
||||||
|
"serial port": func(c *CATSettings) { c.Backend = "yaesu"; c.YaesuPort = "COM7" },
|
||||||
|
"baud": func(c *CATSettings) { c.Backend = "yaesu"; c.YaesuBaud = 19200 },
|
||||||
|
"civ address": func(c *CATSettings) { c.Backend = "icom"; c.IcomAddr = 152 },
|
||||||
|
"disabled": func(c *CATSettings) { c.Enabled = false },
|
||||||
|
} {
|
||||||
|
c := base
|
||||||
|
mutate(&c)
|
||||||
|
if catLinkSig(c) == catLinkSig(base) {
|
||||||
|
t.Errorf("%s did not change the signature — the rig would never reconnect", name)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The share server is the thing WSJT-X actually holds a socket to: restarting
|
||||||
|
// it is what produced the error box, so it has a signature of its own.
|
||||||
|
func TestCatShareSig(t *testing.T) {
|
||||||
|
base := CATSettings{Enabled: true, ShareEnabled: true, ShareProto: "rigctl", SharePort: 4532}
|
||||||
|
other := base
|
||||||
|
other.FlexHost = "10.0.0.5" // a rig-link change must not restart the server
|
||||||
|
if catShareSig(base) != catShareSig(other) {
|
||||||
|
t.Errorf("a rig-link change restarted the share server")
|
||||||
|
}
|
||||||
|
moved := base
|
||||||
|
moved.SharePort = 4533
|
||||||
|
if catShareSig(base) == catShareSig(moved) {
|
||||||
|
t.Errorf("a new port must restart the server")
|
||||||
|
}
|
||||||
|
off := base
|
||||||
|
off.ShareEnabled = false
|
||||||
|
if catShareSig(off) != "off" || catShareSig(off) == catShareSig(base) {
|
||||||
|
t.Errorf("switching sharing off must be a change")
|
||||||
|
}
|
||||||
|
// CAT off means the server has nothing to serve, whatever the share fields say.
|
||||||
|
catOff := base
|
||||||
|
catOff.Enabled = false
|
||||||
|
if catShareSig(catOff) != "off" {
|
||||||
|
t.Errorf("share signature with CAT off = %q, want \"off\"", catShareSig(catOff))
|
||||||
|
}
|
||||||
|
}
|
||||||
+396
@@ -1,4 +1,400 @@
|
|||||||
[
|
[
|
||||||
|
{
|
||||||
|
"version": "0.26.6",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"FT decodes: the continent filter is now a multiple choice — click AF, AS, OC and SA to keep those four. It still lists only the continents actually being decoded, plus any you have selected, so a filter can never strand itself with no chip left to switch it off.",
|
||||||
|
"A QSO logged by WSJT-X, JTDX or MSHV now raises a notice in the corner naming the station. Watching the decodes, nothing else on screen said it had happened: the entry form never cleared, because nobody typed in it.",
|
||||||
|
"Icom CI-V: a reply the rig sent to another controller on the same bus is no longer mistaken for ours, and a PTT command whose acknowledgement goes missing is verified by reading the rig instead of being reported as a failure. WSJT-X and JTDX answer a failed set_ptt with a Rig Control Error and drop the link mid-over, which is what an IC-7850 was doing three times a session. The check itself waits 700 ms rather than the poll's 150: the rig has just failed to answer twice, usually because it is retuning — JTDX moves the transmit frequency and keys in the same breath — and a short probe would fail for the same reason. Both outcomes are logged, so a failure that remains can be told from a fix that did not fire.",
|
||||||
|
"FlexRadio: each spot status can now be kept off the panadapter entirely, with a switch beside its colours — and WSJT-X decode spots obey the same switches and the same colours. The palette governs the panadapter, not just one of the two things that feed it: statuses switched off still piled up on the waterfall because the decodes were pushed by another path.",
|
||||||
|
"Panadapter spot comments now read like DXHunter's: the cluster text, then the spotter, the entity and the status — \"CQ up 2 [F4BPO] [Franz Josef Land] [New Slot]\". The words were running together because SmartSDR splits its command line on spaces; non-breaking spaces get them through.",
|
||||||
|
"\"Already worked\" on a panadapter spot now means the CALLSIGN is in the log, not the entity. An entity worked on that band and mode is no news, and saying \"already worked\" of a station never contacted was wrong.",
|
||||||
|
"FT decodes: a compound MSHV message that answers two stations in one line — \"DM8BJF RR73; F4BPO <RI1FJL> +14\" — is now recognised as addressed to you when your callsign is in the second half.",
|
||||||
|
"Edit QSO: your own transmit power can be edited at last — the field was saved and written back but had no box, so a contact logged at the wrong power could never be corrected. The contacted station's extended locator gained a box for the same reason, and the power labels now say WHOSE power they are.",
|
||||||
|
"FlexRadio: a spot is no longer removed and redrawn when nothing about it has changed. A busy skimmer feed re-spots the same station every few seconds — one two-minute session sent 2128 spot adds, 88 of them for a single callsign — and the panadapter did not move a pixel for any of them.",
|
||||||
|
"Panadapter spot comments are kept within what the radio will accept: SmartSDR was cutting the longest ones mid-word, losing the entity and the status. The cluster's own words are trimmed first, the spotter, entity and status always survive. The column padding of an RBN line is collapsed to single spaces too — kept as non-breaking spaces it opened a gap wide enough to push the rest of the comment off the screen.",
|
||||||
|
"Auto-call is withdrawn — it duplicated DXHunter, which already answers decodes. Clicking a decode to answer it is unchanged.",
|
||||||
|
"The elastic bounce at the end of a list is gone, and a two-finger horizontal swipe no longer navigates the window away from the app. Both are browser behaviours that only appear on a touchpad or a touchscreen.",
|
||||||
|
"The interface zoom now says what it is doing: a badge shows the factor while it changes, clicking it returns to 100%, and View → Zoom in / Zoom out / Actual size makes it findable. Ctrl+wheel and Ctrl+0 always worked, but nothing announced them — zoom by accident and there was no way back.",
|
||||||
|
"Icom CI-V: a frequency or mode change whose acknowledgement goes missing is now verified by reading the rig back, like the PTT already was. All three are commands WSJT-X and JTDX answer with a Rig Control Error and a dropped link, and an IC-7850 log shows a set_freq doing exactly that.",
|
||||||
|
"The log file now rotates while OpsLog is running, not only at startup. It was bounded on the belief that a session writes a few kilobytes; with the CI-V wire trace left on, one wrote 416 MB and nothing would have stopped it before the disk did."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Décodes FT : le filtre par continent est maintenant multiple — clique AF, AS, OC et SA pour garder ces quatre-là. Il ne liste toujours que les continents réellement décodés, plus ceux que tu as sélectionnés, pour qu'un filtre ne puisse pas se bloquer sans pastille pour le désactiver.",
|
||||||
|
"Un QSO enregistré par WSJT-X, JTDX ou MSHV affiche maintenant une notification dans le coin, avec le nom de la station. En regardant les décodes, rien d'autre à l'écran ne le signalait : le formulaire ne se vidait pas, puisque personne n'y avait tapé.",
|
||||||
|
"Icom CI-V : une réponse que la radio adresse à un autre contrôleur du même bus n'est plus prise pour la nôtre, et un ordre de PTT dont l'accusé de réception se perd est vérifié en interrogeant la radio au lieu d'être déclaré en échec. WSJT-X et JTDX répondent à un set_ptt en échec par une erreur de contrôle radio et coupent la liaison en pleine émission — ce que faisait un IC-7850 trois fois par session. La vérification attend 700 ms et non les 150 de la scrutation : la radio vient d'échouer deux fois, en général parce qu'elle se réaccorde — JTDX décale la fréquence d'émission et passe en émission dans la foulée — et une interrogation brève échouerait pour la même raison. Les deux issues sont journalisées, pour distinguer un échec réel d'un correctif qui n'a pas agi.",
|
||||||
|
"FlexRadio : chaque statut de spot peut désormais être totalement exclu du panadapter, par un interrupteur à côté de ses couleurs — et les spots issus des décodes WSJT-X obéissent aux mêmes interrupteurs et aux mêmes couleurs. La palette régit le panadapter, pas seulement l'une des deux sources qui l'alimentent : les statuts décochés continuaient de s'entasser sur la cascade parce que les décodes passaient par un autre chemin.",
|
||||||
|
"Les commentaires des spots du panadapter se lisent maintenant comme ceux de DXHunter : le texte du cluster, puis le spotteur, l'entité et le statut — « CQ up 2 [F4BPO] [Franz Josef Land] [New Slot] ». Les mots se collaient parce que SmartSDR découpe sa ligne de commande sur les espaces ; des espaces insécables les font passer.",
|
||||||
|
"« Déjà contacté » sur un spot du panadapter désigne désormais l'INDICATIF présent dans le journal, et non l'entité. Une entité déjà faite sur cette bande et ce mode n'est pas une nouvelle, et annoncer « déjà contacté » pour une station jamais travaillée était faux.",
|
||||||
|
"Décodes FT : un message composé MSHV qui répond à deux stations sur une seule ligne — « DM8BJF RR73; F4BPO <RI1FJL> +14 » — est maintenant reconnu comme vous étant adressé quand votre indicatif est dans la seconde moitié.",
|
||||||
|
"Édition de QSO : sa propre puissance d'émission est enfin modifiable — le champ était enregistré et réécrit mais n'avait aucune case, donc un contact loggé à la mauvaise puissance ne pouvait pas être corrigé. Le locator étendu du correspondant gagne une case pour la même raison, et les libellés de puissance disent maintenant à QUI elle appartient.",
|
||||||
|
"FlexRadio : un spot n'est plus supprimé puis redessiné quand rien n'a changé. Un flux de skimmers actif re-spotte la même station toutes les quelques secondes — une session de deux minutes envoyait 2128 ajouts, dont 88 pour un seul indicatif — sans que le panadapter bouge d'un pixel.",
|
||||||
|
"Les commentaires des spots du panadapter tiennent maintenant dans ce que la radio accepte : SmartSDR coupait les plus longs en plein mot, perdant l'entité et le statut. Le texte du cluster est rogné en premier, le spotteur, l'entité et le statut survivent toujours. L'alignement en colonnes des lignes RBN est aussi ramené à une seule espace : conservé en espaces insécables, il ouvrait un trou assez large pour repousser le reste du commentaire hors de l'écran.",
|
||||||
|
"L'appel automatique est retiré — il faisait doublon avec DXHunter, qui répond déjà aux décodages. Cliquer un décodage pour répondre ne change pas.",
|
||||||
|
"Le rebond élastique en fin de liste a disparu, et un balayage horizontal à deux doigts ne fait plus quitter l'application. Deux comportements de navigateur qui n'apparaissent qu'au pavé tactile ou sur écran tactile.",
|
||||||
|
"Le zoom de l'interface s'annonce enfin : une pastille affiche le facteur pendant qu'il change, un clic dessus revient à 100 %, et le menu Affichage → Zoom avant / Zoom arrière / Taille réelle le rend trouvable. Ctrl+molette et Ctrl+0 fonctionnaient déjà, mais rien ne le disait — un zoom involontaire et on ne savait plus revenir.",
|
||||||
|
"Icom CI-V : un changement de fréquence ou de mode dont l'accusé de réception se perd est désormais vérifié en interrogeant la radio, comme l'était déjà le PTT. Les trois sont des ordres auxquels WSJT-X et JTDX répondent par une erreur de contrôle radio et une liaison coupée, et un log d'IC-7850 montre un set_freq faire précisément cela.",
|
||||||
|
"Le fichier de log tourne maintenant en cours d'exécution, et plus seulement au démarrage. Sa limite reposait sur l'idée qu'une session écrit quelques kilo-octets ; avec la trace CI-V laissée active, l'une d'elles a écrit 416 Mo sans que rien ne l'arrête avant le disque."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.26.5",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"Fixed the record button going missing after an update, until the audio settings were opened and saved. Whether a manual recording is possible depends on a per-profile setting, and the question was asked once at startup — before the profile was known on a launch that had more work to do.",
|
||||||
|
"Switching profile is quicker on a shared MySQL logbook: the one-off cleanup of unused settings tables is now recorded as done instead of being re-checked on every connection.",
|
||||||
|
"A profile switch now logs how long it took, and any device slower than half a second names itself — a switch that feels sluggish can be diagnosed from the log file.",
|
||||||
|
"Saving an alert rule or a filter preset now says so, with the name, for a few seconds. Both used to save in silence, leaving the dialog looking exactly as it did before the click.",
|
||||||
|
"Awards: the callsigns listed behind an award cell are now links. Clicking one opens the QSL Manager on Paper QSL with that station searched, ready for the card sent/received dates — chasing a missing confirmation no longer means retyping the callsign into another tab.",
|
||||||
|
"Motorised antennas over serial: the line format is now stated explicitly as 8N1, the baud list covers 1200 to 115200, and the first exchange after each connect is dumped to the log — which separates a silent controller from a wrong baud rate from a frame we misread.",
|
||||||
|
"Fixed a motorised antenna on a serial port failing with \"Serial port busy\" for ever. OpsLog was holding the port itself: stopping a client did not wait for its poll loop to leave, and the new client was started while the old one still owned the COM port — every settings save added another loop to the fight.",
|
||||||
|
"A serial antenna controller whose port is held by another program now says so by name in the log, instead of repeating \"Serial port busy\" — a COM port has one owner, usually the manufacturer control window left open.",
|
||||||
|
"Fixed \"Test connection\" on a serial motorised antenna taking the COM port away from the running antenna. A port has one owner, so the test now reports the live link's own status instead of opening a second connection to it.",
|
||||||
|
"A serial antenna controller that never answers now fails after four seconds with \"nothing came back\", instead of freezing the poll loop for minutes with nothing in the log. A silent serial port returns no bytes AND no error, and the buffered reader retried that a hundred times before giving up.",
|
||||||
|
"Ultrabeam over USB now works. The cable presents TWO COM ports and only the second reaches the controller, at 19200 baud — so the speed is now fixed at 19200 and the port field says which one to pick. Stopping a client no longer waits out the read timeout either, so changing port takes effect at once instead of leaving the old one held."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Correction du bouton d'enregistrement disparu après une mise à jour, jusqu'à ce qu'on ouvre et enregistre les réglages audio. La possibilité d'enregistrer dépend d'un réglage par profil, et la question n'était posée qu'une fois au démarrage — avant que le profil soit connu, sur un lancement qui avait plus de travail à faire.",
|
||||||
|
"Le changement de profil est plus rapide sur un journal MySQL partagé : le nettoyage ponctuel des tables de réglages inutilisées est désormais marqué comme fait, au lieu d'être revérifié à chaque connexion.",
|
||||||
|
"Un changement de profil enregistre maintenant sa durée dans le journal, et tout appareil dépassant la demi-seconde se nomme — un changement qui traîne peut donc être diagnostiqué depuis le fichier de log.",
|
||||||
|
"L'enregistrement d'une règle d'alerte ou d'un filtre affiche maintenant une confirmation avec son nom, quelques secondes. Les deux enregistraient en silence, la fenêtre restant identique à ce qu'elle était avant le clic.",
|
||||||
|
"Diplômes : les indicatifs listés derrière une case sont désormais cliquables. Un clic ouvre le gestionnaire QSL sur QSL papier avec la station déjà recherchée, prête pour les dates d'envoi et de réception — relancer une confirmation manquante ne demande plus de retaper l'indicatif dans un autre onglet.",
|
||||||
|
"Antennes motorisées en série : le format de ligne est désormais fixé explicitement en 8N1, la liste des vitesses va de 1200 à 115200, et le premier échange après chaque connexion est écrit dans le log — ce qui distingue un contrôleur muet d'une mauvaise vitesse et d'une trame mal relue.",
|
||||||
|
"Correction d'une antenne motorisée en série qui échouait indéfiniment sur « Serial port busy ». OpsLog occupait le port lui-même : l'arrêt d'un client n'attendait pas la sortie de sa boucle de scrutation, et le nouveau client démarrait alors que l'ancien détenait encore le port COM — chaque enregistrement des réglages ajoutait une boucle à la mêlée.",
|
||||||
|
"Un contrôleur d'antenne en série dont le port est occupé par un autre programme le dit maintenant explicitement dans le log, au lieu de répéter « Serial port busy » — un port COM n'a qu'un propriétaire, le plus souvent la fenêtre de contrôle du fabricant restée ouverte.",
|
||||||
|
"Correction du « Test de connexion » d'une antenne motorisée en série qui prenait le port COM à l'antenne en service. Un port n'a qu'un propriétaire : le test rapporte désormais l'état du lien en cours au lieu d'ouvrir une seconde connexion dessus.",
|
||||||
|
"Un contrôleur d'antenne en série qui ne répond jamais échoue maintenant en quatre secondes sur « rien n'est revenu », au lieu de figer la boucle de scrutation pendant des minutes sans rien écrire dans le log. Un port série muet ne renvoie ni octet ni erreur, et le lecteur tamponné réessayait cent fois avant d'abandonner.",
|
||||||
|
"Ultrabeam en USB fonctionne. Le câble présente DEUX ports COM et seul le second atteint le contrôleur, à 19200 bauds — la vitesse est donc fixée à 19200 et le champ du port indique lequel choisir. L'arrêt d'un client n'attend plus la fin du délai de lecture, donc un changement de port prend effet immédiatement au lieu de laisser l'ancien occupé."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.26.4",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"Clicking a spot on the radio panadapter now carries its POTA park into the Awards tab, like a click in OpsLog does.",
|
||||||
|
"Ultrabeam over serial: the COM port field now has a chevron that opens the list of detected ports. It was a combo box that only opened on a keystroke, so it looked like a plain text box.",
|
||||||
|
"The logbook database now contains only the contacts. Settings, station profiles, award reference lists and the lookup cache were being created in every database, including a shared MySQL logbook, which made the two look interchangeable; the unused tables are dropped on the next start, and any that hold data are left alone.",
|
||||||
|
"And the mirror image: the settings database drops its own unused, empty qso table once the contacts have a database of their own. It is rebuilt automatically if that database is ever pressed into service as the logbook again.",
|
||||||
|
"Settings → Database: a Compact button on each database. SQLite frees deleted pages inside the file and never shrinks it, so this is what gives the disk space back; the result shows the size before and after. A shared MySQL logbook has the button too, running OPTIMIZE TABLE instead."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Cliquer un spot sur le panadapter de la radio reporte maintenant son parc POTA dans l’onglet Diplômes, comme un clic dans OpsLog.",
|
||||||
|
"Ultrabeam en série : le champ du port COM a maintenant un chevron qui ouvre la liste des ports détectés. C'était une liste déroulante qui ne s'ouvrait qu'en tapant, donc indiscernable d'un simple champ texte.",
|
||||||
|
"La base du journal ne contient plus que les contacts. Les réglages, profils station, listes de références et le cache de recherche étaient créés dans toutes les bases, y compris un MySQL partagé, ce qui laissait croire que les deux étaient interchangeables ; les tables inutilisées sont supprimées au prochain démarrage, et celles qui contiennent des données sont laissées telles quelles.",
|
||||||
|
"Et l'inverse : la base de réglages supprime sa propre table qso, vide et inutilisée, dès lors que les contacts ont leur base à eux. Elle est reconstruite automatiquement si cette base doit à nouveau servir de journal.",
|
||||||
|
"Réglages → Base de données : un bouton Compacter sur chaque base. SQLite libère les pages supprimées à l'intérieur du fichier sans jamais le réduire ; c'est donc ce qui rend l'espace disque, et le résultat affiche la taille avant et après. Un journal MySQL partagé a aussi le bouton, avec un OPTIMIZE TABLE à la place."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.26.3",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"Ultrabeam: the controller can be reached over a plain serial port, not only over the network. It has an RS232 port and the PC is usually beside it, so an FTDI cable is the direct route — the RS232-to-Ethernet adapter is now only needed to put the antenna at the far end of a link. Same choice the SteppIR has always had, in the same place.",
|
||||||
|
"Docked band map: FIT and FTx are now two labelled buttons in its header. Fit-to-band was hidden behind the px/kHz readout — a control whose label is a measurement does not look like one, and switching it off left nothing on screen saying the option existed. Hiding the digital spots is available there too, and both follow the Band Map tab.",
|
||||||
|
"Stats: the Entities tile now says which entity was added to the log most recently, with the callsign and date that did it. Judged against the whole log — a contact is the first with its country once, and does not become the first again because a date filter hides the ones before it.",
|
||||||
|
"Docked band map: in fit-to-band the header no longer printed FIT twice, once as the readout and once as the button beside it.",
|
||||||
|
"Settings: what OpsLog does with a FlexRadio — panadapter spots, decode spots and the DAX switch for voice messages — now lives in the FlexRadio page with the per-band antennas and power, instead of at the foot of the CAT page. CAT keeps the link itself: an address and a port, as for every other backend.",
|
||||||
|
"Cluster settings: four paragraphs of explanation removed. The options they described are unchanged.",
|
||||||
|
"A spot that is a new band AND a new mode for an entity is now its own status, NEW BAND+MODE, ranked with NEW DXCC. It used to be reported as a plain new band, which reads as \"you have worked this entity in this mode, just not here\" — the opposite of the truth. It is not a new slot either: a slot is the pair still missing when each half is already in the log. The cluster, the band map, the decodes panel, the filters and the auto-call criteria all tell the two apart now.",
|
||||||
|
"Cluster filters: a \"my bands\" link selects every band from your own band list in one click. With nothing selected the filter lets every band through — including 4 m and 70 cm off the RBN feeds, which the list could not offer you to untick because they are not bands you have.",
|
||||||
|
"FlexRadio: cluster spots on the panadapter are now coloured by what they are. A text colour and a background colour per status — new entity, new band+mode, new band, new mode, new slot, new park, new county, new prefix, your own callsign, already worked — set in Settings → FlexRadio, with a preview of each pair. Every spot used to be the same orange, which threw away the only thing worth knowing at a glance on a waterfall.",
|
||||||
|
"FlexRadio: clicking a spot can resize the panadapter to suit the mode — 25 kHz for CW, 200 for phone, 50 for digital by default, each configurable, with an option to re-centre on the spot as well. A CW signal is a hair at 200 kHz and an FT8 window shows an eighth of its sub-band at 25 kHz; one width cannot serve all three. Settings → FlexRadio, off by default.",
|
||||||
|
"FlexRadio: panadapter spots now carry their status in the comment as well as their colour — [NEW DXCC], [NEW BAND+MODE], [NEW BAND] and so on.",
|
||||||
|
"FlexRadio: the panadapter zoom now also applies when you click a spot on the panadapter itself, not just in the band map or cluster.",
|
||||||
|
"FlexRadio: fixed the panadapter zoom leaving the clicked spot off screen. The display now re-centres whenever the spot would fall outside the new window, and stays put when it would not.",
|
||||||
|
"Awards (F3): a NEW badge marks each award reference on the current QSO that has never been worked, picked or detected alike."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Ultrabeam : le contrôleur se joint par un simple port série, plus seulement par le réseau. Il a une prise RS232 et le PC est en général juste à côté : un câble FTDI suffit — l'adaptateur RS232 vers Ethernet ne sert plus qu'à mettre l'antenne au bout d'une liaison. Le même choix que le SteppIR a toujours eu, au même endroit.",
|
||||||
|
"Bandmap ancrée : FIT et FTx sont désormais deux boutons nommés dans son en-tête. L'ajustement à la bande se cachait derrière l'indicateur px/kHz — un contrôle dont le libellé est une mesure n'a pas l'air d'un contrôle, et une fois désactivé plus rien à l'écran ne disait que l'option existait. Le masquage des spots numériques y est aussi, et les deux suivent l'onglet Bandmap.",
|
||||||
|
"Statistiques : la tuile Entités indique désormais quelle entité a été ajoutée au journal en dernier, avec l'indicatif et la date qui l'ont fait. Jugé sur le journal entier — un contact n'est le premier avec son pays qu'une fois, et ne le redevient pas parce qu'un filtre de date masque ceux d'avant.",
|
||||||
|
"Bandmap ancrée : en mode ajusté, l'en-tête n'affiche plus FIT deux fois, une comme indicateur et une comme bouton juste à côté.",
|
||||||
|
"Réglages : ce qu'OpsLog fait avec un FlexRadio — spots panadapter, spots de décodages et la bascule DAX pour les messages vocaux — se trouve désormais sur la page FlexRadio, avec les antennes et la puissance par bande, au lieu du bas de la page CAT. La page CAT garde la liaison elle-même : une adresse et un port, comme pour tous les autres backends.",
|
||||||
|
"Réglages du cluster : quatre pavés d'explication retirés. Les options qu'ils décrivaient sont inchangées.",
|
||||||
|
"Un spot qui est à la fois une nouvelle bande ET un nouveau mode pour une entité a désormais son propre statut, NOUVEAU BANDE+MODE, au même rang que NOUVEAU DXCC. Il était annoncé comme une simple nouvelle bande, ce qui se lit « tu as déjà fait cette entité dans ce mode, juste pas ici » — l'inverse de la vérité. Ce n'est pas non plus un nouveau slot : un slot est la paire qui manque quand chaque moitié est déjà au journal. Le cluster, la bandmap, le panneau des décodages, les filtres et les critères d'appel automatique font maintenant la différence.",
|
||||||
|
"Filtres du cluster : un lien « mes bandes » sélectionne d'un clic toutes les bandes de ta propre liste. Sans sélection, le filtre laisse passer toutes les bandes — y compris le 4 m et le 70 cm des flux RBN, que la liste ne pouvait pas te proposer de décocher puisque ce ne sont pas des bandes que tu as.",
|
||||||
|
"FlexRadio : les spots cluster sur le panadapter sont désormais colorés selon ce qu'ils sont. Une couleur de texte et une couleur de fond par statut — nouvelle entité, nouvelle bande+mode, nouvelle bande, nouveau mode, nouveau slot, nouveau parc, nouveau comté, nouveau préfixe, ton propre indicatif, déjà contacté — réglées dans Réglages → FlexRadio, avec un aperçu de chaque paire. Tous les spots étaient de la même couleur orange, ce qui jetait la seule chose qui compte au premier coup d'œil sur une cascade.",
|
||||||
|
"FlexRadio : cliquer un spot peut redimensionner le panadapter selon le mode — 25 kHz en CW, 200 en phonie, 50 en numérique par défaut, chacun réglable, avec une option pour recentrer aussi sur le spot. Un signal CW est un cheveu à 200 kHz et une fenêtre FT8 montre un huitième de sa sous-bande à 25 kHz ; une seule largeur ne peut pas servir les trois. Réglages → FlexRadio, désactivé par défaut.",
|
||||||
|
"FlexRadio : les spots du panadapter portent maintenant leur statut dans le commentaire en plus de la couleur — [NEW DXCC], [NEW BAND+MODE], [NEW BAND], etc.",
|
||||||
|
"FlexRadio : le zoom du panadapter s'applique aussi quand on clique un spot sur le panadapter lui-même, et plus seulement dans la bandmap ou le cluster.",
|
||||||
|
"FlexRadio : correction du zoom du panadapter qui laissait parfois le spot hors écran. L'affichage se recentre désormais dès que le spot sortirait de la nouvelle fenêtre, et ne bouge pas sinon.",
|
||||||
|
"Diplômes (F3) : un badge NEW signale chaque référence du QSO en cours jamais contactée, choisie à la main ou détectée."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.26.2",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"Saving preferences no longer drops the rig. The CAT link — and the shared CAT server WSJT-X and JTDX connect to — is now rebuilt only when something about the connection itself changed, so pressing Save mid-QSO no longer throws them off with an error. The same restart was what wiped the spots off a FlexRadio panadapter on every save.",
|
||||||
|
"The log now records when WSJT-X or JTDX arms and disarms its transmitter. When a station is called and nothing goes out, that line says whether the far end ever enabled Tx — the one thing OpsLog asks for but cannot do itself.",
|
||||||
|
"Grid squares map: the world is drawn once instead of repeating east and west, it can be zoomed out far enough to hold Greenland and Antarctica at the same time, and the space beside the planet is the panel's own background instead of a wall of grey \"map data not yet available\" tiles.",
|
||||||
|
"Grid squares map: All, Phone and CW join Digital and FTx in the mode filter.",
|
||||||
|
"Motorised antenna over serial: the COM port is now picked from a list of the ports actually present, with a refresh button — and still accepts one typed by hand, for an adapter that is not plugged in yet.",
|
||||||
|
"Awards: choosing \"no field\" now clears the fallback searches with it. They kept running on their own fields while the panel no longer showed them, so an award declared to match nothing still found references.",
|
||||||
|
"Callbook lookup now reads the Russian district (RDA) from HamQTH and fills it as the contact's RDA reference. Only on the QSO being typed, never on one already logged: the callbook gives the district a station operates from today, and stamping that on an older contact would rewrite a correct entry into a false one.",
|
||||||
|
"FlexRadio: when the meters stay dead, the log now says why. The meter stream is UDP sent from the radio to OpsLog, and a firewall blocking it leaves a perfectly healthy TCP link with meters at zero and no explanation — the line names the port and what to allow.",
|
||||||
|
"The Russian district database is now built in: 58 188 callsigns, with the dated periods each operated from each district. It fills the RDA reference while you type a Russian callsign — for the day of the contact, not for today — and Settings → Awards fills it on every Russian QSO already in the log. A reference you assigned by hand is never overwritten.",
|
||||||
|
"New Settings → Maintenance → Databases: every reference database OpsLog keeps on disk on its own line — country file, Club Log exceptions, LoTW users, Super Check Partial, US counties, Russian districts — plus one line per updatable award reference list (IOTA, POTA, SOTA, WWFF). Each says what it holds and when it was refreshed. The updaters were scattered across the Awards manager and three settings pages before. Tools no longer carries \"Refresh cty.dat\" and \"Download reference lists\" — both are lines on that page now.",
|
||||||
|
"FT decodes: the auto-call no longer offers a SOTA criterion. It was declared and translated but could never be ticked, and a decode carries no summit reference for it to test — a setting that promised something the feature cannot do.",
|
||||||
|
"Auto-call: the slot criterion is named \"a new slot (band+mode never worked together)\" — the same word the cluster and the decodes panel already badge it with. \"A new band+mode slot\" read as \"a new band AND a new mode\", which is the one thing it is not.",
|
||||||
|
"Voice keyer: typing a callsign stops the auto-CQ. It stopped the CW auto-call and left the voice keyer calling CQ over the station that had just answered — the reason to stop has nothing to do with Morse, so both engines now stop on the same event.",
|
||||||
|
"The motorised antenna (Ultrabeam / SteppIR) now has a docked widget of its own, with a dish icon beside the entry strip: pattern (Normal / 180° / Bi), band buttons, ±25 kHz nudge and Retract — what you touch between contacts. Tracking, its mode and step, and the per-element lengths stay in the Station Control tab, where they are set once. The icon pulses amber while the elements travel.",
|
||||||
|
"FT decodes: a station with a compound callsign is no longer invisible. FT8 sends such a call as a hash, printed between angle brackets — \"F4BPO <ZA/IW2JOP> -24\" — and every decode carrying one was discarded as unparseable, including the reply telling you that station had answered. The two-message form (\"… RR73; … <call> -08\") is read correctly too.",
|
||||||
|
"The log now records when a profile re-applies every subsystem. That rebuild is what dropped WSJT-X's CAT connection — an operator's log showed it happening 54 times in one session, three of them while the rig was keyed — and nothing said it was happening at all.",
|
||||||
|
"The shared CAT server is never torn down while the rig is transmitting. A rebuild that really is needed now waits for the over to end — closing the socket mid-transmission is what left WSJT-X inside a run of Hamlib calls with nothing at the other end.",
|
||||||
|
"Autostart: a program can be closed when OpsLog closes. Per program, so the rotator controller can stay while WSJT-X goes, and only ever a polite close — the way clicking its cross would — of a program OpsLog itself started.",
|
||||||
|
"Awards: switching a column between the reference and its description is now immediate. It rebuilt every award for every contact in the log — work with a known answer, since a relabel cannot change which QSOs match. Only that award is recomputed, and only on the rows that already carry it. The full recompute also reads twenty-seven columns per QSO instead of a hundred and fifty."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Enregistrer les préférences ne coupe plus la radio. La liaison CAT — et le serveur CAT partagé auquel WSJT-X et JTDX se connectent — n'est reconstruite que si la connexion elle-même a changé, si bien qu'un Enregistrer en plein QSO ne les éjecte plus avec une erreur. C'est ce même redémarrage qui effaçait les spots du panadapter FlexRadio à chaque enregistrement.",
|
||||||
|
"Le journal enregistre désormais quand WSJT-X ou JTDX arme et désarme son émetteur. Quand une station est appelée et que rien ne part, cette ligne dit si le logiciel distant a seulement activé Tx — la seule chose qu'OpsLog demande sans pouvoir la faire à sa place.",
|
||||||
|
"Carte des carrés locator : le monde est dessiné une seule fois au lieu de se répéter d'est en ouest, le zoom arrière descend assez bas pour tenir le Groenland et l'Antarctique en même temps, et l'espace à côté de la planète est le fond du panneau au lieu d'un mur de tuiles grises « map data not yet available ».",
|
||||||
|
"Carte des carrés locator : Tout, Phonie et CW rejoignent Numérique et FTx dans le filtre de mode.",
|
||||||
|
"Antenne motorisée en liaison série : le port COM se choisit maintenant dans la liste des ports réellement présents, avec un bouton d'actualisation — et accepte toujours une saisie à la main, pour un adaptateur qui n'est pas encore branché.",
|
||||||
|
"Diplômes : choisir « aucun champ » efface désormais les recherches de repli avec lui. Elles continuaient de tourner sur leurs propres champs alors que le panneau ne les affichait plus, si bien qu'un diplôme déclaré ne rien reconnaître trouvait quand même des références.",
|
||||||
|
"La recherche callbook lit désormais le district russe (RDA) chez HamQTH et le renseigne comme référence RDA du contact. Uniquement sur le QSO en cours de saisie, jamais sur un QSO déjà journalisé : le callbook donne le district d'où la station émet aujourd'hui, et l'appliquer à un contact ancien transformerait une entrée correcte en entrée fausse.",
|
||||||
|
"FlexRadio : quand les mesures restent mortes, le journal dit maintenant pourquoi. Le flux de mesures est un envoi UDP de la radio vers OpsLog, et un pare-feu qui le bloque laisse une liaison TCP parfaitement saine avec des aiguilles à zéro et aucune explication — la ligne nomme le port et ce qu'il faut autoriser.",
|
||||||
|
"La base des districts russes est désormais intégrée : 58 188 indicatifs, avec les périodes datées passées dans chaque district. Elle renseigne la référence RDA pendant que tu tapes un indicatif russe — pour le jour du contact, pas pour aujourd'hui — et Réglages → Diplômes la renseigne sur tous les QSO russes déjà journalisés. Une référence attribuée à la main n'est jamais écrasée.",
|
||||||
|
"Nouveau Réglages → Maintenance → Bases de données : chaque base de référence qu'OpsLog garde sur disque a sa ligne — fichier pays, exceptions Club Log, utilisateurs LoTW, Super Check Partial, comtés US, districts russes — plus une ligne par liste de références de diplôme actualisable (IOTA, POTA, SOTA, WWFF). Chacune dit ce qu'elle contient et sa dernière actualisation. Les mises à jour étaient jusqu'ici dispersées entre le gestionnaire de diplômes et trois pages de réglages. Le menu Outils ne porte plus « Refresh cty.dat » ni « Download reference lists » — les deux sont des lignes de cette page.",
|
||||||
|
"Décodages FT : l'appel automatique ne propose plus de critère SOTA. Il était déclaré et traduit mais impossible à cocher, et un décodage ne porte aucune référence de sommet à tester — un réglage qui promettait ce que la fonction ne sait pas faire.",
|
||||||
|
"Appel automatique : le critère de slot s'appelle désormais « un nouveau slot (bande+mode jamais faits ensemble) » — le mot que le cluster et le panneau des décodages emploient déjà sur leur pastille. « Un nouveau couple bande+mode » se lisait comme « une nouvelle bande ET un nouveau mode », ce qu'il n'est justement pas.",
|
||||||
|
"Manipulateur vocal : taper un indicatif arrête l'appel automatique. Il arrêtait l'auto-call CW et laissait le DVK appeler CQ par-dessus la station qui venait de répondre — la raison de s'arrêter n'a rien à voir avec la télégraphie, les deux moteurs s'arrêtent donc sur le même événement.",
|
||||||
|
"L'antenne motorisée (Ultrabeam / SteppIR) a désormais son widget ancré, avec une icône de parabole à côté de la barre de saisie : diagramme (Normal / 180° / Bi), boutons de bande, décalage ±25 kHz et Rétracter — ce qu'on touche entre deux contacts. Le suivi, son mode et son pas, ainsi que les longueurs d'éléments restent dans l'onglet Station, où ils se règlent une fois pour toutes. L'icône clignote en ambre pendant que les éléments se déplacent.",
|
||||||
|
"Décodages FT : une station à indicatif composé n'est plus invisible. Le FT8 transmet un tel indicatif sous forme de hachage, affiché entre chevrons — « F4BPO <ZA/IW2JOP> -24 » — et tout décodage en contenant un était jeté comme illisible, y compris la réponse qui t'annonçait que cette station t'avait répondu. La forme à deux messages (« … RR73; … <indicatif> -08 ») est également lue correctement.",
|
||||||
|
"Le journal enregistre désormais quand un profil ré-applique tous ses sous-systèmes. C'est cette reconstruction qui coupait la liaison CAT de WSJT-X — le journal d'un opérateur en montre 54 dans une seule session, dont trois pendant que la radio émettait — et rien n'indiquait qu'elle avait lieu.",
|
||||||
|
"Le serveur CAT partagé n'est plus jamais démonté pendant que la radio émet. Une reconstruction réellement nécessaire attend la fin de l'émission — fermer la socket en pleine transmission, c'est ce qui laissait WSJT-X au milieu d'une série d'appels Hamlib sans personne à l'autre bout.",
|
||||||
|
"Démarrage auto : un programme peut être fermé à la fermeture d'OpsLog. Au cas par cas, pour que le contrôleur de rotor reste pendant que WSJT-X s'en va, et toujours une demande de fermeture polie — comme un clic sur sa croix — d'un programme lancé par OpsLog lui-même.",
|
||||||
|
"Diplômes : basculer une colonne entre la référence et sa description est désormais immédiat. L'opération reconstruisait tous les diplômes de tous les contacts du journal — un travail au résultat connu d'avance, puisqu'un changement d'étiquette ne change pas quels QSO correspondent. Seul ce diplôme est recalculé, et seulement sur les lignes qui le portent déjà. Le recalcul complet lit aussi vingt-sept colonnes par QSO au lieu de cent cinquante."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.26.1",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"Auto-call: a QSO in progress is now held by OpsLog itself, so a new station is no longer called in the middle of an exchange. The hold is released when that QSO is logged, when you halt or click another decode, and after four minutes without a contact.",
|
||||||
|
"Rotor widget: the Stop button now lights up when pressed, like the direction presets, so there is no doubt the order went out.",
|
||||||
|
"FT decodes: a decode could go missing from the panel when a period arrived as one burst — the internal queue discarded it in silence. It is now deep enough for a full period, panadapter spots no longer hold the stream up, and anything still lost is written to the log.",
|
||||||
|
"Closing OpsLog can no longer leave a process behind. Each shutdown step is written to the log, and if one of them hangs the application now forces its own exit instead of staying open — which also unblocks the restart after an update.",
|
||||||
|
"CAT: a rig link whose polling loop got stuck no longer freezes every later reconnection attempt in silence. The wait is now bounded and the problem is written to the log, instead of a radio that never comes back and no explanation anywhere.",
|
||||||
|
"Cluster console: the replies to your commands are no longer buried under the spot flood. A Replies button — on by default — hides the DX spots, which the list above already shows.",
|
||||||
|
"Cluster: twelve named command buttons beside the command box — name one \"Show filters\", give it SH/FILTER, and one click sends it. They are set up in Settings → Cluster; a button with no command is not shown.",
|
||||||
|
"Cluster console: a Follow button decides whether the view sticks to the newest line, and sending a command re-arms it — a long reply is now scrolled to instead of landing out of sight. Switch Follow off to read without being pulled back down; the arrow beside it returns to the end.",
|
||||||
|
"Band map: the docked map can be switched to fit-to-band from its own header — click the px/kHz readout. It is the same setting the Band Map tab drives, so the two always agree.",
|
||||||
|
"Awards: an award can now be set to search in NO field. The matching options disappear with it, and the award counts only the references you assign to a contact by hand — for a reference like WWBOTA, which has no ADIF field anywhere.",
|
||||||
|
"New award: WWBOTA (World Wide Bunkers on the Air), with its full reference list — 31 342 bunkers. References are assigned to a contact by hand, the award having no ADIF field of its own.",
|
||||||
|
"Grid squares map: the map now fills its panel. It measured its container once, while the tab was still hidden, and kept that size — leaving a blank band under it whatever the window size.",
|
||||||
|
"Grid squares map: the fill colours for confirmed and worked squares can be chosen, beside the basemap selector. Left alone they follow the theme, and one click puts them back.",
|
||||||
|
"QSL cards: the QSO box now carries the frequency in megahertz alongside the band, and the designer lets you choose which columns it shows — date, UTC, band, frequency, mode, submode, RST.",
|
||||||
|
"Main view: up to four panes instead of two. A third and a fourth can be chosen — or left empty, in which case they are not drawn — and with four you pick between quarters (2 × 2) and four columns. Every divider is draggable, each arrangement is remembered for its own pane count, and a double-click evens it out.",
|
||||||
|
"Appearance: the alternating row shading in Recent QSOs can be switched off — every row the same colour — or given a colour of its own. It is independent of the QSL row colours, which still take precedence on the rows they paint.",
|
||||||
|
"QSL row colours: the \"left stripe\" style no longer draws a coloured hairline along the top and bottom of every coloured row. The stripe is painted differently — it is a stripe again, and nothing else.",
|
||||||
|
"QSL designer: the preview contact now fills every column the QSO box can show, frequency and submode included. A blank column promised room the printed card would not have."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Appel automatique : le QSO en cours est désormais verrouillé par OpsLog lui-même, si bien qu'une nouvelle station n'est plus appelée au milieu d'un échange. Le verrou est levé quand ce QSO est journalisé, quand tu fais Stop ou cliques un autre décodage, et au bout de quatre minutes sans contact.",
|
||||||
|
"Widget rotor : le bouton Stop s'allume maintenant quand on l'enfonce, comme les présélections de direction, pour ne plus douter que l'ordre est parti.",
|
||||||
|
"Décodages FT : un décodage pouvait manquer dans le panneau quand une période arrivait d'un bloc — la file interne le jetait sans rien dire. Elle est désormais dimensionnée pour une période entière, les spots panadapter ne retiennent plus le flux, et ce qui serait encore perdu est écrit dans le journal.",
|
||||||
|
"Fermer OpsLog ne peut plus laisser un processus derrière. Chaque étape d'arrêt est écrite dans le journal, et si l'une d'elles se bloque l'application force désormais sa propre sortie au lieu de rester ouverte — ce qui débloque aussi le redémarrage après une mise à jour.",
|
||||||
|
"CAT : une liaison radio dont la boucle d'interrogation se bloquait figeait en silence toutes les tentatives de reconnexion suivantes. L'attente est désormais bornée et le problème écrit dans le journal, au lieu d'une radio qui ne revient jamais sans la moindre explication.",
|
||||||
|
"Console cluster : les réponses à tes commandes ne sont plus noyées sous le flot de spots. Un bouton Réponses — actif par défaut — masque les spots DX, que la liste au-dessus affiche déjà.",
|
||||||
|
"Cluster : douze boutons de commande nommés à côté du champ de saisie — nomme-en un « Voir filtres », donne-lui SH/FILTER, et un clic l'envoie. Ils se règlent dans Réglages → Cluster ; un bouton sans commande n'est pas affiché.",
|
||||||
|
"Console cluster : un bouton Suivre décide si la vue reste collée à la dernière ligne, et envoyer une commande le réarme — une longue réponse défile maintenant jusqu'à elle au lieu d'arriver hors champ. Désactive Suivre pour lire sans être ramené en bas ; la flèche à côté revient à la fin.",
|
||||||
|
"Bandmap : la carte ancrée peut passer en ajustement à la bande depuis son propre en-tête — cliquer l'indicateur px/kHz. C'est le même réglage que celui de l'onglet Bandmap, les deux sont donc toujours d'accord.",
|
||||||
|
"Diplômes : un diplôme peut désormais ne chercher dans AUCUN champ. Les options de reconnaissance disparaissent avec lui, et le diplôme ne compte que les références attribuées à la main sur un contact — pour une référence comme WWBOTA, qui n'a de champ ADIF nulle part.",
|
||||||
|
"Nouveau diplôme : WWBOTA (World Wide Bunkers on the Air), avec sa liste de références complète — 31 342 bunkers. Les références s'attribuent à la main sur un contact, le diplôme n'ayant pas de champ ADIF propre.",
|
||||||
|
"Carte des carrés locator : la carte occupe enfin tout son panneau. Elle mesurait son conteneur une seule fois, alors que l'onglet était encore masqué, et gardait cette taille — d'où la bande vide en dessous quelle que soit la taille de la fenêtre.",
|
||||||
|
"Carte des carrés locator : les couleurs des carrés confirmés et contactés se choisissent, à côté du sélecteur de fond de carte. Laissées telles quelles, elles suivent le thème, et un clic les y ramène.",
|
||||||
|
"Cartes QSL : le tableau du QSO porte désormais la fréquence en mégahertz à côté de la bande, et le concepteur permet de choisir les colonnes affichées — date, UTC, bande, fréquence, mode, sous-mode, RST.",
|
||||||
|
"Vue principale : jusqu'à quatre volets au lieu de deux. Un troisième et un quatrième se choisissent — ou se laissent vides, auquel cas ils ne sont pas dessinés — et avec quatre tu choisis entre les quarts (2 × 2) et quatre colonnes. Chaque séparateur se glisse, chaque disposition est mémorisée pour son propre nombre de volets, et un double-clic la remet à égalité.",
|
||||||
|
"Apparence : l'alternance de teinte une ligne sur deux dans QSO récents peut être désactivée — toutes les lignes de la même couleur — ou recevoir sa propre couleur. Elle est indépendante des couleurs de ligne QSL, qui restent prioritaires sur les lignes qu'elles peignent.",
|
||||||
|
"Couleurs de ligne QSL : le style « barre à gauche » ne trace plus un filet coloré en haut et en bas de chaque ligne colorée. La barre est peinte autrement — c'est de nouveau une barre, et rien d'autre.",
|
||||||
|
"Concepteur QSL : le contact d'aperçu remplit maintenant toutes les colonnes que le tableau peut afficher, fréquence et sous-mode compris. Une colonne vide promettait une place que la carte imprimée n'avait pas."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.26.0",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"A new FT decodes tab: every decode from WSJT-X, JTDX or MSHV, grouped by transmit period, with what is new and what you are sending. Clicking a decode asks the application to call that station, exactly as double-clicking the line in its own window does. Columns are resizable and remembered, the filter bar with them, Clear empties the lists and Halt stops the transmission. With two receivers running the table splits into one column per band, each with its own transmit line, Halt and Clear, and the column lights up when that receiver is on the air. On a FlexRadio, answering a decode moves the transmitter to the slice listening on that band — unless that band already transmits, so an existing split is left alone.",
|
||||||
|
"FT decodes: auto-call. OpsLog can answer a decode without you clicking it — pick what qualifies (a new entity, band, mode, band+mode slot, grid, US county, POTA park or WPX prefix) and add a watch list of callsigns, with or without conditions of their own. It answers a CQ only, one station at a time across the whole station, never while any receiver is still mid-QSO, with a cooldown per callsign, and every call is written to the log with its reason. Armed from the decodes toolbar or Settings → FTx decodes, and off until you turn it on.",
|
||||||
|
"A grid-square map (Tools → Grid squares): every 4-character square in the log, confirmed squares solid and worked ones faint, scoped to digital or the FT modes, on the basemap of your choice. It answers the one question a decode list cannot — not who is on the band, but where the station has actually been reaching.",
|
||||||
|
"UDP: a new outbound type relays the WSJT-X stream. Every datagram received from WSJT-X, JTDX or MSHV is re-sent byte for byte to another program — JTAlert, GridTracker, a second logger — which each sender cannot do on its own, since they talk to one address only. Forwarded verbatim, with no origin header of the kind that has to be stripped back off at the far end, and a target naming one of OpsLog’s own ports is refused rather than looped.",
|
||||||
|
"New-grid detection now reads the grid from a reply as well as from a CQ. \"C91RU IZ5EME JN52\" — a station answering with its locator — is the commonest grid-bearing message on a busy band, and only CQs were being read: any station whose CQ you happened to miss had no known grid at all and could never be flagged as a new one. This is why other tools showed far more wanted grids than OpsLog did.",
|
||||||
|
"New-grid chasing is now scoped the way GridTracker scopes it, so the two agree. Pick how a square counts as already worked — this band or any band, crossed with any digital mode, this exact mode, or any FT mode (FT8/FT4/FT2) — and whether to chase only squares never worked or unconfirmed ones too, which are still missing from the award. The two are shown differently: a square never worked is a QSO to make, one worked and awaiting a confirmation is a QSL to chase, and they no longer share a badge. Settings → DX Cluster. The decodes table also gained a Grid column.",
|
||||||
|
"Cluster: NEW badges now clear after a contact however it was logged. Only hand-logging refreshed the worked snapshot, so a station worked through WSJT-X / JTDX / MSHV — or replayed from the offline outbox, arriving from a multi-op partner, or imported from the POTA hunter log — kept its NEW, NEW BAND, NEW MODE, NEW SLOT, NEW GRID, NEW PFX or NEW POTA badge for the rest of the session.",
|
||||||
|
"DX cluster: the Spotter continent filter matches again. One callsign is spotted by skimmers all over the world within a minute, and they all shared a single cached entry belonging to whichever spotter arrived first — so picking AF left the Indian and American skimmers in the list. Each spot now carries its own spotter continent. Alert rules on the spotter’s continent or country were missing RBN spots for a related reason and now match too.",
|
||||||
|
"Recent QSOs: the callsign search takes wildcards. A plain word now matches the START of a call — 4S finds 4S7AB — while * is any run of characters and ? exactly one, so *4S ends with 4S and *4S* contains it anywhere. It was an unconditional contains-match before, which made asking for a prefix impossible.",
|
||||||
|
"QSL Manager: the right-click menu now carries the same actions as Recent QSOs — ADIF export of the selection, export with a chosen field set, Cabrillo, bulk edit, the callbook and cty.dat updates, e-mail and delete. Filtered exports are deliberately not offered here: \"the filter\" means the Recent-QSOs filter, not the rows on screen. Two entries that appeared in this tab and did nothing when clicked are fixed at the same time — the menu now shows an action only where it is actually wired.",
|
||||||
|
"Column pickers and the ADIF export field chooser gained a whole-dialog Select all / Clear. Only per-group links existed, so clearing a selection meant one click per group — a dozen of them before you could tick the handful you actually wanted. Applies to Recent QSOs, Worked before, the cluster list and the export dialog, and covers the award columns the per-group links never touched.",
|
||||||
|
"Rotator: a Compact mode option (Settings → Rotator) reduces the rotor widget to the dial and the short/long-path azimuths under it. Left off, the widget keeps its quick-turn buttons, azimuth box and Stop.",
|
||||||
|
"Band-opening watch: the radius that counts a receiver as \"around here\" is now adjustable (Settings → DX Cluster), 25–1000 km, still 300 km by default. An opening on 10 m reaches a whole region, a 2 m duct does not, and the right distance is a judgement only the operator can make. Tightening it costs no extra traffic — the subscription is unchanged — only sensitivity.",
|
||||||
|
"Club Log uploads are now identified as OpsLog. They were credited to another station's application key, which took the blame for them.",
|
||||||
|
"ADIF import: \"fill my station fields\" now fills the station callsign too, on records that carry none."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Un onglet Décodages FT : tous les décodages de WSJT-X, JTDX ou MSHV, groupés par période d’émission, avec ce qui est nouveau et ce que tu émets. Cliquer un décodage demande au logiciel d’appeler cette station, exactement comme un double-clic sur la ligne dans sa propre fenêtre. Les colonnes se redimensionnent et sont mémorisées, la barre de filtres avec elles, Vider efface les listes et Stop arrête l’émission. Avec deux récepteurs, le tableau se scinde en une colonne par bande, chacune avec sa ligne d’émission, son Stop et son Vider, et la colonne s’allume quand c’est ce récepteur qui émet. Sur un FlexRadio, répondre à un décodage déplace l’émetteur sur la slice qui écoute cette bande — sauf si cette bande émet déjà, pour ne pas défaire un split en place.",
|
||||||
|
"Décodages FT : appel automatique. OpsLog peut répondre à un décodage sans que tu cliques — choisis ce qui le déclenche (nouvelle entité, bande, mode, couple bande+mode, carré, comté US, parc POTA ou préfixe WPX) et ajoute une liste d’indicatifs surveillés, avec ou sans conditions propres. Uniquement sur un CQ, une station à la fois pour toute la station, jamais tant qu’un récepteur est encore en QSO, avec un délai de garde par indicatif, et chaque appel est écrit dans le journal avec sa raison. S’arme depuis la barre d’outils des décodages ou Réglages → Décodages FTx, et reste désactivé tant que tu ne l’actives pas.",
|
||||||
|
"Une carte des carrés locator (Outils → Carrés locator) : tous les carrés de 4 caractères du journal, les confirmés en plein et les contactés en pâle, au choix en numérique ou en modes FT, sur le fond de carte de ton choix. Elle répond à la seule question qu’une liste de décodages ne peut pas traiter : non pas qui est sur la bande, mais jusqu’où la station porte réellement.",
|
||||||
|
"UDP : un nouveau type sortant relaie le flux WSJT-X. Chaque datagramme reçu de WSJT-X, JTDX ou MSHV est réémis octet pour octet vers un autre logiciel — JTAlert, GridTracker, un second carnet — ce qu’aucun émetteur ne sait faire seul puisqu’il ne parle qu’à une adresse. Transmis tel quel, sans l’en-tête d’origine qu’il faut ensuite retirer à l’autre bout, et une cible désignant un port d’écoute d’OpsLog est refusée au lieu de boucler.",
|
||||||
|
"La détection des nouveaux carrés lit désormais le locator dans une réponse autant que dans un CQ. « C91RU IZ5EME JN52 » — une station qui répond avec son locator — est le message porteur de locator le plus fréquent sur une bande chargée, et seuls les CQ étaient lus : une station dont on avait manqué le CQ n’avait aucun locator connu et ne pouvait jamais être signalée comme nouvelle. C’est ce qui expliquait l’écart avec les autres logiciels sur le nombre de carrés recherchés.",
|
||||||
|
"La chasse aux nouveaux carrés se règle désormais comme dans GridTracker, pour que les deux soient d’accord. Choisis ce qui fait qu’un carré est déjà fait — cette bande ou toutes bandes, croisé avec tout mode numérique, ce mode exact, ou tout mode FT (FT8/FT4/FT2) — et si tu chasses seulement les carrés jamais contactés ou aussi les non confirmés, qui manquent encore au diplôme. Les deux s’affichent différemment : un carré jamais contacté est un QSO à faire, un carré contacté en attente de confirmation est une QSL à relancer, et ils ne partagent plus le même badge. Réglages → Cluster DX. Le tableau des décodages gagne aussi une colonne Locator.",
|
||||||
|
"Cluster : les badges NEW s’effacent enfin après un contact, quel que soit le mode de journalisation. Seule la saisie manuelle rafraîchissait l’instantané des contacts, si bien qu’une station travaillée via WSJT-X / JTDX / MSHV — ou rejouée depuis la file hors-ligne, reçue d’un partenaire multi-op, ou importée du journal chasseur POTA — gardait son badge NEW, NEW BAND, NEW MODE, NEW SLOT, NEW GRID, NEW PFX ou NEW POTA jusqu’à la fin de la session.",
|
||||||
|
"Cluster DX : le filtre Continent du spotter fonctionne à nouveau. Un même indicatif est spotté par des skimmers du monde entier en une minute, et tous partageaient une seule entrée en cache appartenant au premier spotter arrivé — choisir AF laissait donc les skimmers indiens et américains dans la liste. Chaque spot porte désormais son propre continent de spotter. Les règles d’alerte sur le continent ou le pays du spotter rataient les spots RBN pour une raison voisine et fonctionnent aussi.",
|
||||||
|
"QSO récents : la recherche d’indicatif accepte les jokers. Un mot simple correspond désormais au DÉBUT de l’indicatif — 4S trouve 4S7AB — tandis que * remplace n’importe quelle suite de caractères et ? exactement un : *4S se termine par 4S, *4S* le contient n’importe où. C’était auparavant une recherche « contient » systématique, qui rendait impossible la recherche par préfixe.",
|
||||||
|
"Gestionnaire QSL : le menu contextuel propose désormais les mêmes actions que les QSO récents — export ADIF de la sélection, export avec choix des champs, Cabrillo, édition en masse, mises à jour cty.dat et annuaires, e-mail et suppression. Les exports « filtrés » n’y sont volontairement pas offerts : « le filtre » désigne celui des QSO récents, pas les lignes affichées ici. Deux entrées qui apparaissaient dans cet onglet sans rien faire sont corrigées au passage — le menu n’affiche plus une action que là où elle est réellement branchée.",
|
||||||
|
"Les sélecteurs de colonnes et le choix des champs à l’export ADIF ont désormais un Tout sélectionner / Tout décocher global. Seuls les liens par groupe existaient, si bien que vider une sélection demandait un clic par groupe — une douzaine avant de pouvoir cocher les quelques champs voulus. Vaut pour les QSO récents, Déjà contacté, la liste cluster et la fenêtre d’export, et couvre les colonnes de diplômes que les liens par groupe ne touchaient pas.",
|
||||||
|
"Rotor : une option Mode compact (Réglages → Rotor) réduit le widget au cadran et aux azimuts courte/longue distance en dessous. Désactivée, le widget garde ses boutons de rotation rapide, sa case d’azimut et Stop.",
|
||||||
|
"Veille d’ouverture : le rayon qui fait qu’un récepteur compte comme « près d’ici » est désormais réglable (Réglages → Cluster DX), de 25 à 1000 km, toujours 300 km par défaut. Une ouverture sur 10 m couvre toute une région, un conduit sur 2 m non, et la bonne distance est un jugement qui n’appartient qu’à l’opérateur. Le resserrer ne coûte aucun trafic supplémentaire — l’abonnement ne change pas — seulement de la sensibilité.",
|
||||||
|
"Les envois Club Log s’identifient désormais comme OpsLog. Ils étaient attribués à la clé applicative d’une autre station, qui en portait la responsabilité.",
|
||||||
|
"Import ADIF : « remplir mes champs station » renseigne aussi l’indicatif de station, sur les enregistrements qui n’en portent pas."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.25.9",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"The band/mode matrix colours can be chosen in Appearance, starting from the ones your theme already paints. Its legend is translated too.",
|
||||||
|
"TCI sharing: a refused un-key no longer leaves the rig stuck transmitting, and PTT is dropped if the client dies mid-over.",
|
||||||
|
"Icom: a frequency or mode change whose acknowledgement is lost is sent again, like PTT — losing one made JTDX drop the radio.",
|
||||||
|
"FlexRadio: transmit audio can switch to DAX for a voice message and back afterwards, so your microphone is not left off air.",
|
||||||
|
"Rotor widget: quick-turn buttons you can name and aim yourself, plus an azimuth box where Enter turns the antenna.",
|
||||||
|
"A station portable in another entity no longer inherits its home county, state and grid — TI8/W2RE was logged in New York.",
|
||||||
|
"LoTW confirmations for FT2, FT4 and FT8 match again: LoTW answers “DATA”, and the exact mode never lined up with the log.",
|
||||||
|
"CAT: a transverter offset, so a 28 MHz IF behind a 144 MHz transverter logs, spots and tunes on the band you are really on.",
|
||||||
|
"Band map: zoom goes down to 2 px/kHz for a whole band in one screen, and each band keeps the zoom you left it at."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Les couleurs de la matrice bandes/modes se choisissent dans Apparence, à partir de celles du thème. Sa légende est traduite aussi.",
|
||||||
|
"Partage TCI : un retour en réception refusé ne laisse plus le poste bloqué en émission, et le PTT retombe si le logiciel meurt.",
|
||||||
|
"Icom : un changement de fréquence ou de mode dont l’accusé se perd est renvoyé, comme le PTT — en perdre un faisait lâcher JTDX.",
|
||||||
|
"FlexRadio : l’audio d’émission peut basculer sur DAX le temps d’un message vocal et revenir après, pour ne pas perdre le micro.",
|
||||||
|
"Widget rotor : des boutons de rotation rapide que tu nommes et vises toi-même, et un champ azimut où Entrée lance l’antenne.",
|
||||||
|
"Une station portable dans une autre entité n’hérite plus de son comté, son état et son locator d’origine : TI8/W2RE sortait à New York.",
|
||||||
|
"Les confirmations LoTW des QSO FT2, FT4 et FT8 se retrouvent : LoTW répond « DATA », et le mode exact ne correspondait jamais au log.",
|
||||||
|
"CAT : un décalage transverter, pour qu’une FI 28 MHz derrière un transverter 144 MHz logue et accorde sur la vraie bande.",
|
||||||
|
"Carte de bande : le zoom descend à 2 px/kHz pour voir toute la bande d’un coup, et chaque bande retient son zoom."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.25.8",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"An entity that is a single island group now fills the IOTA reference on its own — no callbook subscription needed.",
|
||||||
|
"CAT sharing can now speak TCI instead of Hamlib, split included, so a TCI-only program reaches whatever radio you are on.",
|
||||||
|
"Lookup cache: a TTL of 0 switches it off, so a callbook record you are correcting is re-read every time.",
|
||||||
|
"TCI radios: when the rig forbids transmitting, PTT says so instead of doing nothing silently.",
|
||||||
|
"WAJA carried Japan’s civil prefecture numbers instead of the JARL’s: 35 of the 47 references are renumbered.",
|
||||||
|
"Award references can be renumbered in the editor — the number was the one field it would not let you correct.",
|
||||||
|
"The compass fills the moment Station Control opens, instead of waiting out the rest of a polling interval.",
|
||||||
|
"Combined amplifiers: the power level (L/M/H) is coupled too, and both amps are commanded at once so the combiner stops beeping.",
|
||||||
|
"Generic HTTP relay: an https:// board can be accepted with its own self-signed certificate, per board.",
|
||||||
|
"Club Log: the on-close upload now goes out as one batch — sending hundreds of contacts one at a time got operators blocked.",
|
||||||
|
"eQSL: uploads go out in batches of 100 too, and QRZ.com and HRDLog — which have no batch upload — are spaced out instead.",
|
||||||
|
"A spot you send now shows in your own spot list — most nodes never echo it back, so it looked like nothing had gone out.",
|
||||||
|
"Icom with JTDX in Fake It split: a lost PTT acknowledgement is sent again instead of failing, which made JTDX drop the rig.",
|
||||||
|
"A cluster whose only greeting is “login:” and which then asks for a password now connects — both prompts were being missed."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Une entité qui est un seul groupe d’îles remplit désormais la référence IOTA toute seule, sans abonnement callbook.",
|
||||||
|
"Le partage CAT peut désormais parler TCI au lieu de Hamlib, split compris : un logiciel TCI atteint la radio, quelle qu’elle soit.",
|
||||||
|
"Cache des recherches : un TTL à 0 le désactive, pour relire à chaque fois une fiche callbook en cours de correction.",
|
||||||
|
"Radios TCI : quand la radio interdit l’émission, le PTT le dit au lieu de ne rien faire en silence.",
|
||||||
|
"WAJA portait les numéros civils des préfectures japonaises et non ceux de la JARL : 35 des 47 références sont renumérotées.",
|
||||||
|
"Les références d’un diplôme se renumérotent dans l’éditeur : le numéro était le seul champ qu’il refusait de corriger.",
|
||||||
|
"La boussole se remplit dès l’ouverture de Station Control, au lieu d’attendre la fin d’un intervalle d’interrogation.",
|
||||||
|
"Amplis combinés : le niveau de puissance (L/M/H) est couplé lui aussi, et les deux amplis sont commandés en même temps — fini le bip du combineur.",
|
||||||
|
"Relais HTTP générique : une carte en https:// peut être acceptée avec son certificat auto-signé, carte par carte.",
|
||||||
|
"Club Log : l’envoi à la fermeture part désormais en un lot — envoyer des centaines de contacts un par un faisait bloquer l’opérateur.",
|
||||||
|
"eQSL : les envois partent aussi par lots de 100, et QRZ.com et HRDLog — qui n’ont pas d’envoi groupé — sont espacés à la place.",
|
||||||
|
"Un spot que tu envoies apparaît maintenant dans ta liste : la plupart des nœuds ne le renvoient pas, il semblait n’être jamais parti.",
|
||||||
|
"Icom avec JTDX en split Fake It : un accusé de réception PTT perdu est renvoyé au lieu d’échouer — JTDX lâchait le poste.",
|
||||||
|
"Un cluster dont tout l’accueil est « login: » puis qui réclame un mot de passe se connecte : les deux invites étaient ignorées."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.25.7",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"Opening the Awards panel no longer pulls the whole logbook several times at once — a large log briefly took gigabytes of memory.",
|
||||||
|
"Awards: the Missing refs button now only appears where it means something — a worldwide award like POTA could only ever answer “nothing found”.",
|
||||||
|
"Worked before: a prefixed call like ZA/OE8NDR matched every other visitor to that country instead of that one operator.",
|
||||||
|
"French: seventeen strings were still in English, the whole update panel among them, plus Spot lifetime and Chase new grids.",
|
||||||
|
"Selecting a QSO shows the entity the QSO records, not one re-derived from its callsign — a 3Y0K contact logged as Bouvet showed the Antarctica matrix.",
|
||||||
|
"Back-entering a QSO resolves the ClubLog exception at the CONTACT’S date, so a DXpedition entered months later gets the entity it had then.",
|
||||||
|
"QRZ.com sends an island reference for an operator on one, and OpsLog read past it — it now fills the IOTA award reference before the QSO is logged.",
|
||||||
|
"Sync across PCs: point every OpsLog at one folder you already synchronise and your contacts follow you between machines.",
|
||||||
|
"TCI: a station spotted by several operators is drawn once on the panorama instead of two or three times a few hertz apart."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Ouvrir le panneau Awards ne tire plus plusieurs fois le journal entier en même temps — un gros log occupait brièvement des gigaoctets de mémoire.",
|
||||||
|
"Awards : le bouton Réf. manquantes n’apparaît plus que là où il a un sens — un diplôme mondial comme POTA ne pouvait répondre que « aucun manque ».",
|
||||||
|
"Déjà contacté : un indicatif préfixé comme ZA/OE8NDR rapprochait tous les autres visiteurs du pays au lieu de ce seul opérateur.",
|
||||||
|
"Français : dix-sept textes étaient restés en anglais, dont tout le panneau de mise à jour, la durée de vie des spots et Chasser les nouveaux locators.",
|
||||||
|
"Sélectionner un QSO affiche l’entité que le QSO enregistre, pas une recalculée depuis l’indicatif — un 3Y0K logué Bouvet montrait la matrice Antarctique.",
|
||||||
|
"Saisir un QSO a posteriori résout l’exception ClubLog à la date DU CONTACT : une DXpedition entrée des mois après retrouve l’entité qu’elle avait alors.",
|
||||||
|
"QRZ.com envoie la référence d’île d’un opérateur sur une île, et OpsLog l’ignorait — elle remplit désormais la référence IOTA avant l’enregistrement du QSO.",
|
||||||
|
"Synchro entre PC : fais pointer chaque OpsLog vers un dossier déjà synchronisé et tes contacts te suivent d’une machine à l’autre.",
|
||||||
|
"TCI : une station spottée par plusieurs opérateurs n’est tracée qu’une fois sur le panorama, au lieu de deux ou trois fois."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.25.6",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"Right-click: update the US county of the selected contacts from the ULS database, replacing a county since renamed or abolished.",
|
||||||
|
"A QSO logged from WSJT-X, MSHV or a net now appears in Recent QSOs at once, instead of waiting for a delayed auto-upload to send it.",
|
||||||
|
"New installs: the default QSL and recording e-mails end with a credit line and a link to OpsLog. Part of the template, so delete it if unwanted.",
|
||||||
|
"Relay automatic control and band-change messages now follow the Band selector too, so a station without CAT switches its antenna when you change band.",
|
||||||
|
"Fixed OpsLog re-tuning its own rig from its own radio broadcasts, which dropped the CAT link on every JTDX or WSJT-X “Fake It” transmission.",
|
||||||
|
"New device: a bench power supply on Modbus RTU (BSIDE, Wanptek and kin) — its output switched from Station Control, with volts, amps and watts.",
|
||||||
|
"SPID rotator: a Rot1Prog controller turned nearly a full circle the wrong way for every heading — its commands take three digits, not four.",
|
||||||
|
"The compass sweeps with a turning antenna instead of jumping, and the controller is polled once for the whole app rather than by each panel.",
|
||||||
|
"A rotator test that only reads the heading now says so, instead of naming PstRotator for a move it never commanded."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Clic droit : mettre à jour le comté US des contacts sélectionnés depuis la base ULS, pour remplacer un comté renommé ou supprimé.",
|
||||||
|
"Un QSO logué depuis WSJT-X, MSHV ou un net apparaît aussitôt dans les QSO récents, sans attendre l’envoi d’un upload automatique différé.",
|
||||||
|
"Nouvelles installations : les mails QSL et enregistrement par défaut finissent par une ligne de crédit et un lien vers OpsLog. Dans le modèle, supprimable.",
|
||||||
|
"Le contrôle automatique des relais et les messages de changement de bande suivent aussi le champ Band : une station sans CAT commute enfin son antenne.",
|
||||||
|
"Corrigé : OpsLog réaccordait sa propre radio depuis ses propres diffusions, ce qui coupait le lien CAT à chaque émission JTDX ou WSJT-X en « Fake It ».",
|
||||||
|
"Nouvel appareil : alimentation de laboratoire en Modbus RTU (BSIDE, Wanptek et similaires) — sortie commutée depuis Contrôle station, avec V, A et W.",
|
||||||
|
"Rotator SPID : un contrôleur Rot1Prog tournait presque un tour complet à l’envers pour chaque azimut — ses commandes tiennent trois chiffres, pas quatre.",
|
||||||
|
"Le compas suit l’antenne en rotation au lieu de sauter, et le contrôleur est interrogé une fois pour toute l’application, plus par chaque panneau.",
|
||||||
|
"Un test de rotator qui ne fait que lire l’azimut le dit, au lieu de citer PstRotator pour un mouvement jamais commandé."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.25.5",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"DX cluster: when spots arrive and every one is filtered out, the panel says so, names the filters doing it and offers to clear them — it used to say “waiting for spots” beside a counter reading 76 live.",
|
||||||
|
"DX cluster: the log times the connection and the first spot, so a slow first launch can be told apart from a quiet node.",
|
||||||
|
"Generic HTTP relay: its URLs were never actually sent — fixed. {value} sends the relay's label, {relay-1} counts from zero, no host needed.",
|
||||||
|
"Switching profile now reconnects the amplifier, antenna, Antenna Genius and tuner — they stayed on the previous profile's ports until you saved Settings.",
|
||||||
|
"SteppIR: one missed reply used to wedge the link — the antenna stopped responding, with nothing at all in the log. It now recovers on its own.",
|
||||||
|
"The log now says when a motorized antenna is connected but tracking is off, instead of a line that read like a fault.",
|
||||||
|
"DXHunter spot clicks tune the rig again: the frequency it sends is read in whatever unit it uses, not always as MHz."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Cluster DX : quand des spots arrivent et que tout est filtré, le panneau le dit, nomme les filtres responsables et propose de les effacer — il affichait « en attente de spots » à côté d’un compteur à 76 en direct.",
|
||||||
|
"Cluster DX : le journal chronomètre la connexion et le premier spot, pour distinguer un premier lancement lent d’un nœud silencieux.",
|
||||||
|
"Relais HTTP générique : ses URL n’étaient jamais envoyées — corrigé. {value} envoie le libellé du relais, {relay-1} compte de zéro, hôte inutile.",
|
||||||
|
"Changer de profil reconnecte l’ampli, l’antenne, l’Antenna Genius et le tuner — ils restaient sur les ports du profil précédent jusqu’à un Enregistrer.",
|
||||||
|
"SteppIR : une seule réponse manquée bloquait la liaison — l’antenne ne répondait plus, sans rien dans le journal. Elle se rétablit maintenant seule.",
|
||||||
|
"Le journal indique désormais qu’une antenne motorisée est connectée mais que le suivi est désactivé, au lieu d’une ligne qui ressemblait à une panne.",
|
||||||
|
"Les clics de spot DXHunter accordent à nouveau le rig : la fréquence envoyée est lue dans son unité réelle, plus toujours en MHz."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.25.4",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"WinKeyer: the opening probe goes out as one write, matching a capture of a client that talks to the same K3NG keyer, and the handshake bytes are always logged so a keyer that stays silent can be diagnosed."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"WinKeyer : la sonde d’ouverture part en un seul envoi, calquée sur la capture d’un client qui dialogue avec le même manipulateur K3NG, et les octets de la poignée de main sont toujours journalisés pour diagnostiquer un manipulateur muet."
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"version": "0.25.3",
|
"version": "0.25.3",
|
||||||
"date": "",
|
"date": "",
|
||||||
|
|||||||
+102
@@ -0,0 +1,102 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
// Compacting a database.
|
||||||
|
//
|
||||||
|
// SQLite never shrinks a file on its own: deleting rows — or dropping a table,
|
||||||
|
// which is what the schema-role cleanup does — frees pages INSIDE the file and
|
||||||
|
// leaves the file the size it always was. A logbook that held 200 000 imported
|
||||||
|
// QSOs for a day is still a 200 MB file the day after they are gone, and the
|
||||||
|
// only thing that reclaims the space is a VACUUM, which rewrites the database
|
||||||
|
// from scratch.
|
||||||
|
//
|
||||||
|
// Offered as a button rather than done automatically: a VACUUM rewrites the
|
||||||
|
// whole file, needs room for a second copy of it while it runs, and takes real
|
||||||
|
// time on a large logbook. That is a decision for the operator, at a moment they
|
||||||
|
// choose — not something to spring on them during startup.
|
||||||
|
|
||||||
|
import (
|
||||||
|
"database/sql"
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"hamlog/internal/applog"
|
||||||
|
)
|
||||||
|
|
||||||
|
// CompactResult is what one compaction did.
|
||||||
|
type CompactResult struct {
|
||||||
|
// Path of the file compacted, empty for MySQL.
|
||||||
|
Path string `json:"path"`
|
||||||
|
// Backend is "sqlite" or "mysql" — a shared server is optimised, not vacuumed.
|
||||||
|
Backend string `json:"backend"`
|
||||||
|
// Before and After are file sizes in bytes; both 0 when there is no file.
|
||||||
|
Before int64 `json:"before"`
|
||||||
|
After int64 `json:"after"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// CompactDatabase reclaims the unused space in one of the two databases.
|
||||||
|
//
|
||||||
|
// target is "settings" or "logbook". They are separate on purpose: they are
|
||||||
|
// different files, of very different sizes, and an operator compacting a 400 MB
|
||||||
|
// logbook has no reason to wait on a 2 MB settings file as well.
|
||||||
|
func (a *App) CompactDatabase(target string) (CompactResult, error) {
|
||||||
|
switch strings.ToLower(strings.TrimSpace(target)) {
|
||||||
|
case "settings":
|
||||||
|
if a.db == nil {
|
||||||
|
return CompactResult{}, fmt.Errorf("the settings database is not open")
|
||||||
|
}
|
||||||
|
return a.vacuumSQLite(a.db, a.dbPath)
|
||||||
|
case "logbook":
|
||||||
|
if a.logDb == nil {
|
||||||
|
return CompactResult{}, fmt.Errorf("the logbook is not open")
|
||||||
|
}
|
||||||
|
if a.dbBackend == "mysql" {
|
||||||
|
// A shared server's storage is the admin's business, and OPTIMIZE TABLE
|
||||||
|
// locks the table for the length of a rebuild — every other operator
|
||||||
|
// waits. Still offered, because a logbook that has had a large import
|
||||||
|
// deleted benefits from it just as much; it simply reports no sizes,
|
||||||
|
// which the server alone knows.
|
||||||
|
if _, err := a.logDb.ExecContext(a.ctx, "OPTIMIZE TABLE qso"); err != nil {
|
||||||
|
return CompactResult{}, fmt.Errorf("optimize qso: %w", err)
|
||||||
|
}
|
||||||
|
applog.Printf("compact: OPTIMIZE TABLE qso on the shared MySQL logbook")
|
||||||
|
return CompactResult{Backend: "mysql"}, nil
|
||||||
|
}
|
||||||
|
// No separate file: the settings database is serving as the logbook, and
|
||||||
|
// compacting it is the same operation.
|
||||||
|
if a.logDbPath == "" {
|
||||||
|
return a.vacuumSQLite(a.db, a.dbPath)
|
||||||
|
}
|
||||||
|
return a.vacuumSQLite(a.logDb, a.logDbPath)
|
||||||
|
}
|
||||||
|
return CompactResult{}, fmt.Errorf("unknown database %q", target)
|
||||||
|
}
|
||||||
|
|
||||||
|
// vacuumSQLite checkpoints the write-ahead log, then rewrites the file.
|
||||||
|
func (a *App) vacuumSQLite(conn *sql.DB, path string) (CompactResult, error) {
|
||||||
|
res := CompactResult{Path: path, Backend: "sqlite", Before: fileSizeOf(path)}
|
||||||
|
// Fold the WAL back into the main file first. Without it the pages freed by a
|
||||||
|
// recent DELETE can still be sitting in the -wal, and the vacuum reports a
|
||||||
|
// saving the file on disk does not show.
|
||||||
|
if _, err := conn.ExecContext(a.ctx, "PRAGMA wal_checkpoint(TRUNCATE)"); err != nil {
|
||||||
|
applog.Printf("compact: wal checkpoint on %s: %v", path, err)
|
||||||
|
}
|
||||||
|
if _, err := conn.ExecContext(a.ctx, "VACUUM"); err != nil {
|
||||||
|
return res, fmt.Errorf("vacuum: %w", err)
|
||||||
|
}
|
||||||
|
res.After = fileSizeOf(path)
|
||||||
|
applog.Printf("compact: %s %d → %d bytes", path, res.Before, res.After)
|
||||||
|
return res, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// fileSizeOf returns a file's size, or 0 if it cannot be read.
|
||||||
|
func fileSizeOf(path string) int64 {
|
||||||
|
if strings.TrimSpace(path) == "" {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
fi, err := os.Stat(path)
|
||||||
|
if err != nil {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
return fi.Size()
|
||||||
|
}
|
||||||
+122
@@ -0,0 +1,122 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
// Panadapter auto-zoom on a spot click.
|
||||||
|
//
|
||||||
|
// A CW signal is 100 Hz wide, an FT8 slot 50 Hz in a 3 kHz sub-band, an SSB
|
||||||
|
// station 2.7 kHz. One panadapter width cannot serve all three: at 200 kHz the
|
||||||
|
// CW station you clicked is a hair, and at 25 kHz an FT8 window shows one
|
||||||
|
// eighth of the traffic. So the width follows the MODE of the spot, which is
|
||||||
|
// the only thing that determines how much spectrum is worth looking at.
|
||||||
|
//
|
||||||
|
// The command is SmartSDR's own: "display pan s <pan> bandwidth=<MHz>", with an
|
||||||
|
// optional re-centre. Same approach as DXHunter, which is where the defaults
|
||||||
|
// below come from.
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"hamlog/internal/cat"
|
||||||
|
)
|
||||||
|
|
||||||
|
const keyFlexZoom = "flex.spot_zoom"
|
||||||
|
|
||||||
|
// FlexZoomSettings is the per-mode-group visible width, in kHz.
|
||||||
|
//
|
||||||
|
// kHz and not MHz: an operator thinks "25 kHz of CW", and a form asking for
|
||||||
|
// 0.025 invites a zero too many — which on a panadapter is not an error message
|
||||||
|
// but a display that has silently gone somewhere else.
|
||||||
|
type FlexZoomSettings struct {
|
||||||
|
Enabled bool `json:"enabled"`
|
||||||
|
CWkHz int `json:"cw_khz"`
|
||||||
|
SSBkHz int `json:"ssb_khz"`
|
||||||
|
DigikHz int `json:"digi_khz"`
|
||||||
|
// Centre re-centres the panadapter on EVERY spot, not just the ones that
|
||||||
|
// would otherwise fall outside the new window — the display always follows.
|
||||||
|
// Off by default: an operator who has arranged their window around a run
|
||||||
|
// frequency does not necessarily want it moved every time they look at
|
||||||
|
// someone else, and a spot already on screen stays where it is either way.
|
||||||
|
Centre bool `json:"centre"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// defaultFlexZoom — the widths DXHunter settled on, in kHz.
|
||||||
|
var defaultFlexZoom = FlexZoomSettings{Enabled: false, CWkHz: 25, SSBkHz: 200, DigikHz: 50, Centre: false}
|
||||||
|
|
||||||
|
// flexZoomGroup maps a spot's mode to the three widths worth distinguishing.
|
||||||
|
//
|
||||||
|
// The mode arrives as whatever the cluster comment implied — "CW", "FT8",
|
||||||
|
// "USB", "RTTY" — so this takes the ADIF-ish name, not the Flex one. Anything
|
||||||
|
// unrecognised is digital, which is the safe end: a 50 kHz window is readable
|
||||||
|
// for every mode, where 25 kHz is not.
|
||||||
|
func flexZoomGroup(mode string) string {
|
||||||
|
switch strings.ToUpper(strings.TrimSpace(mode)) {
|
||||||
|
case "CW", "CWR", "CWL", "CWU":
|
||||||
|
return "cw"
|
||||||
|
case "SSB", "USB", "LSB", "AM", "FM", "NFM", "DFM", "SAM", "PHONE", "DV":
|
||||||
|
return "ssb"
|
||||||
|
}
|
||||||
|
return "digi"
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetFlexZoom returns the settings, defaults included.
|
||||||
|
func (a *App) GetFlexZoom() FlexZoomSettings {
|
||||||
|
out := defaultFlexZoom
|
||||||
|
if raw := a.settingOr(keyFlexZoom, ""); raw != "" {
|
||||||
|
var s FlexZoomSettings
|
||||||
|
if err := json.Unmarshal([]byte(raw), &s); err == nil {
|
||||||
|
out = normFlexZoom(s)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
// normFlexZoom clamps the widths to something a panadapter can actually show.
|
||||||
|
// 1 kHz is narrower than most filters; 14 MHz is a whole HF spectrum.
|
||||||
|
func normFlexZoom(s FlexZoomSettings) FlexZoomSettings {
|
||||||
|
clamp := func(v, def int) int {
|
||||||
|
if v < 1 || v > 14000 {
|
||||||
|
return def
|
||||||
|
}
|
||||||
|
return v
|
||||||
|
}
|
||||||
|
s.CWkHz = clamp(s.CWkHz, defaultFlexZoom.CWkHz)
|
||||||
|
s.SSBkHz = clamp(s.SSBkHz, defaultFlexZoom.SSBkHz)
|
||||||
|
s.DigikHz = clamp(s.DigikHz, defaultFlexZoom.DigikHz)
|
||||||
|
return s
|
||||||
|
}
|
||||||
|
|
||||||
|
// SaveFlexZoom persists the settings.
|
||||||
|
func (a *App) SaveFlexZoom(s FlexZoomSettings) error {
|
||||||
|
b, err := json.Marshal(normFlexZoom(s))
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
a.setSetting(keyFlexZoom, string(b))
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// FlexZoomForSpot resizes the panadapter for a spot that was just clicked.
|
||||||
|
//
|
||||||
|
// Called from the click handler, AFTER the rig has been tuned: the zoom is a
|
||||||
|
// view change and must never delay the frequency change an operator is waiting
|
||||||
|
// for. Does nothing at all unless the option is on and the backend is a Flex —
|
||||||
|
// no other radio has a panadapter to zoom.
|
||||||
|
func (a *App) FlexZoomForSpot(mode string, freqHz int64) {
|
||||||
|
if a.cat == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
z := a.GetFlexZoom()
|
||||||
|
if !z.Enabled {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
khz := z.DigikHz
|
||||||
|
switch flexZoomGroup(mode) {
|
||||||
|
case "cw":
|
||||||
|
khz = z.CWkHz
|
||||||
|
case "ssb":
|
||||||
|
khz = z.SSBkHz
|
||||||
|
}
|
||||||
|
_ = a.cat.FlexDo(func(fc cat.FlexController) error {
|
||||||
|
return fc.ZoomPan(float64(khz)/1000, float64(freqHz)/1e6, z.Centre)
|
||||||
|
})
|
||||||
|
}
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
// The width follows the mode, and an unrecognised mode must land on the widest
|
||||||
|
// of the three: a 50 kHz window is readable for everything, where 25 kHz shows
|
||||||
|
// one eighth of an FT8 sub-band.
|
||||||
|
func TestFlexZoomGroup(t *testing.T) {
|
||||||
|
for mode, want := range map[string]string{
|
||||||
|
"CW": "cw", "cw": "cw", "CWR": "cw",
|
||||||
|
"SSB": "ssb", "USB": "ssb", "LSB": "ssb", "FM": "ssb", "AM": "ssb",
|
||||||
|
"FT8": "digi", "FT4": "digi", "RTTY": "digi", "JS8": "digi", "PSK31": "digi",
|
||||||
|
"": "digi", "something new": "digi",
|
||||||
|
} {
|
||||||
|
if got := flexZoomGroup(mode); got != want {
|
||||||
|
t.Errorf("flexZoomGroup(%q) = %q, want %q", mode, got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A width of zero would command "bandwidth=0.000000" and take the panadapter
|
||||||
|
// somewhere the operator cannot get back from by eye.
|
||||||
|
func TestNormFlexZoomClamps(t *testing.T) {
|
||||||
|
got := normFlexZoom(FlexZoomSettings{CWkHz: 0, SSBkHz: -5, DigikHz: 99999})
|
||||||
|
if got.CWkHz != defaultFlexZoom.CWkHz || got.SSBkHz != defaultFlexZoom.SSBkHz || got.DigikHz != defaultFlexZoom.DigikHz {
|
||||||
|
t.Errorf("out-of-range widths not replaced by the defaults: %+v", got)
|
||||||
|
}
|
||||||
|
ok := normFlexZoom(FlexZoomSettings{CWkHz: 10, SSBkHz: 150, DigikHz: 40})
|
||||||
|
if ok.CWkHz != 10 || ok.SSBkHz != 150 || ok.DigikHz != 40 {
|
||||||
|
t.Errorf("valid widths must be kept as they are: %+v", ok)
|
||||||
|
}
|
||||||
|
}
|
||||||
+1183
-156
File diff suppressed because it is too large
Load Diff
@@ -1,4 +1,4 @@
|
|||||||
import { useCallback, useEffect, useMemo, useState } from 'react';
|
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
||||||
import { Bell, Plus, Trash2, Volume2, Mail, Eye, X, Search } from 'lucide-react';
|
import { Bell, Plus, Trash2, Volume2, Mail, Eye, X, Search } from 'lucide-react';
|
||||||
import {
|
import {
|
||||||
Dialog, DialogContent, DialogHeader, DialogTitle, DialogDescription,
|
Dialog, DialogContent, DialogHeader, DialogTitle, DialogDescription,
|
||||||
@@ -102,17 +102,40 @@ export function AlertsModal({ onClose, bands, modes, countries }: {
|
|||||||
return alerts.Rule.createFrom({ ...d, [key]: next });
|
return alerts.Rule.createFrom({ ...d, [key]: next });
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Saving used to be silent: the dialog stays open and the rule looks exactly
|
||||||
|
// as it did a second earlier, so there was nothing to tell an operator whether
|
||||||
|
// the click had registered. A line that says so, and clears itself.
|
||||||
|
const [savedMsg, setSavedMsg] = useState('');
|
||||||
|
const savedTimer = useRef(0);
|
||||||
|
function flashSaved(text: string) {
|
||||||
|
setSavedMsg(text);
|
||||||
|
window.clearTimeout(savedTimer.current);
|
||||||
|
savedTimer.current = window.setTimeout(() => setSavedMsg(''), 3000);
|
||||||
|
}
|
||||||
|
useEffect(() => () => window.clearTimeout(savedTimer.current), []);
|
||||||
|
|
||||||
async function save() {
|
async function save() {
|
||||||
if (!draft) return;
|
if (!draft) return;
|
||||||
if (!draft.name.trim()) { setErr(t('altm.giveName')); return; }
|
if (!draft.name.trim()) { setErr(t('altm.giveName')); return; }
|
||||||
try { const saved = await SaveAlertRule(draft); await refresh(); loadDraft(saved as Rule); setErr(''); }
|
try {
|
||||||
catch (e: any) { setErr(String(e?.message ?? e)); }
|
const saved = await SaveAlertRule(draft);
|
||||||
|
await refresh();
|
||||||
|
loadDraft(saved as Rule);
|
||||||
|
setErr('');
|
||||||
|
flashSaved(t('altm.saved', { name: draft.name.trim() }));
|
||||||
|
} catch (e: any) { setErr(String(e?.message ?? e)); }
|
||||||
}
|
}
|
||||||
async function del() {
|
async function del() {
|
||||||
if (!draft) return;
|
if (!draft) return;
|
||||||
if (!draft.id) { loadDraft(null); return; }
|
if (!draft.id) { loadDraft(null); return; }
|
||||||
if (!window.confirm(t('altm.deleteConfirm', { name: draft.name }))) return;
|
if (!window.confirm(t('altm.deleteConfirm', { name: draft.name }))) return;
|
||||||
try { await DeleteAlertRule(draft.id); loadDraft(null); await refresh(); }
|
try {
|
||||||
|
const name = draft.name;
|
||||||
|
await DeleteAlertRule(draft.id);
|
||||||
|
loadDraft(null);
|
||||||
|
await refresh();
|
||||||
|
flashSaved(t('altm.deleted', { name }));
|
||||||
|
}
|
||||||
catch (e: any) { setErr(String(e?.message ?? e)); }
|
catch (e: any) { setErr(String(e?.message ?? e)); }
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -257,6 +280,7 @@ export function AlertsModal({ onClose, bands, modes, countries }: {
|
|||||||
{/* Editor actions */}
|
{/* Editor actions */}
|
||||||
<div className="flex items-center gap-2 px-3 py-2 border-t border-border/60">
|
<div className="flex items-center gap-2 px-3 py-2 border-t border-border/60">
|
||||||
{err && <span className="text-[11px] text-danger flex-1 truncate">{err}</span>}
|
{err && <span className="text-[11px] text-danger flex-1 truncate">{err}</span>}
|
||||||
|
{!err && savedMsg && <span className="text-[11px] text-success flex-1 truncate">{savedMsg}</span>}
|
||||||
<div className="flex-1" />
|
<div className="flex-1" />
|
||||||
<Button variant="ghost" size="sm" className="text-danger" onClick={del}><Trash2 className="size-3.5" /> {t('altm.delete')}</Button>
|
<Button variant="ghost" size="sm" className="text-danger" onClick={del}><Trash2 className="size-3.5" /> {t('altm.delete')}</Button>
|
||||||
<Button size="sm" onClick={save}>{t('altm.saveRule')}</Button>
|
<Button size="sm" onClick={save}>{t('altm.saveRule')}</Button>
|
||||||
|
|||||||
@@ -1,9 +1,13 @@
|
|||||||
import { useEffect, useState } from 'react';
|
import { useEffect, useState } from 'react';
|
||||||
import { GetRowColors, SaveRowColors } from '../../wailsjs/go/main/App';
|
import { GetMatrixColors, GetRowColors, SaveMatrixColors, SaveRowColors } from '../../wailsjs/go/main/App';
|
||||||
import { Checkbox } from '@/components/ui/checkbox';
|
import { Checkbox } from '@/components/ui/checkbox';
|
||||||
import { useI18n } from '@/lib/i18n';
|
import { useI18n } from '@/lib/i18n';
|
||||||
import { cn } from '@/lib/utils';
|
import { cn } from '@/lib/utils';
|
||||||
import type { RowColorSettings } from '@/lib/rowColors';
|
import type { RowColorSettings } from '@/lib/rowColors';
|
||||||
|
import {
|
||||||
|
MATRIX_VARS, applyMatrixColors, effectiveMatrixColor, emptyMatrixColors,
|
||||||
|
type MatrixColors,
|
||||||
|
} from '@/lib/matrixColors';
|
||||||
|
|
||||||
// A fixed palette plus a free picker. Muted values on purpose: they are
|
// A fixed palette plus a free picker. Muted values on purpose: they are
|
||||||
// composited at low opacity over a dark grid, where a saturated colour reads as
|
// composited at low opacity over a dark grid, where a saturated colour reads as
|
||||||
@@ -30,6 +34,111 @@ const CHANNEL_LABELS: Record<string, string> = {
|
|||||||
qsl: 'appr.chQsl', lotw: 'LoTW', eqsl: 'eQSL', qrz: 'QRZ.com',
|
qsl: 'appr.chQsl', lotw: 'LoTW', eqsl: 'eQSL', qrz: 'QRZ.com',
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// MatrixColorsSection recolours the band/mode matrix — the PH/CW/DIG grid in the
|
||||||
|
// Stats panel.
|
||||||
|
//
|
||||||
|
// The pickers are seeded from what the matrix is painting RIGHT NOW (the active
|
||||||
|
// theme's ramp, or an existing override), not from a fixed palette: the operator
|
||||||
|
// starts from the colours in front of them and moves one, instead of being
|
||||||
|
// handed six values that may belong to a theme they stopped using. Every change
|
||||||
|
// is applied to the live document at once, so the sample row below is the real
|
||||||
|
// thing rather than a mock-up of it.
|
||||||
|
function MatrixColorsSection() {
|
||||||
|
const { t } = useI18n();
|
||||||
|
const [cfg, setCfg] = useState<MatrixColors | null>(null);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
(async () => {
|
||||||
|
try {
|
||||||
|
setCfg((await GetMatrixColors()) as any);
|
||||||
|
} catch {
|
||||||
|
setCfg(emptyMatrixColors());
|
||||||
|
}
|
||||||
|
})();
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const save = (next: MatrixColors) => {
|
||||||
|
setCfg(next);
|
||||||
|
applyMatrixColors(next); // live, before the round trip — the panel must not lag the choice
|
||||||
|
SaveMatrixColors(next as any).catch(() => {});
|
||||||
|
};
|
||||||
|
|
||||||
|
// Turning it ON with nothing stored would change nothing at all and read as a
|
||||||
|
// broken switch, so the empty slots are filled from the theme's current ramp:
|
||||||
|
// the operator sees six swatches that match the grid and edits from there.
|
||||||
|
const enable = (on: boolean) => {
|
||||||
|
if (!cfg) return;
|
||||||
|
if (!on) {
|
||||||
|
save({ ...cfg, enabled: false });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const seeded = { ...cfg, enabled: true };
|
||||||
|
for (const { key, cssVar } of MATRIX_VARS) {
|
||||||
|
if (!String(seeded[key] ?? '').trim()) seeded[key] = effectiveMatrixColor(cssVar);
|
||||||
|
}
|
||||||
|
save(seeded);
|
||||||
|
};
|
||||||
|
|
||||||
|
// Reset clears the overrides but keeps the section switched on, then re-seeds
|
||||||
|
// from the theme — "back to the theme's colours", which is what an operator
|
||||||
|
// means by reset here, rather than "switch the whole feature off".
|
||||||
|
const reset = () => {
|
||||||
|
if (!cfg) return;
|
||||||
|
applyMatrixColors({ ...emptyMatrixColors(), enabled: false });
|
||||||
|
const seeded = { ...emptyMatrixColors(), enabled: true };
|
||||||
|
for (const { key, cssVar } of MATRIX_VARS) seeded[key] = effectiveMatrixColor(cssVar);
|
||||||
|
save(seeded);
|
||||||
|
};
|
||||||
|
|
||||||
|
if (!cfg) return null;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="space-y-3 border-t border-border/60 pt-4">
|
||||||
|
<label className="flex items-start gap-2 text-sm cursor-pointer">
|
||||||
|
<Checkbox checked={cfg.enabled} className="mt-0.5" onCheckedChange={(c) => enable(!!c)} />
|
||||||
|
<span>
|
||||||
|
{t('appr.matrixEnable')}{' '}
|
||||||
|
<span className="text-xs text-muted-foreground">{t('appr.matrixHint')}</span>
|
||||||
|
</span>
|
||||||
|
</label>
|
||||||
|
|
||||||
|
{cfg.enabled && (
|
||||||
|
<div className="space-y-3">
|
||||||
|
<div className="grid grid-cols-2 gap-x-4 gap-y-2">
|
||||||
|
{MATRIX_VARS.map(({ key, cssVar, label }) => (
|
||||||
|
<label key={key} className="flex items-center gap-2 text-sm cursor-pointer">
|
||||||
|
<input
|
||||||
|
type="color"
|
||||||
|
value={String(cfg[key] || '').trim() || effectiveMatrixColor(cssVar)}
|
||||||
|
onChange={(e) => save({ ...cfg, [key]: e.target.value })}
|
||||||
|
className="size-6 rounded-md border border-border bg-transparent p-0 cursor-pointer shrink-0"
|
||||||
|
/>
|
||||||
|
{t(label)}
|
||||||
|
</label>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* The matrix as it will actually look: same tokens, same shapes. */}
|
||||||
|
<div className="flex items-center gap-1.5">
|
||||||
|
<span className="text-xs text-muted-foreground w-10 shrink-0">{t('appr.matrixSample')}</span>
|
||||||
|
<span className="inline-block w-7 h-5 rounded bg-mx-call-conf" />
|
||||||
|
<span className="inline-block w-7 h-5 rounded bg-mx-call-work" />
|
||||||
|
<span className="inline-block w-7 h-5 rounded bg-mx-dx-conf" />
|
||||||
|
<span className="inline-block w-7 h-5 rounded bg-mx-dx-work" />
|
||||||
|
<span className="inline-block w-7 h-5 rounded bg-mx-none" />
|
||||||
|
<span className="inline-block w-7 h-5 rounded bg-mx-none ring-2 ring-mx-cur ring-inset" />
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<button type="button" onClick={reset}
|
||||||
|
className="text-xs text-muted-foreground underline underline-offset-2 hover:text-foreground">
|
||||||
|
{t('appr.matrixReset')}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
export function AppearancePanel() {
|
export function AppearancePanel() {
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const [cfg, setCfg] = useState<RowColorSettings | null>(null);
|
const [cfg, setCfg] = useState<RowColorSettings | null>(null);
|
||||||
@@ -70,6 +179,31 @@ export function AppearancePanel() {
|
|||||||
<span>{t('appr.bandmapLotw')} <span className="text-xs text-muted-foreground">{t('appr.bandmapLotwHint')}</span></span>
|
<span>{t('appr.bandmapLotw')} <span className="text-xs text-muted-foreground">{t('appr.bandmapLotwHint')}</span></span>
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
|
{/* Banding is its own thing, above the QSL rules and outside them: it says
|
||||||
|
nothing about a contact, it only helps the eye keep its line across a
|
||||||
|
wide table. Turning the status colours off must not take it away. */}
|
||||||
|
<div className="space-y-2">
|
||||||
|
<label className="flex items-start gap-2 text-sm cursor-pointer">
|
||||||
|
<Checkbox checked={(cfg as any).recent_zebra !== 'off'} className="mt-0.5"
|
||||||
|
onCheckedChange={(c) => save({ ...cfg, recent_zebra: c ? '' : 'off' } as any)} />
|
||||||
|
<span>{t('appr.zebra')} <span className="text-xs text-muted-foreground">{t('appr.zebraHint')}</span></span>
|
||||||
|
</label>
|
||||||
|
{(cfg as any).recent_zebra !== 'off' && (
|
||||||
|
<div className="flex items-center gap-2 pl-6">
|
||||||
|
<span className="text-xs text-muted-foreground">{t('appr.zebraColor')}</span>
|
||||||
|
<input type="color" className="size-7 rounded border border-border bg-transparent p-0 cursor-pointer"
|
||||||
|
value={/^#[0-9a-fA-F]{6}$/.test((cfg as any).recent_zebra_color ?? '') ? (cfg as any).recent_zebra_color : '#808080'}
|
||||||
|
onChange={(e) => save({ ...cfg, recent_zebra_color: e.target.value } as any)} />
|
||||||
|
{/* Empty means "follow the theme", and there has to be a way back to
|
||||||
|
it — a colour chosen under one theme is wrong under the other. */}
|
||||||
|
{(cfg as any).recent_zebra_color && (
|
||||||
|
<button type="button" className="text-xs text-muted-foreground hover:text-foreground"
|
||||||
|
onClick={() => save({ ...cfg, recent_zebra_color: '' } as any)}>{t('appr.zebraAuto')}</button>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
<label className="flex items-start gap-2 text-sm cursor-pointer">
|
<label className="flex items-start gap-2 text-sm cursor-pointer">
|
||||||
<Checkbox checked={cfg.enabled} className="mt-0.5"
|
<Checkbox checked={cfg.enabled} className="mt-0.5"
|
||||||
onCheckedChange={(c) => save({ ...cfg, enabled: !!c })} />
|
onCheckedChange={(c) => save({ ...cfg, enabled: !!c })} />
|
||||||
@@ -148,6 +282,8 @@ export function AppearancePanel() {
|
|||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
<MatrixColorsSection />
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import { useI18n } from '@/lib/i18n';
|
|||||||
import {
|
import {
|
||||||
GetAwardDefs, SaveAwardDefs, ResetAwardDefs, AwardFields,
|
GetAwardDefs, SaveAwardDefs, ResetAwardDefs, AwardFields,
|
||||||
GetAwardReferenceMeta, UpdateAwardReferenceList,
|
GetAwardReferenceMeta, UpdateAwardReferenceList,
|
||||||
ListAwardReferences, SearchAwardReferences, SaveAwardReference, DeleteAwardReference,
|
ListAwardReferences, SearchAwardReferences, SaveAwardReference, DeleteAwardReference, RenameAwardReference,
|
||||||
ImportAwardReferencesText, GetAwardPresets, ApplyAwardPreset,
|
ImportAwardReferencesText, GetAwardPresets, ApplyAwardPreset,
|
||||||
ListCountries, DXCCForCountry, DXCCName,
|
ListCountries, DXCCForCountry, DXCCName,
|
||||||
PopulateBuiltinReferences, HasBuiltinReferences,
|
PopulateBuiltinReferences, HasBuiltinReferences,
|
||||||
@@ -62,6 +62,10 @@ type Preset = { key: string; name: string; field: string; dxcc: number; refs: Aw
|
|||||||
// organizational only; matching is driven by the field/pattern/dynamic options,
|
// organizational only; matching is driven by the field/pattern/dynamic options,
|
||||||
// so there's no need for separate GRID/DXCC types (use QSOFIELDS + the field).
|
// so there's no need for separate GRID/DXCC types (use QSOFIELDS + the field).
|
||||||
const AWARD_TYPES = ['REFERENCE', 'QSOFIELDS', 'CALLSIGN'];
|
const AWARD_TYPES = ['REFERENCE', 'QSOFIELDS', 'CALLSIGN'];
|
||||||
|
// Sentinel for "no QSO field at all". The definition stores an empty field, and
|
||||||
|
// the matcher already treats that as "nothing to scan" — this only gives the
|
||||||
|
// operator a way to ASK for it.
|
||||||
|
const NO_FIELD = '__none__';
|
||||||
const CONFIRM_SRC = [
|
const CONFIRM_SRC = [
|
||||||
{ id: 'lotw', label: 'LoTW' }, { id: 'qsl', label: 'QSL' }, { id: 'eqsl', label: 'eQSL' },
|
{ id: 'lotw', label: 'LoTW' }, { id: 'qsl', label: 'QSL' }, { id: 'eqsl', label: 'eQSL' },
|
||||||
{ id: 'qrzcom', label: 'QRZ.com' }, { id: 'custom', label: 'Custom' },
|
{ id: 'qrzcom', label: 'QRZ.com' }, { id: 'custom', label: 'Custom' },
|
||||||
@@ -277,6 +281,7 @@ export function AwardEditor({ open, onClose, onSaved }: Props) {
|
|||||||
}
|
}
|
||||||
return groups;
|
return groups;
|
||||||
}, [testRows]);
|
}, [testRows]);
|
||||||
|
const noField = !String(cur?.field ?? '').trim();
|
||||||
const patch = (p: Partial<AwardDef>) => setDefs((ds) => ds.map((d, j) => (j === sel ? { ...d, ...p } : d)));
|
const patch = (p: Partial<AwardDef>) => setDefs((ds) => ds.map((d, j) => (j === sel ? { ...d, ...p } : d)));
|
||||||
const toggleIn = (key: keyof AwardDef, v: string) => {
|
const toggleIn = (key: keyof AwardDef, v: string) => {
|
||||||
const arr = ((cur?.[key] as string[]) ?? []);
|
const arr = ((cur?.[key] as string[]) ?? []);
|
||||||
@@ -566,11 +571,30 @@ export function AwardEditor({ open, onClose, onSaved }: Props) {
|
|||||||
<div className="border-t pt-2.5 mt-1 space-y-2.5">
|
<div className="border-t pt-2.5 mt-1 space-y-2.5">
|
||||||
<p className="text-[11px] text-muted-foreground">{t('awed.qsoParams')}</p>
|
<p className="text-[11px] text-muted-foreground">{t('awed.qsoParams')}</p>
|
||||||
<Field2 label={t('awed.searchInField')}>
|
<Field2 label={t('awed.searchInField')}>
|
||||||
<Select value={cur.field} onValueChange={(v) => patch({ field: v })}>
|
{/* NO_FIELD is a sentinel because the stored value is the
|
||||||
|
empty string and a Select cannot carry one — an empty
|
||||||
|
item value means "show the placeholder" to Radix. */}
|
||||||
|
{/* Picking "no field" clears the fallbacks too: it promises that
|
||||||
|
nothing is matched automatically, and an OR rule left behind goes
|
||||||
|
on scanning its own field — worse than a visible one, because the
|
||||||
|
panel stops showing it. */}
|
||||||
|
<Select value={cur.field || NO_FIELD}
|
||||||
|
onValueChange={(v) => patch(v === NO_FIELD ? { field: '', or_rules: [] } : { field: v })}>
|
||||||
<SelectTrigger className="h-8 text-xs w-56"><SelectValue /></SelectTrigger>
|
<SelectTrigger className="h-8 text-xs w-56"><SelectValue /></SelectTrigger>
|
||||||
<SelectContent className="max-h-72">{fields.map((f) => <SelectItem key={f} value={f}>{f}</SelectItem>)}</SelectContent>
|
<SelectContent className="max-h-72">
|
||||||
|
<SelectItem value={NO_FIELD}>{t('awed.fieldNone')}</SelectItem>
|
||||||
|
{fields.map((f) => <SelectItem key={f} value={f}>{f}</SelectItem>)}
|
||||||
|
</SelectContent>
|
||||||
</Select>
|
</Select>
|
||||||
</Field2>
|
</Field2>
|
||||||
|
{/* An award whose references live in no ADIF field at all —
|
||||||
|
WWBOTA has no column anywhere — has nothing to match on,
|
||||||
|
and every control below would be a question with no
|
||||||
|
answer. Hiding them is the point: the references are the
|
||||||
|
ones the operator assigns to a QSO by hand. */}
|
||||||
|
{noField ? (
|
||||||
|
<p className="text-[11px] text-muted-foreground pl-[128px]">{t('awed.fieldNoneHint')}</p>
|
||||||
|
) : (<>
|
||||||
<Field2 label={t('awed.matchBy')}>
|
<Field2 label={t('awed.matchBy')}>
|
||||||
<div className="flex items-center gap-3 text-xs">
|
<div className="flex items-center gap-3 text-xs">
|
||||||
{['code', 'description', 'pattern'].map((m) => (
|
{['code', 'description', 'pattern'].map((m) => (
|
||||||
@@ -589,10 +613,17 @@ export function AwardEditor({ open, onClose, onSaved }: Props) {
|
|||||||
<Field2 label={t('awed.prefix')}><Input className="h-8 font-mono text-xs" value={cur.prefix ?? ''} onChange={(e) => patch({ prefix: e.target.value })} placeholder={t('awed.prefixPlaceholder')} title={t('awed.prefixTitle')} /></Field2>
|
<Field2 label={t('awed.prefix')}><Input className="h-8 font-mono text-xs" value={cur.prefix ?? ''} onChange={(e) => patch({ prefix: e.target.value })} placeholder={t('awed.prefixPlaceholder')} title={t('awed.prefixTitle')} /></Field2>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
</>)}
|
||||||
{/* Fallback searches: tried in order, only while nothing
|
{/* Fallback searches: tried in order, only while nothing
|
||||||
has matched yet — the first that hits wins (short-circuit),
|
has matched yet — the first that hits wins (short-circuit),
|
||||||
so a value already resolved by the primary rule isn't
|
so a value already resolved by the primary rule isn't
|
||||||
re-derived differently by a later one. */}
|
re-derived differently by a later one.
|
||||||
|
|
||||||
|
Shown even with no field when rules survive from an
|
||||||
|
imported definition: a rule that still runs must still
|
||||||
|
be visible, or the award finds references the panel
|
||||||
|
says it cannot. */}
|
||||||
|
{(!noField || (cur.or_rules?.length ?? 0) > 0) && (
|
||||||
<div className="border-t pt-2.5 space-y-2">
|
<div className="border-t pt-2.5 space-y-2">
|
||||||
<div className="flex items-center justify-between">
|
<div className="flex items-center justify-between">
|
||||||
<p className="text-[11px] text-muted-foreground">{t('awed.additionalSearches')} <span className="font-semibold">(OR)</span> {t('awed.orAlsoMatch')}</p>
|
<p className="text-[11px] text-muted-foreground">{t('awed.additionalSearches')} <span className="font-semibold">(OR)</span> {t('awed.orAlsoMatch')}</p>
|
||||||
@@ -630,6 +661,7 @@ export function AwardEditor({ open, onClose, onSaved }: Props) {
|
|||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
</div>
|
</div>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
</TabsContent>
|
</TabsContent>
|
||||||
|
|
||||||
@@ -915,6 +947,10 @@ function ReferencesPanel({ code, presets, meta, awardValidFrom, awardValidTo, on
|
|||||||
const [refs, setRefs] = useState<AwardRef[]>([]);
|
const [refs, setRefs] = useState<AwardRef[]>([]);
|
||||||
const [q, setQ] = useState('');
|
const [q, setQ] = useState('');
|
||||||
const [selCode, setSelCode] = useState<string | null>(null);
|
const [selCode, setSelCode] = useState<string | null>(null);
|
||||||
|
// The code as TYPED. The list and every patch key off selCode, so editing the
|
||||||
|
// code in place would make the editor lose the reference mid-edit; the draft
|
||||||
|
// is applied as a rename when the operator saves.
|
||||||
|
const [codeDraft, setCodeDraft] = useState('');
|
||||||
const [busy, setBusy] = useState(false);
|
const [busy, setBusy] = useState(false);
|
||||||
const [bulk, setBulk] = useState('');
|
const [bulk, setBulk] = useState('');
|
||||||
const [showBulk, setShowBulk] = useState(false);
|
const [showBulk, setShowBulk] = useState(false);
|
||||||
@@ -952,6 +988,7 @@ function ReferencesPanel({ code, presets, meta, awardValidFrom, awardValidTo, on
|
|||||||
}
|
}
|
||||||
|
|
||||||
const sel = refs.find((r) => r.code === selCode) || null;
|
const sel = refs.find((r) => r.code === selCode) || null;
|
||||||
|
useEffect(() => { setCodeDraft(selCode ?? ''); }, [selCode]);
|
||||||
// Large lists are already filtered by the server; small lists filter locally.
|
// Large lists are already filtered by the server; small lists filter locally.
|
||||||
const filtered = useMemo(() => {
|
const filtered = useMemo(() => {
|
||||||
if (large) return refs;
|
if (large) return refs;
|
||||||
@@ -965,6 +1002,27 @@ function ReferencesPanel({ code, presets, meta, awardValidFrom, awardValidTo, on
|
|||||||
try { await SaveAwardReference(code, r as any); load(); onChanged(); }
|
try { await SaveAwardReference(code, r as any); load(); onChanged(); }
|
||||||
catch (e: any) { setErr(String(e?.message ?? e)); }
|
catch (e: any) { setErr(String(e?.message ?? e)); }
|
||||||
}
|
}
|
||||||
|
// Save the selected reference, renumbering it first when the code was edited.
|
||||||
|
//
|
||||||
|
// The rename has to come first and has to be a rename: saving under the new
|
||||||
|
// code would simply create a second reference and leave the old one behind,
|
||||||
|
// which is how a list quietly grows duplicates.
|
||||||
|
async function saveSelected(r: AwardRef) {
|
||||||
|
const next = codeDraft.trim().toUpperCase();
|
||||||
|
if (!next) { setErr(t('awed.refCodeEmpty')); return; }
|
||||||
|
if (next !== r.code) {
|
||||||
|
try {
|
||||||
|
await RenameAwardReference(code, r.code, next);
|
||||||
|
} catch (e: any) {
|
||||||
|
// Most often the number is already taken by another reference. Said
|
||||||
|
// here rather than swallowed: the save has NOT happened.
|
||||||
|
setErr(String(e?.message ?? e));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
setSelCode(next);
|
||||||
|
}
|
||||||
|
await saveRef({ ...r, code: next });
|
||||||
|
}
|
||||||
async function addRef() {
|
async function addRef() {
|
||||||
const c = prompt(t('awed.newRefCodePrompt'))?.trim().toUpperCase();
|
const c = prompt(t('awed.newRefCodePrompt'))?.trim().toUpperCase();
|
||||||
if (!c) return;
|
if (!c) return;
|
||||||
@@ -1046,7 +1104,13 @@ function ReferencesPanel({ code, presets, meta, awardValidFrom, awardValidTo, on
|
|||||||
) : (
|
) : (
|
||||||
<div className="space-y-2">
|
<div className="space-y-2">
|
||||||
<div className="flex items-center gap-2">
|
<div className="flex items-center gap-2">
|
||||||
<Input className="h-8 w-28 font-mono font-semibold" value={sel.code} readOnly />
|
{/* Editable, because a shipped list can be wrong about it: WAJA
|
||||||
|
went out carrying Japan's civil prefecture numbers instead of
|
||||||
|
the JARL's, and correcting that meant deleting all 47
|
||||||
|
references and importing a new list. */}
|
||||||
|
<Input className="h-8 w-28 font-mono font-semibold" value={codeDraft}
|
||||||
|
title={t('awed.refCodeTip')}
|
||||||
|
onChange={(e) => setCodeDraft(e.target.value)} />
|
||||||
<label className="flex items-center gap-1.5 text-xs cursor-pointer"><Checkbox checked={sel.valid} onCheckedChange={(c) => patchSel({ valid: !!c })} /> {t('awed.valid')}</label>
|
<label className="flex items-center gap-1.5 text-xs cursor-pointer"><Checkbox checked={sel.valid} onCheckedChange={(c) => patchSel({ valid: !!c })} /> {t('awed.valid')}</label>
|
||||||
<div className="flex-1" />
|
<div className="flex-1" />
|
||||||
<button className="text-muted-foreground hover:text-destructive" onClick={() => delRef(sel.code)}><Trash2 className="size-4" /></button>
|
<button className="text-muted-foreground hover:text-destructive" onClick={() => delRef(sel.code)}><Trash2 className="size-4" /></button>
|
||||||
@@ -1084,7 +1148,7 @@ function ReferencesPanel({ code, presets, meta, awardValidFrom, awardValidTo, on
|
|||||||
? t('awed.refValidHintAward', { from: openEnded(awardValidFrom), to: openEnded(awardValidTo) })
|
? t('awed.refValidHintAward', { from: openEnded(awardValidFrom), to: openEnded(awardValidTo) })
|
||||||
: t('awed.refValidHint')}
|
: t('awed.refValidHint')}
|
||||||
</p>
|
</p>
|
||||||
<div className="flex justify-end pt-1"><Button size="sm" className="h-7" onClick={() => sel && saveRef(sel)}><Save className="size-3.5 mr-1" /> {t('awed.saveReference')}</Button></div>
|
<div className="flex justify-end pt-1"><Button size="sm" className="h-7" onClick={() => sel && saveSelected(sel)}><Save className="size-3.5 mr-1" /> {t('awed.saveReference')}</Button></div>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { useEffect, useMemo, useState } from 'react';
|
import { useEffect, useMemo, useState } from 'react';
|
||||||
import { X, Plus, Loader2 } from 'lucide-react';
|
import { X, Plus, Loader2 } from 'lucide-react';
|
||||||
import { SearchAwardReferences, GetAwardDefs, GetAwardReferenceMeta } from '../../wailsjs/go/main/App';
|
import { SearchAwardReferences, GetAwardDefs, GetAwardReferenceMeta, AwardRefsNew } from '../../wailsjs/go/main/App';
|
||||||
import {
|
import {
|
||||||
Select, SelectTrigger, SelectValue, SelectContent, SelectItem,
|
Select, SelectTrigger, SelectValue, SelectContent, SelectItem,
|
||||||
} from '@/components/ui/select';
|
} from '@/components/ui/select';
|
||||||
@@ -54,6 +54,34 @@ export function AwardRefSelector({ dxcc, value, onChange, fieldValues, heightCla
|
|||||||
|
|
||||||
const entries = value ? value.split(';').filter(Boolean) : [];
|
const entries = value ? value.split(';').filter(Boolean) : [];
|
||||||
|
|
||||||
|
// Which of the picked references have never been worked. Asked of the backend
|
||||||
|
// only when the list of references actually changes — a handful of times per
|
||||||
|
// QSO — and it answers from an in-memory set (see awardnew.go).
|
||||||
|
//
|
||||||
|
// The first question about an award may arrive before its set is built, in
|
||||||
|
// which case the answer is "pending" and carries no verdict for it: we ask
|
||||||
|
// again rather than badge on a guess. Attempts are capped so a logbook that
|
||||||
|
// never finishes building cannot leave a timer running for the session.
|
||||||
|
const [isNew, setIsNew] = useState<Record<string, boolean>>({});
|
||||||
|
const entriesKey = entries.join(';');
|
||||||
|
useEffect(() => {
|
||||||
|
if (!entriesKey) { setIsNew({}); return; }
|
||||||
|
let alive = true;
|
||||||
|
let timer: number | undefined;
|
||||||
|
let tries = 0;
|
||||||
|
const ask = () => {
|
||||||
|
AwardRefsNew(entriesKey.split(';'))
|
||||||
|
.then((r: any) => {
|
||||||
|
if (!alive) return;
|
||||||
|
setIsNew(r?.new ?? {});
|
||||||
|
if (r?.pending && ++tries < 10) timer = window.setTimeout(ask, 700);
|
||||||
|
})
|
||||||
|
.catch(() => { if (alive) setIsNew({}); }); // no badge beats a wrong one
|
||||||
|
};
|
||||||
|
ask();
|
||||||
|
return () => { alive = false; if (timer) window.clearTimeout(timer); };
|
||||||
|
}, [entriesKey]);
|
||||||
|
|
||||||
// When the reference set is cleared (a QSO was logged or the call was reset),
|
// When the reference set is cleared (a QSO was logged or the call was reset),
|
||||||
// also blank the picker's own state — the search box and the highlighted /
|
// also blank the picker's own state — the search box and the highlighted /
|
||||||
// selected reference — so the Awards tab starts fresh for the next contact.
|
// selected reference — so the Awards tab starts fresh for the next contact.
|
||||||
@@ -256,7 +284,16 @@ export function AwardRefSelector({ dxcc, value, onChange, fieldValues, heightCla
|
|||||||
}`}
|
}`}
|
||||||
onClick={() => setSelectedEntry(selectedEntry === entry ? null : entry)}
|
onClick={() => setSelectedEntry(selectedEntry === entry ? null : entry)}
|
||||||
>
|
>
|
||||||
<span className="font-mono font-semibold flex-1 truncate">{entry}</span>
|
<span className="font-mono font-semibold truncate">{entry}</span>
|
||||||
|
{isNew[entry] && (
|
||||||
|
<span
|
||||||
|
title={t('awrs.newRefHint')}
|
||||||
|
className="shrink-0 px-1 rounded-sm text-[9px] leading-[14px] font-semibold tracking-wide bg-success-muted text-success border border-success-border"
|
||||||
|
>
|
||||||
|
{t('awrs.new')}
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
<span className="flex-1" />
|
||||||
<button
|
<button
|
||||||
className="shrink-0 hover:text-destructive"
|
className="shrink-0 hover:text-destructive"
|
||||||
onClick={(e) => { e.stopPropagation(); removeEntry(entry); }}
|
onClick={(e) => { e.stopPropagation(); removeEntry(entry); }}
|
||||||
|
|||||||
@@ -64,9 +64,15 @@ function ProgressBar({ worked, confirmed, total }: { worked: number; confirmed:
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
type AwardListItem = { code: string; name: string; valid?: boolean; bands?: string[]; emission?: string[] };
|
// scoped: the award is limited to one or more DXCC entities. Missing-reference
|
||||||
|
// detection only means anything for those — see the Missing refs button.
|
||||||
|
type AwardListItem = { code: string; name: string; valid?: boolean; bands?: string[]; emission?: string[]; scoped?: boolean };
|
||||||
|
|
||||||
export function AwardsPanel({ onEditQSO, onAwardsChanged }: { onEditQSO?: (id: number) => void; onAwardsChanged?: () => void } = {}) {
|
export function AwardsPanel({ onEditQSO, onAwardsChanged, onPaperQSL }: {
|
||||||
|
onEditQSO?: (id: number) => void;
|
||||||
|
onAwardsChanged?: () => void;
|
||||||
|
onPaperQSL?: (call: string) => void;
|
||||||
|
} = {}) {
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const [awardList, setAwardList] = useState<AwardListItem[]>([]);
|
const [awardList, setAwardList] = useState<AwardListItem[]>([]);
|
||||||
// Computed results are cached per award code — each award is scanned only the
|
// Computed results are cached per award code — each award is scanned only the
|
||||||
@@ -150,7 +156,7 @@ export function AwardsPanel({ onEditQSO, onAwardsChanged }: { onEditQSO?: (id: n
|
|||||||
]);
|
]);
|
||||||
const follow = new Set(tracked);
|
const follow = new Set(tracked);
|
||||||
let list: AwardListItem[] = defs
|
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 ?? [], scoped: (d.dxcc_filter ?? []).length > 0 }))
|
||||||
.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));
|
if (follow.size > 0) list = list.filter((a) => follow.has(a.code));
|
||||||
setAwardList(list);
|
setAwardList(list);
|
||||||
@@ -427,13 +433,21 @@ export function AwardsPanel({ onEditQSO, onAwardsChanged }: { onEditQSO?: (id: n
|
|||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
<span className="text-xs text-muted-foreground">{filteredRefs.length} {t('awp.refs')}</span>
|
<span className="text-xs text-muted-foreground">{filteredRefs.length} {t('awp.refs')}</span>
|
||||||
<button
|
{/* Only for an award scoped to a DXCC entity. "In this award's
|
||||||
onClick={() => setShowMissing(true)}
|
scope but with no reference" needs a scope to be in: on a
|
||||||
className="flex items-center gap-1 text-xs text-warning-muted-foreground hover:text-warning border border-warning-border bg-warning-muted rounded px-2 py-1"
|
worldwide reference award — POTA, SOTA, IOTA, WWFF — every
|
||||||
title={t('awp.missingRefsTitle')}
|
contact anywhere would qualify, so the answer is always none.
|
||||||
>
|
The button used to be there regardless and could only ever
|
||||||
<AlertTriangle className="size-3" /> {t('awp.missingRefs')}
|
open a window saying it had found nothing. */}
|
||||||
</button>
|
{awardList.find((a) => a.code === selected)?.scoped && (
|
||||||
|
<button
|
||||||
|
onClick={() => setShowMissing(true)}
|
||||||
|
className="flex items-center gap-1 text-xs text-warning-muted-foreground hover:text-warning border border-warning-border bg-warning-muted rounded px-2 py-1"
|
||||||
|
title={t('awp.missingRefsTitle')}
|
||||||
|
>
|
||||||
|
<AlertTriangle className="size-3" /> {t('awp.missingRefs')}
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
<div className="flex-1" />
|
<div className="flex-1" />
|
||||||
{/* Legend */}
|
{/* Legend */}
|
||||||
<div className="flex items-center gap-2 text-[10px] text-muted-foreground">
|
<div className="flex items-center gap-2 text-[10px] text-muted-foreground">
|
||||||
@@ -594,7 +608,7 @@ export function AwardsPanel({ onEditQSO, onAwardsChanged }: { onEditQSO?: (id: n
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
{cell && current && (
|
{cell && current && (
|
||||||
<CellQSOModal code={current.code} cell={cell} modeClass={modeFilter === 'all' ? '' : modeFilter} onClose={() => setCell(null)} />
|
<CellQSOModal code={current.code} cell={cell} modeClass={modeFilter === 'all' ? '' : modeFilter} onClose={() => setCell(null)} onPaperQSL={onPaperQSL} />
|
||||||
)}
|
)}
|
||||||
{showMissing && current && (
|
{showMissing && current && (
|
||||||
<MissingQSOModal code={current.code} name={current.name} onClose={() => setShowMissing(false)} onEditQSO={onEditQSO} />
|
<MissingQSOModal code={current.code} name={current.name} onClose={() => setShowMissing(false)} onEditQSO={onEditQSO} />
|
||||||
@@ -608,6 +622,10 @@ export function AwardsPanel({ onEditQSO, onAwardsChanged }: { onEditQSO?: (id: n
|
|||||||
// the missing reference (e.g. a department for DDFM).
|
// the missing reference (e.g. a department for DDFM).
|
||||||
type MissingSortKey = 'qso_date' | 'callsign' | 'band' | 'mode' | 'country' | 'qth';
|
type MissingSortKey = 'qso_date' | 'callsign' | 'band' | 'mode' | 'country' | 'qth';
|
||||||
|
|
||||||
|
// How many references the assign dropdown will put in the DOM at once. Above
|
||||||
|
// this a search box appears beside it and the rest are held back, counted.
|
||||||
|
const REF_MENU_MAX = 300;
|
||||||
|
|
||||||
function MissingQSOModal({ code, name, onClose, onEditQSO }: { code: string; name: string; onClose: () => void; onEditQSO?: (id: number) => void }) {
|
function MissingQSOModal({ code, name, onClose, onEditQSO }: { code: string; name: string; onClose: () => void; onEditQSO?: (id: number) => void }) {
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const [qsos, setQsos] = useState<any[]>([]);
|
const [qsos, setQsos] = useState<any[]>([]);
|
||||||
@@ -616,6 +634,7 @@ function MissingQSOModal({ code, name, onClose, onEditQSO }: { code: string; nam
|
|||||||
const [sortKey, setSortKey] = useState<MissingSortKey>('callsign');
|
const [sortKey, setSortKey] = useState<MissingSortKey>('callsign');
|
||||||
const [sortDir, setSortDir] = useState<'asc' | 'desc'>('asc');
|
const [sortDir, setSortDir] = useState<'asc' | 'desc'>('asc');
|
||||||
const [refs, setRefs] = useState<Array<{ code: string; name: string }>>([]);
|
const [refs, setRefs] = useState<Array<{ code: string; name: string }>>([]);
|
||||||
|
const [refSearch, setRefSearch] = useState('');
|
||||||
const [assignRef, setAssignRef] = useState('');
|
const [assignRef, setAssignRef] = useState('');
|
||||||
const [busy, setBusy] = useState(false);
|
const [busy, setBusy] = useState(false);
|
||||||
const [msg, setMsg] = useState('');
|
const [msg, setMsg] = useState('');
|
||||||
@@ -629,12 +648,38 @@ function MissingQSOModal({ code, name, onClose, onEditQSO }: { code: string; nam
|
|||||||
.finally(() => setLoading(false));
|
.finally(() => setLoading(false));
|
||||||
};
|
};
|
||||||
useEffect(() => { load(); }, [code]);
|
useEffect(() => { load(); }, [code]);
|
||||||
// The award's reference list drives the "assign" dropdown (e.g. China provinces).
|
// The award's reference list drives the "assign" dropdown (e.g. China
|
||||||
|
// provinces) — fetched ONLY once there is something to assign it to.
|
||||||
|
//
|
||||||
|
// Missing-reference detection needs a DXCC scope, so a worldwide award like
|
||||||
|
// POTA always has zero rows here and says so. It was still loading every
|
||||||
|
// reference behind that message: on a log with the full POTA park list
|
||||||
|
// imported, tens of thousands of them, feeding a dropdown that could not be
|
||||||
|
// used for anything. That is the window freezing on a screen with nothing to
|
||||||
|
// offer.
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
if (loading || qsos.length === 0) { setRefs([]); return; }
|
||||||
ListAwardReferences(code)
|
ListAwardReferences(code)
|
||||||
.then((r) => setRefs(((r ?? []) as any[]).map((x) => ({ code: String(x.code).toUpperCase(), name: String(x.name ?? '') }))))
|
.then((r) => setRefs(((r ?? []) as any[]).map((x) => ({ code: String(x.code).toUpperCase(), name: String(x.name ?? '') }))))
|
||||||
.catch(() => setRefs([]));
|
.catch(() => setRefs([]));
|
||||||
}, [code]);
|
}, [code, loading, qsos.length]);
|
||||||
|
|
||||||
|
// What the assign dropdown actually renders. Bounded, and it says how many it
|
||||||
|
// is holding back rather than silently showing the first few hundred.
|
||||||
|
const shownRefs = useMemo(() => {
|
||||||
|
const q = refSearch.trim().toUpperCase();
|
||||||
|
const rows = q
|
||||||
|
? refs.filter((r) => r.code.includes(q) || r.name.toUpperCase().includes(q))
|
||||||
|
: refs;
|
||||||
|
return rows.slice(0, REF_MENU_MAX);
|
||||||
|
}, [refs, refSearch]);
|
||||||
|
const hiddenRefs = useMemo(() => {
|
||||||
|
const q = refSearch.trim().toUpperCase();
|
||||||
|
const total = q
|
||||||
|
? refs.filter((r) => r.code.includes(q) || r.name.toUpperCase().includes(q)).length
|
||||||
|
: refs.length;
|
||||||
|
return Math.max(0, total - shownRefs.length);
|
||||||
|
}, [refs, refSearch, shownRefs.length]);
|
||||||
|
|
||||||
const qthOf = (q: any) => String(q.qth || q.notes || '');
|
const qthOf = (q: any) => String(q.qth || q.notes || '');
|
||||||
const sorted = useMemo(() => {
|
const sorted = useMemo(() => {
|
||||||
@@ -711,14 +756,29 @@ function MissingQSOModal({ code, name, onClose, onEditQSO }: { code: string; nam
|
|||||||
{/* Bulk-assign toolbar */}
|
{/* Bulk-assign toolbar */}
|
||||||
<div className="flex items-center gap-2 px-4 py-2 border-b border-border/50 bg-muted/20">
|
<div className="flex items-center gap-2 px-4 py-2 border-b border-border/50 bg-muted/20">
|
||||||
<span className="text-xs text-muted-foreground">{t('awp.selectedArrow', { n: sel.size })}</span>
|
<span className="text-xs text-muted-foreground">{t('awp.selectedArrow', { n: sel.size })}</span>
|
||||||
|
{/* A search box beside the dropdown, and a bounded list inside it.
|
||||||
|
A reference list can hold tens of thousands of entries (POTA
|
||||||
|
parks, Russian districts); every one of them as a menu item is
|
||||||
|
hundreds of thousands of DOM nodes and a window that stops
|
||||||
|
answering. Nobody scrolls to K-4521 anyway — they type it. */}
|
||||||
|
{refs.length > REF_MENU_MAX && (
|
||||||
|
<Input className="h-7 w-40 text-xs font-mono" value={refSearch}
|
||||||
|
placeholder={t('awp.filterReferences')}
|
||||||
|
onChange={(e) => setRefSearch(e.target.value)} />
|
||||||
|
)}
|
||||||
<Select value={assignRef} onValueChange={setAssignRef}>
|
<Select value={assignRef} onValueChange={setAssignRef}>
|
||||||
<SelectTrigger className="h-7 w-64 text-xs"><SelectValue placeholder={t('awp.chooseReference')} /></SelectTrigger>
|
<SelectTrigger className="h-7 w-64 text-xs"><SelectValue placeholder={t('awp.chooseReference')} /></SelectTrigger>
|
||||||
<SelectContent className="max-h-72">
|
<SelectContent className="max-h-72">
|
||||||
{refs.map((r) => (
|
{shownRefs.map((r) => (
|
||||||
<SelectItem key={r.code} value={r.code}>
|
<SelectItem key={r.code} value={r.code}>
|
||||||
<span className="font-mono font-semibold">{r.code}</span>{r.name ? <span className="text-muted-foreground"> · {r.name}</span> : ''}
|
<span className="font-mono font-semibold">{r.code}</span>{r.name ? <span className="text-muted-foreground"> · {r.name}</span> : ''}
|
||||||
</SelectItem>
|
</SelectItem>
|
||||||
))}
|
))}
|
||||||
|
{hiddenRefs > 0 && (
|
||||||
|
<div className="px-2 py-1.5 text-[11px] text-muted-foreground">
|
||||||
|
{t('awp.refsNarrow', { n: hiddenRefs })}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
</SelectContent>
|
</SelectContent>
|
||||||
</Select>
|
</Select>
|
||||||
<Button size="sm" disabled={!assignRef || sel.size === 0 || busy} onClick={applyAssign}>
|
<Button size="sm" disabled={!assignRef || sel.size === 0 || busy} onClick={applyAssign}>
|
||||||
@@ -779,7 +839,14 @@ function MissingQSOModal({ code, name, onClose, onEditQSO }: { code: string; nam
|
|||||||
}
|
}
|
||||||
|
|
||||||
// CellQSOModal lists the QSOs behind one award-grid cell (reference × band).
|
// CellQSOModal lists the QSOs behind one award-grid cell (reference × band).
|
||||||
function CellQSOModal({ code, cell, modeClass, onClose }: { code: string; cell: { ref: string; band: string; name?: string }; modeClass: string; onClose: () => void }) {
|
function CellQSOModal({ code, cell, modeClass, onClose, onPaperQSL }: {
|
||||||
|
code: string; cell: { ref: string; band: string; name?: string }; modeClass: string;
|
||||||
|
onClose: () => void;
|
||||||
|
// Send this callsign to the QSL Manager's Paper QSL view. Chasing a
|
||||||
|
// confirmation starts here — an unconfirmed entity, the contact behind it —
|
||||||
|
// and used to continue by retyping the callsign into another tab.
|
||||||
|
onPaperQSL?: (call: string) => void;
|
||||||
|
}) {
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const [qsos, setQsos] = useState<any[]>([]);
|
const [qsos, setQsos] = useState<any[]>([]);
|
||||||
const [loading, setLoading] = useState(true);
|
const [loading, setLoading] = useState(true);
|
||||||
@@ -816,7 +883,15 @@ function CellQSOModal({ code, cell, modeClass, onClose }: { code: string; cell:
|
|||||||
{qsos.map((q, i) => (
|
{qsos.map((q, i) => (
|
||||||
<tr key={q.id ?? i} className="border-b border-border/30">
|
<tr key={q.id ?? i} className="border-b border-border/30">
|
||||||
<td className="py-1 px-3 font-mono">{fmt(q.qso_date)}</td>
|
<td className="py-1 px-3 font-mono">{fmt(q.qso_date)}</td>
|
||||||
<td className="py-1 pr-2 font-mono font-semibold">{q.callsign}</td>
|
<td className="py-1 pr-2 font-mono font-semibold">
|
||||||
|
{onPaperQSL ? (
|
||||||
|
<button type="button" className="hover:underline text-primary"
|
||||||
|
title={t('awp.paperQslTip')}
|
||||||
|
onClick={() => { onPaperQSL(String(q.callsign ?? '')); onClose(); }}>
|
||||||
|
{q.callsign}
|
||||||
|
</button>
|
||||||
|
) : q.callsign}
|
||||||
|
</td>
|
||||||
<td className="py-1 pr-2">{q.band}</td>
|
<td className="py-1 pr-2">{q.band}</td>
|
||||||
<td className="py-1 pr-2">{q.mode}</td>
|
<td className="py-1 pr-2">{q.mode}</td>
|
||||||
<td className="py-1 pr-3 text-muted-foreground">{[isQSLConfirmed(q.lotw_rcvd) && 'LoTW', isQSLConfirmed(q.qsl_rcvd) && 'QSL', isQSLConfirmed(q.eqsl_rcvd) && 'eQSL'].filter(Boolean).join(', ')}</td>
|
<td className="py-1 pr-3 text-muted-foreground">{[isQSLConfirmed(q.lotw_rcvd) && 'LoTW', isQSLConfirmed(q.qsl_rcvd) && 'QSL', isQSLConfirmed(q.eqsl_rcvd) && 'eQSL'].filter(Boolean).join(', ')}</td>
|
||||||
|
|||||||
@@ -1,10 +1,11 @@
|
|||||||
import { useEffect, useMemo, useRef, useState } from 'react';
|
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
||||||
import { Minus, Plus, Crosshair, X, PanelLeft, PanelRight } from 'lucide-react';
|
import { Minus, Plus, Crosshair, X, PanelLeft, PanelRight } from 'lucide-react';
|
||||||
import { cn } from '@/lib/utils';
|
import { cn } from '@/lib/utils';
|
||||||
import { useI18n } from '@/lib/i18n';
|
import { useI18n } from '@/lib/i18n';
|
||||||
import { spotStatusKey, inferSpotMode, spotModeCategory } from '@/lib/spot';
|
import { spotStatusKey, inferSpotMode, spotModeCategory } from '@/lib/spot';
|
||||||
import { SPOT_MARKERS, activeMarkers } from '@/lib/spotMarkers';
|
import { SPOT_MARKERS, activeMarkers } from '@/lib/spotMarkers';
|
||||||
import { applySpotDisplay, readSpotDisplayOptions } from '@/lib/spotDisplay';
|
import { applySpotDisplay, readSpotDisplayOptions } from '@/lib/spotDisplay';
|
||||||
|
import { writeUiPref } from '@/lib/uiPref';
|
||||||
|
|
||||||
// BandMap — vertical spectrum panel inspired by Log4OM.
|
// BandMap — vertical spectrum panel inspired by Log4OM.
|
||||||
// - Full band is always visible; zoom changes pixels-per-kHz, scroll
|
// - Full band is always visible; zoom changes pixels-per-kHz, scroll
|
||||||
@@ -24,6 +25,16 @@ interface Spot {
|
|||||||
band?: string;
|
band?: string;
|
||||||
comment?: string;
|
comment?: string;
|
||||||
spotter?: string;
|
spotter?: string;
|
||||||
|
// The park reference the POTA poller tagged this spot with. The map never
|
||||||
|
// reads it — the click handler upstream turns it into the QSO's POTA award
|
||||||
|
// reference — but it is declared so it cannot be lost by accident.
|
||||||
|
//
|
||||||
|
// It travelled only because the spot objects are passed through by reference
|
||||||
|
// and the type was erased. The first refactor to copy a spot field by field
|
||||||
|
// would have dropped the park silently, and the only symptom would be an
|
||||||
|
// activation logged without its reference. Same mistake as the status entry
|
||||||
|
// below, whose extra markers were arriving and undeclared.
|
||||||
|
pota_ref?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
// The FULL status entry, not the two fields the map used to declare. The extra
|
// The FULL status entry, not the two fields the map used to declare. The extra
|
||||||
@@ -82,6 +93,12 @@ interface Props {
|
|||||||
// globally from the band-map tab toolbar.
|
// globally from the band-map tab toolbar.
|
||||||
hideDigital?: boolean;
|
hideDigital?: boolean;
|
||||||
fitToBand?: boolean;
|
fitToBand?: boolean;
|
||||||
|
// onToggleFit and onToggleHideDigital add the two switches to this map's own
|
||||||
|
// header. Only the docked map passes them: the Band Map tab has both in its
|
||||||
|
// toolbar, above maps that all obey them at once, and a switch inside each
|
||||||
|
// card as well would be four ways to change one setting.
|
||||||
|
onToggleFit?: () => void;
|
||||||
|
onToggleHideDigital?: () => void;
|
||||||
// Mark stations that upload to LoTW (Settings → Appearance).
|
// Mark stations that upload to LoTW (Settings → Appearance).
|
||||||
showLotw?: boolean;
|
showLotw?: boolean;
|
||||||
// keyNav enables Ctrl+↑ / Ctrl+↓ to hop to the next spot above / below the rig
|
// keyNav enables Ctrl+↑ / Ctrl+↓ to hop to the next spot above / below the rig
|
||||||
@@ -158,6 +175,7 @@ function LegendDot({ cls, colour, label }: { cls?: string; colour?: string; labe
|
|||||||
function statusLabel(s: string, t: (k: string) => string): string {
|
function statusLabel(s: string, t: (k: string) => string): string {
|
||||||
switch (s) {
|
switch (s) {
|
||||||
case 'new': return t('bmp.statusNew');
|
case 'new': return t('bmp.statusNew');
|
||||||
|
case 'new-band-mode': return t('bmp.statusNewBandMode');
|
||||||
case 'new-band': return t('bmp.statusNewBand');
|
case 'new-band': return t('bmp.statusNewBand');
|
||||||
case 'new-mode': return t('bmp.statusNewMode');
|
case 'new-mode': return t('bmp.statusNewMode');
|
||||||
case 'new-slot': return t('bmp.statusNewSlot');
|
case 'new-slot': return t('bmp.statusNewSlot');
|
||||||
@@ -185,7 +203,11 @@ function statusStyle(s: string): { pill: string; bar: string; line: string; dot:
|
|||||||
// line = SVG leader stroke (visible on hover)
|
// line = SVG leader stroke (visible on hover)
|
||||||
// dot = small marker on the freq scale
|
// dot = small marker on the freq scale
|
||||||
switch (s) {
|
switch (s) {
|
||||||
case 'new': return {
|
// NEW and NEW BAND+MODE share the strongest colour: both mean "there is
|
||||||
|
// something here you have never had", and a sixth shade in a palette read at
|
||||||
|
// a glance is a shade nobody can name.
|
||||||
|
case 'new':
|
||||||
|
case 'new-band-mode': return {
|
||||||
pill: 'bg-danger-muted text-danger-muted-foreground border-danger-border hover:bg-danger-muted',
|
pill: 'bg-danger-muted text-danger-muted-foreground border-danger-border hover:bg-danger-muted',
|
||||||
bar: 'bg-danger',
|
bar: 'bg-danger',
|
||||||
line: 'stroke-danger',
|
line: 'stroke-danger',
|
||||||
@@ -217,7 +239,37 @@ function statusStyle(s: string): { pill: string; bar: string; line: string; dot:
|
|||||||
// Pixels-per-kHz at each zoom step. Base 8 px/kHz means a stacked spot
|
// Pixels-per-kHz at each zoom step. Base 8 px/kHz means a stacked spot
|
||||||
// every 2.75 kHz fits without anti-overlap kicking in — comfortable for
|
// every 2.75 kHz fits without anti-overlap kicking in — comfortable for
|
||||||
// most bands. Higher levels are for fine inspection of crowded sub-bands.
|
// most bands. Higher levels are for fine inspection of crowded sub-bands.
|
||||||
const PX_PER_KHZ = [8, 16, 32, 64, 128, 256];
|
// Zoom steps, px per kHz. 2 and 4 sit below the old floor of 8 so a whole band
|
||||||
|
// fits without FIT taking the scale away from you: 20 m end to end is 700 px at
|
||||||
|
// 2 px/kHz, which scrolls in one screen on most displays.
|
||||||
|
const PX_PER_KHZ = [2, 4, 8, 16, 32, 64, 128, 256];
|
||||||
|
const DEFAULT_ZOOM_IDX = PX_PER_KHZ.indexOf(32);
|
||||||
|
|
||||||
|
// Zoom is remembered PER BAND, in ONE json key rather than one key per band:
|
||||||
|
// lib/uiPref keeps an explicit list of the preferences that travel with data/,
|
||||||
|
// and thirteen entries there to say the same thing would be thirteen chances to
|
||||||
|
// forget one.
|
||||||
|
const ZOOM_KEY = 'opslog.bandMapZoom';
|
||||||
|
|
||||||
|
function readZoomMap(): Record<string, number> {
|
||||||
|
try {
|
||||||
|
const m = JSON.parse(localStorage.getItem(ZOOM_KEY) || '{}');
|
||||||
|
return m && typeof m === 'object' ? m : {};
|
||||||
|
} catch {
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function readZoom(band: string): number {
|
||||||
|
const n = readZoomMap()[band];
|
||||||
|
return Number.isInteger(n) && n >= 0 && n < PX_PER_KHZ.length ? n : DEFAULT_ZOOM_IDX;
|
||||||
|
}
|
||||||
|
|
||||||
|
function writeZoom(band: string, idx: number): void {
|
||||||
|
const m = readZoomMap();
|
||||||
|
m[band] = idx;
|
||||||
|
writeUiPref(ZOOM_KEY, JSON.stringify(m));
|
||||||
|
}
|
||||||
const SCALE_W = 56;
|
const SCALE_W = 56;
|
||||||
const PILL_H = 22; // px — height of each callsign pill
|
const PILL_H = 22; // px — height of each callsign pill
|
||||||
const PILL_GAP = 32; // px between scale border and first pill (room for leader)
|
const PILL_GAP = 32; // px between scale border and first pill (room for leader)
|
||||||
@@ -232,7 +284,7 @@ const BOT_PAD = 14; // the top-most freq label isn't clipped at y=0
|
|||||||
// last; ties broken by closeness to the rig freq).
|
// last; ties broken by closeness to the rig freq).
|
||||||
const MAX_VISIBLE_SPOTS = 30;
|
const MAX_VISIBLE_SPOTS = 30;
|
||||||
|
|
||||||
export function BandMap({ band, spots, spotStatus: spotStatusRaw, currentFreqHz, onSpotClick, onClose, side = 'right', onToggleSide, hideDigital = false, fitToBand = false, keyNav = false, showLotw = false }: Props) {
|
export function BandMap({ band, spots, spotStatus: spotStatusRaw, currentFreqHz, onSpotClick, onClose, side = 'right', onToggleSide, hideDigital = false, fitToBand = false, onToggleFit, onToggleHideDigital, keyNav = false, showLotw = false }: Props) {
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
|
|
||||||
// The two display options are applied ONCE here, on the whole map, so the
|
// The two display options are applied ONCE here, on the whole map, so the
|
||||||
@@ -252,7 +304,22 @@ export function BandMap({ band, spots, spotStatus: spotStatusRaw, currentFreqHz,
|
|||||||
}, [spotStatusRaw, dispOpts.muteWorked, dispOpts.slotHighlight]);
|
}, [spotStatusRaw, dispOpts.muteWorked, dispOpts.slotHighlight]);
|
||||||
const range = BAND_RANGES[band];
|
const range = BAND_RANGES[band];
|
||||||
const segments = SEGMENT_COLORS[band] ?? [];
|
const segments = SEGMENT_COLORS[band] ?? [];
|
||||||
const [zoomIdx, setZoomIdx] = useState(2); // default 32 px/kHz
|
const [zoomIdx, setZoomIdx] = useState(() => readZoom(band));
|
||||||
|
// The docked map follows the rig, so a band change must bring up THAT band's
|
||||||
|
// remembered zoom.
|
||||||
|
useEffect(() => { setZoomIdx(readZoom(band)); }, [band]);
|
||||||
|
// Stored from the interaction, not from an effect on zoomIdx: an effect would
|
||||||
|
// also fire on the band change above, and in the same commit it would still be
|
||||||
|
// holding the PREVIOUS band's index — writing it over the new band's. Doing it
|
||||||
|
// where the operator actually turns the wheel keeps the two apart. (Running
|
||||||
|
// twice under StrictMode is harmless: the same value is stored.)
|
||||||
|
const changeZoom = useCallback((delta: number) => {
|
||||||
|
setZoomIdx((z) => {
|
||||||
|
const n = Math.max(0, Math.min(PX_PER_KHZ.length - 1, z + delta));
|
||||||
|
if (n !== z) writeZoom(band, n);
|
||||||
|
return n;
|
||||||
|
});
|
||||||
|
}, [band]);
|
||||||
const scrollerRef = useRef<HTMLDivElement | null>(null);
|
const scrollerRef = useRef<HTMLDivElement | null>(null);
|
||||||
const [containerH, setContainerH] = useState(400);
|
const [containerH, setContainerH] = useState(400);
|
||||||
|
|
||||||
@@ -315,6 +382,7 @@ export function BandMap({ band, spots, spotStatus: spotStatusRaw, currentFreqHz,
|
|||||||
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);
|
||||||
switch (spotStatus[k]?.status ?? '') {
|
switch (spotStatus[k]?.status ?? '') {
|
||||||
case 'new': return 0;
|
case 'new': return 0;
|
||||||
|
case 'new-band-mode': return 0;
|
||||||
case 'new-band': return 1;
|
case 'new-band': return 1;
|
||||||
case 'new-slot': return 2;
|
case 'new-slot': return 2;
|
||||||
case 'new-call': return 2;
|
case 'new-call': return 2;
|
||||||
@@ -421,7 +489,7 @@ export function BandMap({ band, spots, spotStatus: spotStatusRaw, currentFreqHz,
|
|||||||
if (!range) return;
|
if (!range) return;
|
||||||
if (e.ctrlKey || e.metaKey) {
|
if (e.ctrlKey || e.metaKey) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
setZoomIdx((z) => Math.max(0, Math.min(PX_PER_KHZ.length - 1, z + (e.deltaY > 0 ? -1 : 1))));
|
changeZoom(e.deltaY > 0 ? -1 : 1);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
el.addEventListener('wheel', onWheel, { passive: false });
|
el.addEventListener('wheel', onWheel, { passive: false });
|
||||||
@@ -476,8 +544,10 @@ export function BandMap({ band, spots, spotStatus: spotStatusRaw, currentFreqHz,
|
|||||||
|
|
||||||
// Tick step (where small marks land) and label step (where the kHz
|
// Tick step (where small marks land) and label step (where the kHz
|
||||||
// number is printed) are decoupled so the scale shows ~10-20 numeric
|
// number is printed) are decoupled so the scale shows ~10-20 numeric
|
||||||
// labels per viewport regardless of zoom — at base 8 px/kHz we want
|
// labels per viewport regardless of zoom — at 8 px/kHz we want labels
|
||||||
// labels every 25 kHz, not every 250.
|
// every 25 kHz, not every 250. The bare values below are the floor, and
|
||||||
|
// they are what the 2 px/kHz step lands on: a whole band in one screen
|
||||||
|
// wants a number every 100 kHz, not every 25.
|
||||||
let tickStep = 50;
|
let tickStep = 50;
|
||||||
let labelStep = 100;
|
let labelStep = 100;
|
||||||
if (pxPerKHz >= 4) { tickStep = 25; labelStep = 50; }
|
if (pxPerKHz >= 4) { tickStep = 25; labelStep = 50; }
|
||||||
@@ -502,18 +572,48 @@ export function BandMap({ band, spots, spotStatus: spotStatusRaw, currentFreqHz,
|
|||||||
return (
|
return (
|
||||||
<div className="h-full w-full flex flex-col min-h-0 bg-card">
|
<div className="h-full w-full flex flex-col min-h-0 bg-card">
|
||||||
<div className="px-2 py-1.5 text-xs font-semibold uppercase tracking-wider text-muted-foreground bg-muted/40 border-b border-border flex flex-nowrap items-center gap-0.5 shrink-0">
|
<div className="px-2 py-1.5 text-xs font-semibold uppercase tracking-wider text-muted-foreground bg-muted/40 border-b border-border flex flex-nowrap items-center gap-0.5 shrink-0">
|
||||||
<span className="flex-1 min-w-0 truncate">{t('bmp.map')} · {band}</span>
|
{/* The band alone. "Map · 20M" spent a third of a narrow header saying
|
||||||
<button type="button" onClick={() => setZoomIdx((z) => Math.max(0, z - 1))} disabled={fitToBand || zoomIdx === 0}
|
what the panel obviously is, and with four band maps side by side it
|
||||||
|
was four times the same word. */}
|
||||||
|
<span className="flex-1 min-w-0 truncate">{band}</span>
|
||||||
|
<button type="button" onClick={() => changeZoom(-1)} disabled={fitToBand || zoomIdx === 0}
|
||||||
className="size-5 shrink-0 inline-flex items-center justify-center rounded hover:bg-muted disabled:opacity-30"
|
className="size-5 shrink-0 inline-flex items-center justify-center rounded hover:bg-muted disabled:opacity-30"
|
||||||
title={t('bmp.zoomOut')}>
|
title={t('bmp.zoomOut')}>
|
||||||
<Minus className="size-3" />
|
<Minus className="size-3" />
|
||||||
</button>
|
</button>
|
||||||
<span className="shrink-0 font-mono text-[10px] normal-case tracking-normal whitespace-nowrap px-0.5">{fitToBand ? t('bmp.fit') : `${pxPerKHz}px/kHz`}</span>
|
{/* A readout, not a switch.
|
||||||
<button type="button" onClick={() => setZoomIdx((z) => Math.min(PX_PER_KHZ.length - 1, z + 1))} disabled={fitToBand || zoomIdx === PX_PER_KHZ.length - 1}
|
|
||||||
|
It WAS the switch for a day: clicking the px/kHz value toggled
|
||||||
|
fit-to-band, and in fit it read "FIT". Nobody found it — a control
|
||||||
|
whose label is a measurement does not look like a control, and once
|
||||||
|
switched off there was no longer anything on screen saying the option
|
||||||
|
existed. The switches below say what they are. */}
|
||||||
|
{/* In fit mode the readout has nothing left to say — the lit FIT button
|
||||||
|
says it, and printing the word twice side by side is just noise. The
|
||||||
|
Band Map tab's cards have no button, so there the readout keeps
|
||||||
|
reporting both states. */}
|
||||||
|
{(!fitToBand || !onToggleFit) && (
|
||||||
|
<span className="shrink-0 font-mono text-[10px] normal-case tracking-normal whitespace-nowrap px-0.5">{fitToBand ? t('bmp.fit') : `${pxPerKHz}px/kHz`}</span>
|
||||||
|
)}
|
||||||
|
<button type="button" onClick={() => changeZoom(1)} disabled={fitToBand || zoomIdx === PX_PER_KHZ.length - 1}
|
||||||
className="size-5 shrink-0 inline-flex items-center justify-center rounded hover:bg-muted disabled:opacity-30"
|
className="size-5 shrink-0 inline-flex items-center justify-center rounded hover:bg-muted disabled:opacity-30"
|
||||||
title={t('bmp.zoomIn')}>
|
title={t('bmp.zoomIn')}>
|
||||||
<Plus className="size-3" />
|
<Plus className="size-3" />
|
||||||
</button>
|
</button>
|
||||||
|
{onToggleFit && (
|
||||||
|
<button type="button" onClick={onToggleFit} title={t('bmp.fitTitle')}
|
||||||
|
className={cn('shrink-0 text-[10px] font-semibold normal-case tracking-normal px-1 rounded border transition-colors',
|
||||||
|
fitToBand ? 'border-primary bg-primary text-primary-foreground' : 'border-border text-muted-foreground hover:bg-muted')}>
|
||||||
|
{t('bmp.fit')}
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
{onToggleHideDigital && (
|
||||||
|
<button type="button" onClick={onToggleHideDigital} title={t('bmp.hideFtTitle')}
|
||||||
|
className={cn('shrink-0 text-[10px] font-semibold normal-case tracking-normal px-1 rounded border transition-colors',
|
||||||
|
hideDigital ? 'border-primary bg-primary text-primary-foreground' : 'border-border text-muted-foreground hover:bg-muted')}>
|
||||||
|
{t('bmp.ftx')}
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
<button type="button" onClick={recenterOnRig}
|
<button type="button" onClick={recenterOnRig}
|
||||||
className="size-5 inline-flex items-center justify-center rounded hover:bg-muted"
|
className="size-5 inline-flex items-center justify-center rounded hover:bg-muted"
|
||||||
title={t('bmp.scrollToRig')}>
|
title={t('bmp.scrollToRig')}>
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ 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 { isQSLConfirmed } from '@/lib/qsl';
|
import { isQSLConfirmed } from '@/lib/qsl';
|
||||||
|
import { useI18n } from '@/lib/i18n';
|
||||||
import { BandSlotQSOs } from '../../wailsjs/go/main/App';
|
import { BandSlotQSOs } from '../../wailsjs/go/main/App';
|
||||||
import type { WorkedBeforeView } from '@/types';
|
import type { WorkedBeforeView } from '@/types';
|
||||||
|
|
||||||
@@ -76,28 +77,31 @@ const STATUS_CLASSES: Record<string, string> = {
|
|||||||
dxcc_w: 'bg-mx-dx-work',
|
dxcc_w: 'bg-mx-dx-work',
|
||||||
};
|
};
|
||||||
|
|
||||||
// Legend entries, in the same colour order as the cells. swatch = the
|
// Legend entries, in the same colour order as the cells — and the same order and
|
||||||
// background class (or a special ring marker for the current-entry cell).
|
// i18n keys the Appearance panel's colour pickers use, so the two can never
|
||||||
|
// disagree about which green is which. swatch = the background class (or a
|
||||||
|
// special ring marker for the current-entry cell).
|
||||||
const LEGEND: { swatch: string; ring?: boolean; label: string }[] = [
|
const LEGEND: { swatch: string; ring?: boolean; label: string }[] = [
|
||||||
{ swatch: 'bg-mx-call-conf', label: 'Call confirmed' },
|
{ swatch: 'bg-mx-call-conf', label: 'mx.callConf' },
|
||||||
{ swatch: 'bg-mx-call-work', label: 'Call worked' },
|
{ swatch: 'bg-mx-call-work', label: 'mx.callWork' },
|
||||||
{ swatch: 'bg-mx-dx-conf', label: 'Entity confirmed' },
|
{ swatch: 'bg-mx-dx-conf', label: 'mx.dxConf' },
|
||||||
{ swatch: 'bg-mx-dx-work', label: 'Entity worked' },
|
{ swatch: 'bg-mx-dx-work', label: 'mx.dxWork' },
|
||||||
{ swatch: 'bg-mx-none', label: 'Not worked' },
|
{ swatch: 'bg-mx-none', label: 'mx.none' },
|
||||||
{ swatch: 'bg-mx-none', ring: true, label: 'Current entry' },
|
{ swatch: 'bg-mx-none', ring: true, label: 'mx.current' },
|
||||||
];
|
];
|
||||||
|
|
||||||
function cellTitle(band: string, cls: string, status: string, current: boolean): string {
|
function cellTitle(t: (k: string) => string, band: string, cls: string, status: string, current: boolean): string {
|
||||||
const desc =
|
const desc =
|
||||||
status === 'call_c' ? 'This callsign confirmed' :
|
status === 'call_c' ? t('mx.tipCallConf') :
|
||||||
status === 'call_w' ? 'This callsign worked (not confirmed)' :
|
status === 'call_w' ? t('mx.tipCallWork') :
|
||||||
status === 'dxcc_c' ? 'Entity confirmed (other callsign)' :
|
status === 'dxcc_c' ? t('mx.tipDxConf') :
|
||||||
status === 'dxcc_w' ? 'Entity worked (other callsign)' :
|
status === 'dxcc_w' ? t('mx.tipDxWork') :
|
||||||
'Never worked';
|
t('mx.tipNone');
|
||||||
return `${band} ${cls}: ${desc}${current ? ' — current entry' : ''}`;
|
return `${band} ${cls}: ${desc}${current ? ' — ' + t('mx.current') : ''}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function BandSlotGrid({ wb, busy, currentBand, currentMode, bands, hasCall = true, lat, lon, forCall, onEditQso }: Props) {
|
export function BandSlotGrid({ wb, busy, currentBand, currentMode, bands, hasCall = true, lat, lon, forCall, onEditQso }: Props) {
|
||||||
|
const { t } = useI18n();
|
||||||
// Cell drill-down: which band+class the operator clicked, or null.
|
// Cell drill-down: which band+class the operator clicked, or null.
|
||||||
const [slot, setSlot] = useState<{ band: string; cls: string } | null>(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
|
||||||
@@ -308,7 +312,7 @@ 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) + (st ? ' — click to list the QSOs' : '')}
|
title={cellTitle(t, b.tag, cls, st, isCurrent) + (st ? ' — ' + t('mx.tipClick') : '')}
|
||||||
onClick={st ? () => setSlot({ band: b.tag, cls }) : undefined}
|
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',
|
||||||
@@ -316,7 +320,7 @@ export function BandSlotGrid({ wb, busy, currentBand, currentMode, bands, hasCal
|
|||||||
// Only a filled cell has anything to show — an empty one
|
// Only a filled cell has anything to show — an empty one
|
||||||
// stays inert rather than opening a "no QSOs" dialog.
|
// stays inert rather than opening a "no QSOs" dialog.
|
||||||
st && 'cursor-pointer hover:brightness-110',
|
st && 'cursor-pointer hover:brightness-110',
|
||||||
isCurrent && 'ring-2 ring-warning ring-inset',
|
isCurrent && 'ring-2 ring-mx-cur ring-inset',
|
||||||
)}
|
)}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
@@ -335,10 +339,10 @@ export function BandSlotGrid({ wb, busy, currentBand, currentMode, bands, hasCal
|
|||||||
className={cn(
|
className={cn(
|
||||||
'inline-block size-3 rounded shrink-0',
|
'inline-block size-3 rounded shrink-0',
|
||||||
l.swatch,
|
l.swatch,
|
||||||
l.ring && 'ring-2 ring-warning ring-inset',
|
l.ring && 'ring-2 ring-mx-cur ring-inset',
|
||||||
)}
|
)}
|
||||||
/>
|
/>
|
||||||
{l.label}
|
{t(l.label)}
|
||||||
</span>
|
</span>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -62,6 +62,7 @@ const CATEGORIES: Array<{ key: Category; labelKey: string; colour: string }> = [
|
|||||||
function categoryOf(s: ChaseNewSpot): Category | null {
|
function categoryOf(s: ChaseNewSpot): Category | null {
|
||||||
switch (s.status) {
|
switch (s.status) {
|
||||||
case 'new': return 'dxcc';
|
case 'new': return 'dxcc';
|
||||||
|
case 'new-band-mode': return 'band';
|
||||||
case 'new-band': return 'band';
|
case 'new-band': return 'band';
|
||||||
case 'new-mode': return 'mode';
|
case 'new-mode': return 'mode';
|
||||||
case 'new-slot': return 'slot';
|
case 'new-slot': return 'slot';
|
||||||
|
|||||||
@@ -69,6 +69,7 @@ export type SpotStatusEntry = {
|
|||||||
spotter_continent?: string;
|
spotter_continent?: string;
|
||||||
grid?: string;
|
grid?: string;
|
||||||
new_grid?: boolean;
|
new_grid?: boolean;
|
||||||
|
grid_state?: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
type Props = {
|
type Props = {
|
||||||
@@ -173,6 +174,7 @@ function cellText(value: any, color: string | null): any {
|
|||||||
function statusColor(s: SpotStatusEntry | undefined): string | null {
|
function statusColor(s: SpotStatusEntry | undefined): string | null {
|
||||||
switch (s?.status) {
|
switch (s?.status) {
|
||||||
case 'new':
|
case 'new':
|
||||||
|
case 'new-band-mode':
|
||||||
case 'new-band':
|
case 'new-band':
|
||||||
case 'new-mode':
|
case 'new-mode':
|
||||||
case 'new-slot':
|
case 'new-slot':
|
||||||
@@ -192,7 +194,7 @@ function statusColor(s: SpotStatusEntry | undefined): string | null {
|
|||||||
// (still loading, or entity unknown) are NOT dimmed — that would flicker.
|
// (still loading, or entity unknown) are NOT dimmed — that would flicker.
|
||||||
function isDull(s: SpotStatusEntry | undefined): boolean {
|
function isDull(s: SpotStatusEntry | undefined): boolean {
|
||||||
if (!s || !s.status) return false;
|
if (!s || !s.status) return false;
|
||||||
if (s.status === 'new' || s.status === 'new-band' || s.status === 'new-mode' || s.status === 'new-slot' || s.status === 'new-call') return false;
|
if (s.status === 'new' || s.status === 'new-band-mode' || s.status === 'new-band' || s.status === 'new-mode' || s.status === 'new-slot' || s.status === 'new-call') return false;
|
||||||
return !(s.worked_call || s.new_pota || s.new_county || s.new_pfx || s.new_grid);
|
return !(s.worked_call || s.new_pota || s.new_county || s.new_pfx || s.new_grid);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -258,6 +260,7 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
|
|||||||
const s = statusFor(p);
|
const s = statusFor(p);
|
||||||
const parts: string[] = [];
|
const parts: string[] = [];
|
||||||
if (s?.status === 'new') parts.push(t('clg2.newDxcc'));
|
if (s?.status === 'new') parts.push(t('clg2.newDxcc'));
|
||||||
|
else if (s?.status === 'new-band-mode') parts.push(t('clg2.newBandMode'));
|
||||||
else if (s?.status === 'new-band') parts.push(t('clg2.newBand'));
|
else if (s?.status === 'new-band') parts.push(t('clg2.newBand'));
|
||||||
else if (s?.status === 'new-mode') parts.push(t('clg2.newMode'));
|
else if (s?.status === 'new-mode') parts.push(t('clg2.newMode'));
|
||||||
else if (s?.status === 'new-slot') parts.push(t('clg2.newSlot'));
|
else if (s?.status === 'new-slot') parts.push(t('clg2.newSlot'));
|
||||||
@@ -266,15 +269,16 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
|
|||||||
if (s?.new_county) parts.push(t('clg2.newCounty'));
|
if (s?.new_county) parts.push(t('clg2.newCounty'));
|
||||||
if (s?.new_pota) parts.push(t('clg2.newPota'));
|
if (s?.new_pota) parts.push(t('clg2.newPota'));
|
||||||
if (s?.new_pfx) parts.push(t('clg2.newPfx'));
|
if (s?.new_pfx) parts.push(t('clg2.newPfx'));
|
||||||
if (s?.new_grid) parts.push(t('clg2.newGrid'));
|
if (s?.new_grid) parts.push(s.grid_state === 'unconf' ? t('clg2.newGridUnconf') : t('clg2.newGrid'));
|
||||||
return parts.join(' ');
|
return parts.join(' ');
|
||||||
},
|
},
|
||||||
cellRenderer: (p: any) => {
|
cellRenderer: (p: any) => {
|
||||||
const s = statusFor(p);
|
const s = statusFor(p);
|
||||||
const parts: { text: string; color: string }[] = [];
|
const parts: { text: string; color: string; dim?: boolean }[] = [];
|
||||||
const main = statusColor(s);
|
const main = statusColor(s);
|
||||||
if (main) {
|
if (main) {
|
||||||
const label = s?.status === 'new' ? t('clg2.newDxcc')
|
const label = s?.status === 'new' ? t('clg2.newDxcc')
|
||||||
|
: s?.status === 'new-band-mode' ? t('clg2.newBandMode')
|
||||||
: s?.status === 'new-band' ? t('clg2.newBand')
|
: s?.status === 'new-band' ? t('clg2.newBand')
|
||||||
: s?.status === 'new-mode' ? t('clg2.newMode')
|
: s?.status === 'new-mode' ? t('clg2.newMode')
|
||||||
: s?.status === 'new-slot' ? t('clg2.newSlot')
|
: s?.status === 'new-slot' ? t('clg2.newSlot')
|
||||||
@@ -287,12 +291,19 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
|
|||||||
if (s?.new_county) parts.push({ text: t('clg2.newCounty'), color: markerColour('new_county') });
|
if (s?.new_county) parts.push({ text: t('clg2.newCounty'), color: markerColour('new_county') });
|
||||||
if (s?.new_pota) parts.push({ text: t('clg2.newPota'), color: markerColour('new_pota') });
|
if (s?.new_pota) parts.push({ text: t('clg2.newPota'), color: markerColour('new_pota') });
|
||||||
if (s?.new_pfx) parts.push({ text: t('clg2.newPfx'), color: markerColour('new_pfx') });
|
if (s?.new_pfx) parts.push({ text: t('clg2.newPfx'), color: markerColour('new_pfx') });
|
||||||
if (s?.new_grid) parts.push({ text: t('clg2.newGrid'), color: markerColour('new_grid') });
|
// Worked-but-unconfirmed is a QSL to chase, not a QSO to make. Same hue
|
||||||
|
// held back, so it reads as "less" of the same thing rather than a
|
||||||
|
// different fact — and the label says which.
|
||||||
|
if (s?.new_grid) {
|
||||||
|
parts.push(s.grid_state === 'unconf'
|
||||||
|
? { text: t('clg2.newGridUnconf'), color: markerColour('new_grid'), dim: true }
|
||||||
|
: { text: t('clg2.newGrid'), color: markerColour('new_grid') });
|
||||||
|
}
|
||||||
if (parts.length === 0) return <span style={{ color: 'var(--muted-foreground)', fontSize: 10 }}>—</span>;
|
if (parts.length === 0) return <span style={{ color: 'var(--muted-foreground)', fontSize: 10 }}>—</span>;
|
||||||
return (
|
return (
|
||||||
<span style={{ whiteSpace: 'nowrap' }}>
|
<span style={{ whiteSpace: 'nowrap' }}>
|
||||||
{parts.map((pt, i) => (
|
{parts.map((pt, i) => (
|
||||||
<span key={i} style={{ color: pt.color, fontWeight: 700 }}>
|
<span key={i} style={{ color: pt.color, fontWeight: 700, opacity: pt.dim ? 0.5 : 1 }}>
|
||||||
{i > 0 ? ' · ' : ''}{pt.text}
|
{i > 0 ? ' · ' : ''}{pt.text}
|
||||||
</span>
|
</span>
|
||||||
))}
|
))}
|
||||||
@@ -302,6 +313,7 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
|
|||||||
tooltipValueGetter: (p: any) => {
|
tooltipValueGetter: (p: any) => {
|
||||||
const s = statusFor(p);
|
const s = statusFor(p);
|
||||||
if (s?.status === 'new') return t('clg2.tipNewDxcc', { country: s?.country ?? '' });
|
if (s?.status === 'new') return t('clg2.tipNewDxcc', { country: s?.country ?? '' });
|
||||||
|
if (s?.status === 'new-band-mode') return t('clg2.tipNewBandMode');
|
||||||
if (s?.status === 'new-band') return t('clg2.tipNewBand');
|
if (s?.status === 'new-band') return t('clg2.tipNewBand');
|
||||||
if (s?.status === 'new-slot') return t('clg2.tipNewSlotBand');
|
if (s?.status === 'new-slot') return t('clg2.tipNewSlotBand');
|
||||||
if (s?.status === 'new-call') return t('clg2.tipNewCall');
|
if (s?.status === 'new-call') return t('clg2.tipNewCall');
|
||||||
@@ -330,10 +342,18 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
|
|||||||
headerName: t('clg2.c.band'), field: 'band' as any, width: 75,
|
headerName: t('clg2.c.band'), field: 'band' as any, width: 75,
|
||||||
defaultVisible: true,
|
defaultVisible: true,
|
||||||
cellClass: 'font-mono',
|
cellClass: 'font-mono',
|
||||||
// NEW BAND for this entity → the band cell is filled.
|
// NEW BAND for this entity → the band cell is filled. NEW BAND+MODE fills
|
||||||
cellStyle: (p: any) => (statusFor(p)?.status === 'new-band' ? fillStyle(NEW) : null) as any,
|
// it too: the band really is new, and leaving it plain would say the
|
||||||
|
// opposite of the status column beside it.
|
||||||
|
cellStyle: (p: any) => {
|
||||||
|
const st = statusFor(p)?.status;
|
||||||
|
return (st === 'new-band' || st === 'new-band-mode' ? fillStyle(NEW) : null) as any;
|
||||||
|
},
|
||||||
cellRenderer: (p: any) => cellText(p.value, null),
|
cellRenderer: (p: any) => cellText(p.value, null),
|
||||||
tooltipValueGetter: (p: any) => (statusFor(p)?.status === 'new-band' ? t('clg2.tipNewBand') : undefined),
|
tooltipValueGetter: (p: any) => {
|
||||||
|
const st = statusFor(p)?.status;
|
||||||
|
return st === 'new-band-mode' ? t('clg2.tipNewBandMode') : st === 'new-band' ? t('clg2.tipNewBand') : undefined;
|
||||||
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
group: 'Spot', label: t('clg2.c.mode'), colId: 'mode',
|
group: 'Spot', label: t('clg2.c.mode'), colId: 'mode',
|
||||||
@@ -341,14 +361,18 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
|
|||||||
defaultVisible: true,
|
defaultVisible: true,
|
||||||
cellClass: 'font-mono',
|
cellClass: 'font-mono',
|
||||||
valueGetter: (p: any) => p.data ? inferSpotMode(p.data.comment ?? '', p.data.freq_hz) : '',
|
valueGetter: (p: any) => p.data ? inferSpotMode(p.data.comment ?? '', p.data.freq_hz) : '',
|
||||||
// Only NEW MODE pills the mode cell — there the mode itself is genuinely new
|
// NEW MODE and NEW BAND+MODE pill the mode cell — in both the mode itself is
|
||||||
// for the entity. NEW SLOT means band AND mode were each worked before (just
|
// genuinely new for the entity. NEW SLOT means band AND mode were each worked
|
||||||
// not together), so highlighting the mode cell would wrongly imply "CW is new";
|
// before (just not together), so highlighting the mode cell would wrongly
|
||||||
// that case is signalled by the Status badge alone.
|
// imply "CW is new"; that case is signalled by the Status badge alone.
|
||||||
cellStyle: (p: any) => (statusFor(p)?.status === 'new-mode' ? fillStyle('var(--caution)') : null) as any,
|
cellStyle: (p: any) => {
|
||||||
|
const st = statusFor(p)?.status;
|
||||||
|
return (st === 'new-mode' || st === 'new-band-mode' ? fillStyle('var(--caution)') : null) as any;
|
||||||
|
},
|
||||||
cellRenderer: (p: any) => cellText(p.value, null),
|
cellRenderer: (p: any) => cellText(p.value, null),
|
||||||
tooltipValueGetter: (p: any) => {
|
tooltipValueGetter: (p: any) => {
|
||||||
const st = statusFor(p)?.status;
|
const st = statusFor(p)?.status;
|
||||||
|
if (st === 'new-band-mode') return t('clg2.tipNewBandMode');
|
||||||
if (st === 'new-mode') return t('clg2.tipNewMode');
|
if (st === 'new-mode') return t('clg2.tipNewMode');
|
||||||
if (st === 'new-slot') return t('clg2.tipNewSlot');
|
if (st === 'new-slot') return t('clg2.tipNewSlot');
|
||||||
return undefined;
|
return undefined;
|
||||||
@@ -638,6 +662,17 @@ export function ClusterGrid({ rows, spotStatus, onSpotClick }: Props) {
|
|||||||
{t('clg2.pickerDesc')}
|
{t('clg2.pickerDesc')}
|
||||||
</DialogDescription>
|
</DialogDescription>
|
||||||
</DialogHeader>
|
</DialogHeader>
|
||||||
|
{/* Whole-dialog controls. showAll/hideAll with no group already mean
|
||||||
|
"every column"; only the buttons were missing, so hiding the lot
|
||||||
|
took one click per group. */}
|
||||||
|
<div className="flex items-center gap-1 px-1 text-[11px] text-muted-foreground">
|
||||||
|
<span>{t('clg2.allGroups')}</span>
|
||||||
|
<button type="button" className="text-[11px] text-primary hover:underline px-1"
|
||||||
|
onClick={() => showAll()}>{t('clg2.all')}</button>
|
||||||
|
<span className="opacity-40">·</span>
|
||||||
|
<button type="button" className="text-[11px] text-muted-foreground hover:underline px-1"
|
||||||
|
onClick={() => hideAll()}>{t('clg2.none')}</button>
|
||||||
|
</div>
|
||||||
<div className="max-h-[60vh] overflow-y-auto py-2">
|
<div className="max-h-[60vh] overflow-y-auto py-2">
|
||||||
{GROUP_ORDER.map((group) => {
|
{GROUP_ORDER.map((group) => {
|
||||||
const cols = COL_CATALOG.filter((c) => c.group === group);
|
const cols = COL_CATALOG.filter((c) => c.group === group);
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -86,6 +86,13 @@ export function ExportFieldsDialog({ open, count, onExport, onClose }: {
|
|||||||
return [...m.entries()];
|
return [...m.entries()];
|
||||||
}, [official]);
|
}, [official]);
|
||||||
|
|
||||||
|
// Every tag the dialog can offer — the extras AND every group — so "select
|
||||||
|
// all" means what it says rather than "all the official ones".
|
||||||
|
const everyTag = useMemo(
|
||||||
|
() => [...extras, ...groups.flatMap(([, list]) => list.map((d) => d.name))],
|
||||||
|
[extras, groups],
|
||||||
|
);
|
||||||
|
|
||||||
const toggle = (name: string, on: boolean) =>
|
const toggle = (name: string, on: boolean) =>
|
||||||
setSel((s) => { const n = new Set(s); if (on) n.add(name); else n.delete(name); return n; });
|
setSel((s) => { const n = new Set(s); if (on) n.add(name); else n.delete(name); return n; });
|
||||||
const setMany = (names: string[], on: boolean) =>
|
const setMany = (names: string[], on: boolean) =>
|
||||||
@@ -114,11 +121,25 @@ export function ExportFieldsDialog({ open, count, onExport, onClose }: {
|
|||||||
<DialogDescription>{t('exf.desc')}</DialogDescription>
|
<DialogDescription>{t('exf.desc')}</DialogDescription>
|
||||||
</DialogHeader>
|
</DialogHeader>
|
||||||
|
|
||||||
|
{/* Whole-dialog select/clear, next to the count they change. Per-group
|
||||||
|
links alone meant clearing the selection was one click PER GROUP —
|
||||||
|
a dozen of them to get to "just the handful I want". */}
|
||||||
<div className="flex items-center gap-2 px-1 text-[11px] text-muted-foreground">
|
<div className="flex items-center gap-2 px-1 text-[11px] text-muted-foreground">
|
||||||
<span>{t('exf.chosen', { n: sel.size })}</span>
|
<span>{t('exf.chosen', { n: sel.size })}</span>
|
||||||
<Button variant="ghost" size="sm" className="ml-auto h-6 text-[11px]" onClick={() => setSel(defaultSet(official))}>
|
<span className="ml-auto inline-flex items-center gap-1">
|
||||||
{t('exf.defaults')}
|
<Button variant="ghost" size="sm" className="h-6 text-[11px]"
|
||||||
</Button>
|
onClick={() => setSel(new Set(everyTag))}>
|
||||||
|
{t('exf.selectAll')}
|
||||||
|
</Button>
|
||||||
|
<Button variant="ghost" size="sm" className="h-6 text-[11px]"
|
||||||
|
disabled={sel.size === 0}
|
||||||
|
onClick={() => setSel(new Set())}>
|
||||||
|
{t('exf.selectNone')}
|
||||||
|
</Button>
|
||||||
|
<Button variant="ghost" size="sm" className="h-6 text-[11px]" onClick={() => setSel(defaultSet(official))}>
|
||||||
|
{t('exf.defaults')}
|
||||||
|
</Button>
|
||||||
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="grid grid-cols-3 gap-3 max-h-[56vh] overflow-y-auto pr-1">
|
<div className="grid grid-cols-3 gap-3 max-h-[56vh] overflow-y-auto pr-1">
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { useEffect, useMemo, useState } from 'react';
|
import { useEffect, useMemo, useRef, useState } from 'react';
|
||||||
import { Plus, Trash2, Save, FolderOpen, X } from 'lucide-react';
|
import { Plus, Trash2, Save, FolderOpen, X } from 'lucide-react';
|
||||||
import { writeUiPref } from '@/lib/uiPref';
|
import { writeUiPref } from '@/lib/uiPref';
|
||||||
import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogFooter } from '@/components/ui/dialog';
|
import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogFooter } from '@/components/ui/dialog';
|
||||||
@@ -192,6 +192,17 @@ export function FilterBuilder({ open, initial, onApply, onClose }: Props) {
|
|||||||
|
|
||||||
function apply() { onApply(buildFilter()); }
|
function apply() { onApply(buildFilter()); }
|
||||||
|
|
||||||
|
// Same silence as the alert rules: the preset landed in the list, but the list
|
||||||
|
// is not where the operator is looking when they press Save.
|
||||||
|
const [savedMsg, setSavedMsg] = useState('');
|
||||||
|
const savedTimer = useRef(0);
|
||||||
|
function flashSaved(text: string) {
|
||||||
|
setSavedMsg(text);
|
||||||
|
window.clearTimeout(savedTimer.current);
|
||||||
|
savedTimer.current = window.setTimeout(() => setSavedMsg(''), 3000);
|
||||||
|
}
|
||||||
|
useEffect(() => () => window.clearTimeout(savedTimer.current), []);
|
||||||
|
|
||||||
function saveCurrentPreset() {
|
function saveCurrentPreset() {
|
||||||
const name = presetName.trim();
|
const name = presetName.trim();
|
||||||
if (!name) return;
|
if (!name) return;
|
||||||
@@ -199,6 +210,7 @@ export function FilterBuilder({ open, initial, onApply, onClose }: Props) {
|
|||||||
savePresets(next);
|
savePresets(next);
|
||||||
setPresets(next);
|
setPresets(next);
|
||||||
setPresetName('');
|
setPresetName('');
|
||||||
|
flashSaved(t('fltb.presetSaved', { name }));
|
||||||
}
|
}
|
||||||
function loadPreset(name: string) {
|
function loadPreset(name: string) {
|
||||||
const f = presets[name];
|
const f = presets[name];
|
||||||
@@ -335,6 +347,7 @@ export function FilterBuilder({ open, initial, onApply, onClose }: Props) {
|
|||||||
<Button variant="outline" size="sm" className="h-8" disabled={!presetName.trim()} onClick={saveCurrentPreset}>
|
<Button variant="outline" size="sm" className="h-8" disabled={!presetName.trim()} onClick={saveCurrentPreset}>
|
||||||
<Save className="size-3.5 mr-1" /> {t('fltb.savePreset')}
|
<Save className="size-3.5 mr-1" /> {t('fltb.savePreset')}
|
||||||
</Button>
|
</Button>
|
||||||
|
{savedMsg && <span className="text-[11px] text-success truncate">{savedMsg}</span>}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,308 @@
|
|||||||
|
import { useEffect, useMemo, useRef, useState } from 'react';
|
||||||
|
import L from 'leaflet';
|
||||||
|
import 'leaflet/dist/leaflet.css';
|
||||||
|
import { Loader2, RefreshCw } from 'lucide-react';
|
||||||
|
import { GridSquares } from '../../wailsjs/go/main/App';
|
||||||
|
import { gridSquareBounds, gridToLatLon } from '@/lib/maidenhead';
|
||||||
|
import { useI18n } from '@/lib/i18n';
|
||||||
|
import { cn } from '@/lib/utils';
|
||||||
|
import { BASEMAPS, addBasemap, loadBasemap, type BasemapKey } from '@/components/MainMap';
|
||||||
|
import { writeUiPref } from '@/lib/uiPref';
|
||||||
|
|
||||||
|
// GridSquareMap — every Maidenhead square in the log, drawn on a world map.
|
||||||
|
//
|
||||||
|
// A square, not a marker. The question this answers is "where have I been
|
||||||
|
// heard", and the shape of the answer is an area: a wall of squares across the
|
||||||
|
// Atlantic and a bare Pacific says something about an antenna that a scatter of
|
||||||
|
// pins does not. Confirmed and merely worked are two fills of the same hue —
|
||||||
|
// the distinction is a STATE of one thing, not two categories, so it must not
|
||||||
|
// be two unrelated colours.
|
||||||
|
//
|
||||||
|
// 4 characters, never 6: at world zoom a 6-character square is sub-pixel, and
|
||||||
|
// aggregating to the big square is also how the count means "contacts in this
|
||||||
|
// square" rather than "contacts at this exact spot".
|
||||||
|
|
||||||
|
type Square = { grid: string; count: number; confirmed: boolean; band?: string; mode?: string };
|
||||||
|
|
||||||
|
// The SAME basemaps the Main-tab world map offers, imported rather than copied:
|
||||||
|
// two lists of tile servers is how one map ends up on a provider the other has
|
||||||
|
// already been blocked by. This map opened on a hardcoded dark Carto, which is
|
||||||
|
// the least legible of the four under translucent squares.
|
||||||
|
|
||||||
|
// Leaflet geometry is painted onto a CANVAS, and canvas takes a colour, not a
|
||||||
|
// stylesheet: "var(--success)" handed to fillStyle is simply invalid and the
|
||||||
|
// shape is silently not drawn — a map with a correct square count and nothing
|
||||||
|
// on it. So the token is RESOLVED to its literal value here, once per theme,
|
||||||
|
// which is also why every other map in this app passes hex.
|
||||||
|
// The Earth, in the projection's own terms. Latitude stops at ±85.0511 because
|
||||||
|
// that is where Web Mercator does.
|
||||||
|
const WORLD_BOUNDS = L.latLngBounds(L.latLng(-85.0511, -180), L.latLng(85.0511, 180));
|
||||||
|
|
||||||
|
function cssColour(token: string, fallback: string): string {
|
||||||
|
try {
|
||||||
|
const v = getComputedStyle(document.documentElement).getPropertyValue(token).trim();
|
||||||
|
return v || fallback;
|
||||||
|
} catch { return fallback; }
|
||||||
|
}
|
||||||
|
|
||||||
|
// Mode scope. The names come straight from the backend's own classes ("ALL",
|
||||||
|
// "PHONE", "CW", "DIGI") plus FTX, which is narrower than digital and usually
|
||||||
|
// the honest one beside an FTx panel — a square worked on RTTY in a contest is
|
||||||
|
// not a square worked on FT8.
|
||||||
|
const SCOPES = [
|
||||||
|
{ key: 'ALL', label: 'gsm.all' },
|
||||||
|
{ key: 'PHONE', label: 'gsm.phone' },
|
||||||
|
{ key: 'CW', label: 'gsm.cw' },
|
||||||
|
{ key: 'DIGI', label: 'gsm.digital' },
|
||||||
|
{ key: 'FTX', label: 'gsm.ftx' },
|
||||||
|
] as const;
|
||||||
|
type ScopeKey = typeof SCOPES[number]['key'];
|
||||||
|
|
||||||
|
const SCOPE_KEY = 'opslog.gridMapScope';
|
||||||
|
// Chosen fill colours. Empty means "follow the theme", which is the default and
|
||||||
|
// stays the default: the tokens already track the four themes, and freezing a
|
||||||
|
// hex at first run would leave a dark-theme map painted in the light palette.
|
||||||
|
const COL_CONFIRMED_KEY = 'opslog.gridMapColorConfirmed';
|
||||||
|
const COL_WORKED_KEY = 'opslog.gridMapColorWorked';
|
||||||
|
|
||||||
|
// A colour input only accepts #rrggbb. The theme tokens ARE plain hex today, so
|
||||||
|
// this normally just passes them through — but a token that ever becomes oklch()
|
||||||
|
// or a named colour would silently drive the swatch to black, and a fallback is
|
||||||
|
// cheaper than that debugging session.
|
||||||
|
function asHex(v: string, fallback: string): string {
|
||||||
|
return /^#[0-9a-f]{6}$/i.test(v.trim()) ? v.trim() : fallback;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function GridSquareMap({ myGrid, className }: { myGrid?: string; className?: string }) {
|
||||||
|
const { t } = useI18n();
|
||||||
|
const hostRef = useRef<HTMLDivElement>(null);
|
||||||
|
const mapRef = useRef<L.Map | null>(null);
|
||||||
|
const layerRef = useRef<L.LayerGroup | null>(null);
|
||||||
|
const [squares, setSquares] = useState<Square[] | null>(null);
|
||||||
|
const [busy, setBusy] = useState(false);
|
||||||
|
const [err, setErr] = useState('');
|
||||||
|
const [scope, setScope] = useState<ScopeKey>(
|
||||||
|
() => (SCOPES.some((s) => s.key === localStorage.getItem(SCOPE_KEY))
|
||||||
|
? (localStorage.getItem(SCOPE_KEY) as ScopeKey) : 'DIGI'));
|
||||||
|
|
||||||
|
const [basemap, setBasemap] = useState<BasemapKey>(loadBasemap);
|
||||||
|
const [confColour, setConfColour] = useState(() => localStorage.getItem(COL_CONFIRMED_KEY) ?? '');
|
||||||
|
const [workedColour, setWorkedColour] = useState(() => localStorage.getItem(COL_WORKED_KEY) ?? '');
|
||||||
|
// Repaint the squares when the THEME changes, not the basemap: the fills come
|
||||||
|
// from theme tokens resolved at draw time, so a theme switch leaves them on
|
||||||
|
// the old palette until something forces a redraw.
|
||||||
|
const [themeTick, setThemeTick] = useState(0);
|
||||||
|
useEffect(() => {
|
||||||
|
const obs = new MutationObserver(() => setThemeTick((n) => n + 1));
|
||||||
|
obs.observe(document.documentElement, { attributes: true, attributeFilter: ['data-theme'] });
|
||||||
|
return () => obs.disconnect();
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const load = async (sc: ScopeKey = scope) => {
|
||||||
|
setBusy(true); setErr('');
|
||||||
|
try {
|
||||||
|
const r = (await GridSquares(sc)) as any;
|
||||||
|
setSquares((Array.isArray(r) ? r : []) as Square[]);
|
||||||
|
} catch (e: any) {
|
||||||
|
setErr(String(e?.message ?? e));
|
||||||
|
setSquares([]);
|
||||||
|
} finally { setBusy(false); }
|
||||||
|
};
|
||||||
|
useEffect(() => { void load(scope); /* eslint-disable-next-line react-hooks/exhaustive-deps */ }, [scope]);
|
||||||
|
|
||||||
|
// One-time map creation. preferCanvas: a busy digital log is a few thousand
|
||||||
|
// rectangles, and as SVG that is a few thousand DOM nodes to lay out on every
|
||||||
|
// pan.
|
||||||
|
useEffect(() => {
|
||||||
|
if (!hostRef.current || mapRef.current) return;
|
||||||
|
const m = L.map(hostRef.current, {
|
||||||
|
preferCanvas: true,
|
||||||
|
zoomControl: true,
|
||||||
|
attributionControl: true,
|
||||||
|
// ONE world, not a row of them. worldCopyJump exists to make a path look
|
||||||
|
// continuous across the date line; here it only meant the same continent
|
||||||
|
// appeared two or three times, each carrying the same squares.
|
||||||
|
worldCopyJump: false,
|
||||||
|
// Zoom 0 is the whole planet in 256 pixels — the level at which Greenland
|
||||||
|
// and Antarctica are both on screen. The old floor of 1 made that
|
||||||
|
// impossible on any window wider than it is tall: one step out was already
|
||||||
|
// too far in.
|
||||||
|
minZoom: 0,
|
||||||
|
maxBoundsViscosity: 1, // don't let a drag slide the world off to one side
|
||||||
|
}).setView([20, 0], 2);
|
||||||
|
// The whole world, once, whatever the window is shaped like — computed by
|
||||||
|
// Leaflet from the container rather than guessed with a zoom number.
|
||||||
|
m.fitWorld({ animate: false });
|
||||||
|
// Latitude only: the poles are the edge of the projection and there is
|
||||||
|
// nothing beyond them, while leaving longitude free keeps a drag from
|
||||||
|
// fighting the operator near the date line.
|
||||||
|
m.setMaxBounds(L.latLngBounds(L.latLng(-85, -Infinity), L.latLng(85, Infinity)));
|
||||||
|
mapRef.current = m;
|
||||||
|
layerRef.current = L.layerGroup().addTo(m);
|
||||||
|
// Leaflet measures its container ONCE, when the map is created, and never
|
||||||
|
// looks again. Here that measurement happens while the panel is still
|
||||||
|
// laying out — so the map kept the height it had at that instant and the
|
||||||
|
// rest of the panel stayed blank underneath it, whatever the window size.
|
||||||
|
// Watching the host is the only fix that also survives a window resize, a
|
||||||
|
// split-pane drag and the tab being shown for the first time.
|
||||||
|
// fitWorld above ran against a container that may still have had no size —
|
||||||
|
// the tab is mounted hidden. Fit ONCE more the first time it really has one,
|
||||||
|
// and never again: after that the view belongs to the operator.
|
||||||
|
let fitted = false;
|
||||||
|
const ro = new ResizeObserver(() => {
|
||||||
|
m.invalidateSize({ animate: false });
|
||||||
|
const el = hostRef.current;
|
||||||
|
if (!fitted && el && el.clientWidth > 0 && el.clientHeight > 0) {
|
||||||
|
fitted = true;
|
||||||
|
m.fitWorld({ animate: false });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
ro.observe(hostRef.current);
|
||||||
|
return () => { ro.disconnect(); m.remove(); mapRef.current = null; layerRef.current = null; };
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
// The chosen basemap, shared with the Main-tab map so picking one there and
|
||||||
|
// finding another here cannot happen.
|
||||||
|
const baseRef = useRef<L.TileLayer | null>(null);
|
||||||
|
const labelsRef = useRef<L.TileLayer | null>(null);
|
||||||
|
useEffect(() => {
|
||||||
|
const m = mapRef.current;
|
||||||
|
if (!m) return;
|
||||||
|
// noWrap stops the world REPEATING; bounds stops Leaflet asking for the
|
||||||
|
// empty columns either side of it. What is left beside the planet is then
|
||||||
|
// the panel's own background rather than a wall of grey apologies.
|
||||||
|
addBasemap(m, basemap, baseRef, labelsRef, { noWrap: true, bounds: WORLD_BOUNDS });
|
||||||
|
baseRef.current?.bringToBack();
|
||||||
|
}, [basemap]);
|
||||||
|
|
||||||
|
// Redraw the squares.
|
||||||
|
useEffect(() => {
|
||||||
|
const layer = layerRef.current;
|
||||||
|
if (!layer) return;
|
||||||
|
layer.clearLayers();
|
||||||
|
// Resolved once for the whole redraw, not per square: getComputedStyle
|
||||||
|
// forces a style flush, and doing that a thousand times is a visible stall.
|
||||||
|
const confirmedColour = confColour || cssColour('--success', '#16a34a');
|
||||||
|
const workedFill = workedColour || cssColour('--chart-1', '#2a78d6');
|
||||||
|
const meColour = cssColour('--warning', '#f59e0b');
|
||||||
|
for (const sq of squares ?? []) {
|
||||||
|
const b = gridSquareBounds(sq.grid);
|
||||||
|
if (!b) continue;
|
||||||
|
// One hue, two states. Confirmed is the solid, saturated one; worked is
|
||||||
|
// the same colour held back — so the eye reads "more" and "less" of the
|
||||||
|
// same thing rather than two unrelated facts.
|
||||||
|
const colour = sq.confirmed ? confirmedColour : workedFill;
|
||||||
|
L.rectangle([[b.south, b.west], [b.north, b.east]], {
|
||||||
|
color: colour,
|
||||||
|
weight: 0.5,
|
||||||
|
opacity: sq.confirmed ? 0.9 : 0.5,
|
||||||
|
fillColor: colour,
|
||||||
|
fillOpacity: sq.confirmed ? 0.55 : 0.22,
|
||||||
|
})
|
||||||
|
.bindTooltip(
|
||||||
|
`${sq.grid} — ${sq.count} QSO${sq.count > 1 ? 's' : ''}` +
|
||||||
|
`${sq.band ? ` · ${sq.band}` : ''}${sq.mode ? ` ${sq.mode}` : ''}` +
|
||||||
|
`${sq.confirmed ? ` · ${t('gsm.confirmed')}` : ''}`,
|
||||||
|
{ sticky: true },
|
||||||
|
)
|
||||||
|
.addTo(layer);
|
||||||
|
}
|
||||||
|
// The operator's own square, so the pattern has an origin to be read from.
|
||||||
|
const me = myGrid ? gridToLatLon(myGrid) : null;
|
||||||
|
if (me) {
|
||||||
|
L.circleMarker([me.lat, me.lon], {
|
||||||
|
radius: 4, color: meColour, weight: 2,
|
||||||
|
fillColor: meColour, fillOpacity: 1,
|
||||||
|
}).bindTooltip(myGrid!.toUpperCase(), { sticky: true }).addTo(layer);
|
||||||
|
}
|
||||||
|
}, [squares, myGrid, t, themeTick, confColour, workedColour]);
|
||||||
|
|
||||||
|
const stats = useMemo(() => {
|
||||||
|
const list = squares ?? [];
|
||||||
|
return { total: list.length, confirmed: list.filter((s) => s.confirmed).length };
|
||||||
|
}, [squares]);
|
||||||
|
|
||||||
|
return (
|
||||||
|
// isolate is load-bearing, not tidiness. Leaflet puts its panes at z-index
|
||||||
|
// 400 and its zoom control at 1000, in the PAGE's stacking context — and the
|
||||||
|
// modals here are z-50. Without a stacking context of its own the map floats
|
||||||
|
// over Preferences and hides the Save and Close buttons. isolation:isolate
|
||||||
|
// confines every z-index Leaflet sets to this element.
|
||||||
|
<section className={cn('isolate relative flex flex-col min-h-0 rounded-lg border border-border bg-card overflow-hidden', className)}>
|
||||||
|
<header className="flex items-center gap-2 px-2.5 py-1.5 border-b border-border bg-muted/40 shrink-0 flex-wrap">
|
||||||
|
<span className="text-xs font-semibold uppercase tracking-wider text-muted-foreground">
|
||||||
|
{t('gsm.title')}
|
||||||
|
</span>
|
||||||
|
<div className="inline-flex rounded-md border border-border overflow-hidden">
|
||||||
|
{SCOPES.map((s, i) => (
|
||||||
|
<button key={s.key} type="button"
|
||||||
|
onClick={() => { setScope(s.key); try { localStorage.setItem(SCOPE_KEY, s.key); } catch { /* quota */ } }}
|
||||||
|
className={cn('px-1.5 h-6 text-[11px] whitespace-nowrap', i > 0 && 'border-l border-border',
|
||||||
|
scope === s.key ? 'bg-primary text-primary-foreground' : 'hover:bg-muted text-muted-foreground')}>
|
||||||
|
{t(s.label)}
|
||||||
|
</button>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
<span className="text-[11px] text-muted-foreground tabular-nums">
|
||||||
|
{t('gsm.count', { n: stats.total, c: stats.confirmed })}
|
||||||
|
</span>
|
||||||
|
<select
|
||||||
|
value={basemap}
|
||||||
|
onChange={(e) => { const v = e.target.value as BasemapKey; setBasemap(v); writeUiPref('opslog.mapBasemap', v); }}
|
||||||
|
title={t('gsm.basemap')}
|
||||||
|
className="h-6 rounded border border-border bg-background px-1 text-[11px]"
|
||||||
|
>
|
||||||
|
{(Object.keys(BASEMAPS) as BasemapKey[]).map((k) => (
|
||||||
|
<option key={k} value={k}>{BASEMAPS[k].label}</option>
|
||||||
|
))}
|
||||||
|
</select>
|
||||||
|
{/* Beside the basemap, because they answer the same question: what this
|
||||||
|
map looks like. Written straight through — there is no Save here. */}
|
||||||
|
<label className="inline-flex items-center gap-1 text-[11px] text-muted-foreground" title={t('gsm.colConfirmed')}>
|
||||||
|
<input type="color" className="size-5 rounded border border-border bg-transparent p-0 cursor-pointer"
|
||||||
|
value={asHex(confColour || cssColour('--success', '#16a34a'), '#16a34a')}
|
||||||
|
onChange={(e) => { setConfColour(e.target.value); writeUiPref(COL_CONFIRMED_KEY, e.target.value); }} />
|
||||||
|
{t('gsm.confirmed')}
|
||||||
|
</label>
|
||||||
|
<label className="inline-flex items-center gap-1 text-[11px] text-muted-foreground" title={t('gsm.colWorked')}>
|
||||||
|
<input type="color" className="size-5 rounded border border-border bg-transparent p-0 cursor-pointer"
|
||||||
|
value={asHex(workedColour || cssColour('--chart-1', '#2a78d6'), '#2a78d6')}
|
||||||
|
onChange={(e) => { setWorkedColour(e.target.value); writeUiPref(COL_WORKED_KEY, e.target.value); }} />
|
||||||
|
{t('gsm.worked')}
|
||||||
|
</label>
|
||||||
|
{(confColour || workedColour) && (
|
||||||
|
<button type="button" title={t('gsm.colReset')}
|
||||||
|
onClick={() => {
|
||||||
|
setConfColour(''); setWorkedColour('');
|
||||||
|
writeUiPref(COL_CONFIRMED_KEY, ''); writeUiPref(COL_WORKED_KEY, '');
|
||||||
|
}}
|
||||||
|
className="text-[11px] text-muted-foreground hover:text-foreground px-1">↺</button>
|
||||||
|
)}
|
||||||
|
<span className="flex-1" />
|
||||||
|
<button type="button" onClick={() => void load()} disabled={busy} title={t('gsm.refresh')}
|
||||||
|
className="inline-flex items-center justify-center size-6 rounded border border-border hover:bg-muted disabled:opacity-50">
|
||||||
|
{busy ? <Loader2 className="size-3 animate-spin" /> : <RefreshCw className="size-3" />}
|
||||||
|
</button>
|
||||||
|
</header>
|
||||||
|
{err && <p className="px-2.5 py-1 text-[11px] text-destructive shrink-0">{err}</p>}
|
||||||
|
{/* The map host must have a real height or Leaflet renders nothing at all
|
||||||
|
— flex-1 + min-h-0, never a percentage. */}
|
||||||
|
{/* The ground beside the planet is the panel's own background: Leaflet
|
||||||
|
paints its container, and left to its default that surround was a
|
||||||
|
bright white slab against a dark theme. */}
|
||||||
|
<div ref={hostRef} className="flex-1 min-h-0 bg-card" />
|
||||||
|
<footer className="flex items-center gap-3 px-2.5 py-1 border-t border-border bg-muted/30 shrink-0 text-[10px] text-muted-foreground">
|
||||||
|
<span className="inline-flex items-center gap-1.5">
|
||||||
|
<span className="inline-block size-2.5 rounded-[2px]"
|
||||||
|
style={{ background: confColour || 'var(--success)', opacity: 0.75 }} />
|
||||||
|
{t('gsm.confirmed')}
|
||||||
|
</span>
|
||||||
|
<span className="inline-flex items-center gap-1.5">
|
||||||
|
<span className="inline-block size-2.5 rounded-[2px]"
|
||||||
|
style={{ background: workedColour || 'var(--chart-1)', opacity: 0.35 }} />
|
||||||
|
{t('gsm.worked')}
|
||||||
|
</span>
|
||||||
|
</footer>
|
||||||
|
</section>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -61,8 +61,8 @@ const ESRI_STREET_ATTR = 'Tiles © Esri — Source: Esri, HERE, Garmin, &cop
|
|||||||
// Selectable basemaps for the world (great-circle) map. All key-free and all
|
// Selectable basemaps for the world (great-circle) map. All key-free and all
|
||||||
// LABELLED (country/continent names). `labelsUrl` adds a transparent place-name
|
// LABELLED (country/continent names). `labelsUrl` adds a transparent place-name
|
||||||
// overlay on top of an imagery basemap (so satellite keeps its names too).
|
// overlay on top of an imagery basemap (so satellite keeps its names too).
|
||||||
type BasemapKey = 'light' | 'voyager' | 'street' | 'satellite';
|
export type BasemapKey = 'light' | 'voyager' | 'street' | 'satellite';
|
||||||
const BASEMAPS: Record<BasemapKey, { label: string; url: string; attr: string; subdomains?: string; labelsUrl?: string }> = {
|
export const BASEMAPS: Record<BasemapKey, { label: string; url: string; attr: string; subdomains?: string; labelsUrl?: string }> = {
|
||||||
light: { label: 'Light', url: CARTO_LIGHT, attr: CARTO_ATTR, subdomains: 'abcd' },
|
light: { label: 'Light', url: CARTO_LIGHT, attr: CARTO_ATTR, subdomains: 'abcd' },
|
||||||
voyager: { label: 'Voyager', url: 'https://{s}.basemaps.cartocdn.com/rastertiles/voyager/{z}/{x}/{y}{r}.png',
|
voyager: { label: 'Voyager', url: 'https://{s}.basemaps.cartocdn.com/rastertiles/voyager/{z}/{x}/{y}{r}.png',
|
||||||
attr: CARTO_ATTR, subdomains: 'abcd' },
|
attr: CARTO_ATTR, subdomains: 'abcd' },
|
||||||
@@ -71,7 +71,7 @@ const BASEMAPS: Record<BasemapKey, { label: string; url: string; attr: string; s
|
|||||||
attr: 'Tiles © Esri — Source: Esri, Maxar, Earthstar Geographics',
|
attr: 'Tiles © Esri — Source: Esri, Maxar, Earthstar Geographics',
|
||||||
labelsUrl: 'https://server.arcgisonline.com/ArcGIS/rest/services/Reference/World_Boundaries_and_Places/MapServer/tile/{z}/{y}/{x}' },
|
labelsUrl: 'https://server.arcgisonline.com/ArcGIS/rest/services/Reference/World_Boundaries_and_Places/MapServer/tile/{z}/{y}/{x}' },
|
||||||
};
|
};
|
||||||
function loadBasemap(): BasemapKey {
|
export function loadBasemap(): BasemapKey {
|
||||||
const v = localStorage.getItem('opslog.mapBasemap');
|
const v = localStorage.getItem('opslog.mapBasemap');
|
||||||
return v === 'voyager' || v === 'street' || v === 'satellite' ? v : 'light';
|
return v === 'voyager' || v === 'street' || v === 'satellite' ? v : 'light';
|
||||||
}
|
}
|
||||||
@@ -80,18 +80,32 @@ function loadBasemap(): BasemapKey {
|
|||||||
// place-name overlay. updateWhenIdle/keepBuffer keep the number of live tiles
|
// place-name overlay. updateWhenIdle/keepBuffer keep the number of live tiles
|
||||||
// down: satellite loads TWO tile layers, so its tile count — and the composited
|
// down: satellite loads TWO tile layers, so its tile count — and the composited
|
||||||
// layers WebView2 has to hold — is double every other basemap's.
|
// layers WebView2 has to hold — is double every other basemap's.
|
||||||
function addBasemap(
|
export function addBasemap(
|
||||||
m: L.Map,
|
m: L.Map,
|
||||||
key: BasemapKey,
|
key: BasemapKey,
|
||||||
base: React.MutableRefObject<L.TileLayer | null>,
|
base: React.MutableRefObject<L.TileLayer | null>,
|
||||||
labels: React.MutableRefObject<L.TileLayer | null>,
|
labels: React.MutableRefObject<L.TileLayer | null>,
|
||||||
|
// noWrap draws the world ONCE instead of repeating it east and west.
|
||||||
|
//
|
||||||
|
// The great-circle map wants the repeats: a path from France to Japan reads
|
||||||
|
// better crossing a second copy of Asia than wrapping round the back. A map of
|
||||||
|
// where you have been heard does not — three North Americas is three times the
|
||||||
|
// same answer, and it makes the picture harder to read, not wider.
|
||||||
|
// bounds stops Leaflet asking for tiles outside the world at all: Esri answers
|
||||||
|
// those with a grey "Map data not yet available" image, and zoomed out on a
|
||||||
|
// wide window that is most of the screen.
|
||||||
|
opts?: { noWrap?: boolean; bounds?: L.LatLngBoundsExpression },
|
||||||
) {
|
) {
|
||||||
if (base.current) { m.removeLayer(base.current); base.current = null; }
|
if (base.current) { m.removeLayer(base.current); base.current = null; }
|
||||||
if (labels.current) { m.removeLayer(labels.current); labels.current = null; }
|
if (labels.current) { m.removeLayer(labels.current); labels.current = null; }
|
||||||
const bm = BASEMAPS[key];
|
const bm = BASEMAPS[key];
|
||||||
const opts: L.TileLayerOptions = { maxZoom: 19, updateWhenIdle: true, updateWhenZooming: false, keepBuffer: 1 };
|
const tileOpts: L.TileLayerOptions = {
|
||||||
base.current = L.tileLayer(bm.url, { ...opts, attribution: bm.attr, subdomains: bm.subdomains ?? 'abc' }).addTo(m);
|
maxZoom: 19, updateWhenIdle: true, updateWhenZooming: false, keepBuffer: 1,
|
||||||
if (bm.labelsUrl) labels.current = L.tileLayer(bm.labelsUrl, opts).addTo(m);
|
noWrap: !!opts?.noWrap,
|
||||||
|
...(opts?.bounds ? { bounds: opts.bounds } : {}),
|
||||||
|
};
|
||||||
|
base.current = L.tileLayer(bm.url, { ...tileOpts, attribution: bm.attr, subdomains: bm.subdomains ?? 'abc' }).addTo(m);
|
||||||
|
if (bm.labelsUrl) labels.current = L.tileLayer(bm.labelsUrl, tileOpts).addTo(m);
|
||||||
}
|
}
|
||||||
|
|
||||||
function dot(color: string): L.DivIcon {
|
function dot(color: string): L.DivIcon {
|
||||||
|
|||||||
@@ -0,0 +1,298 @@
|
|||||||
|
// MotorAntennaWidget — the Ultrabeam / SteppIR control, in one place.
|
||||||
|
//
|
||||||
|
// Lives in its own file because it is shown in TWO: the Station Control tab and
|
||||||
|
// the dock beside the entry strip. Two copies of a control that keys hardware is
|
||||||
|
// how one of them quietly stops matching the other — a pattern button that sets
|
||||||
|
// a different direction, a band list that tunes somewhere else.
|
||||||
|
import { useCallback, useEffect, useState } from 'react';
|
||||||
|
import { ArrowDownToLine, ChevronDown, ChevronUp, Loader2, Minus, Plus, RefreshCw, Antenna as AntennaIcon, X } from 'lucide-react';
|
||||||
|
import { cn } from '@/lib/utils';
|
||||||
|
import {
|
||||||
|
SetUltrabeamDirection, UltrabeamRetract, MotorSetElement, MotorReadElements,
|
||||||
|
MotorTuneKHz, MotorNudgeKHz, SetMotorFollow,
|
||||||
|
} from '../../wailsjs/go/main/App';
|
||||||
|
|
||||||
|
export type AntStatus = { enabled: boolean; type: string; connected: boolean; direction: number; frequency: number; moving: boolean; elements: number[]; follow?: boolean; step_khz?: number; track_mode?: string; bands?: string[]; band_freqs?: Record<string, number> };
|
||||||
|
|
||||||
|
// Where each band button points the antenna.
|
||||||
|
//
|
||||||
|
// Not the arithmetic centre of the band. An antenna is tuned for where people
|
||||||
|
// actually work: 20 m centres on 14175 but nobody lives there, and 10 m spans
|
||||||
|
// 1.7 MHz of which the top half is empty. These are the points that leave the
|
||||||
|
// elements closest to right for the whole band, and one nudge away from the rest.
|
||||||
|
const ANT_BAND_KHZ: Record<string, number> = {
|
||||||
|
'40m': 7100, '30m': 10125, '20m': 14150, '17m': 18110,
|
||||||
|
'15m': 21150, '12m': 24930, '10m': 28400, '6m': 50150,
|
||||||
|
};
|
||||||
|
|
||||||
|
// NUDGE_KHZ is the up/down step. 25 kHz because that is also the finest tracking
|
||||||
|
// threshold: a nudge smaller than the tracking step would be undone by the next
|
||||||
|
// poll while tracking is on.
|
||||||
|
const NUDGE_KHZ = 25;
|
||||||
|
|
||||||
|
// bandOfKHz names the band a frequency sits in, so a band button can light up
|
||||||
|
// when the ANTENNA is already there. Deliberately generous at the edges: the
|
||||||
|
// antenna's reported frequency is where it was commanded, which can sit slightly
|
||||||
|
// outside the allocation.
|
||||||
|
function bandOfKHz(khz: number): string {
|
||||||
|
const edges: [number, number, string][] = [
|
||||||
|
[6900, 7300, '40m'], [10050, 10200, '30m'], [13900, 14400, '20m'],
|
||||||
|
[18000, 18200, '17m'], [20900, 21500, '15m'], [24800, 25000, '12m'],
|
||||||
|
[27900, 29800, '10m'], [49900, 50600, '6m'],
|
||||||
|
];
|
||||||
|
for (const [lo, hi, b] of edges) if (khz >= lo && khz <= hi) return b;
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
// MotorAntennaWidget controls a motorized antenna (Ultrabeam / SteppIR) from the
|
||||||
|
// Station Control tab: pattern (Normal / 180° / Bi), Retract, and — Ultrabeam
|
||||||
|
// only — per-element length adjustment. Heading/state is polled by the panel.
|
||||||
|
const ELEMENT_STEP = 2; // the physical console adjusts 2 mm per press
|
||||||
|
|
||||||
|
// elementName maps an element index to a ham-radio name: 0 = reflector,
|
||||||
|
// 1 = driven element, then Director 1, 2, 3…
|
||||||
|
function elementName(i: number, t: (k: string, v?: any) => string): string {
|
||||||
|
if (i === 0) return t('station.reflector');
|
||||||
|
if (i === 1) return t('station.driven');
|
||||||
|
return `${t('station.director')} ${i - 1}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function MotorAntennaWidget({ ant, refetch, t, onClose, essentialsOnly }: {
|
||||||
|
ant: AntStatus;
|
||||||
|
refetch: () => void;
|
||||||
|
t: (k: string, v?: any) => string;
|
||||||
|
// onClose adds the dock's close button. The Station Control tab passes none:
|
||||||
|
// there the widget is a tile in a grid, and a tile that closes itself would
|
||||||
|
// leave a hole the operator cannot fill back in.
|
||||||
|
onClose?: () => void;
|
||||||
|
// essentialsOnly drops what an operator sets once and then leaves alone:
|
||||||
|
// tracking with its mode and step, and the per-element lengths. They belong in
|
||||||
|
// Station Control, where there is room to think; in the dock they are height
|
||||||
|
// spent on controls nobody touches between contacts, pushing the ones they do
|
||||||
|
// touch — pattern, bands, nudge — off the bottom.
|
||||||
|
essentialsOnly?: boolean;
|
||||||
|
}) {
|
||||||
|
const [err, setErr] = useState('');
|
||||||
|
const [lengths, setLengths] = useState<number[]>([]); // current element lengths (mm), from ReadElements
|
||||||
|
const [reading, setReading] = useState(false);
|
||||||
|
const [busyEl, setBusyEl] = useState<number | null>(null);
|
||||||
|
const [editingEl, setEditingEl] = useState<number | null>(null); // element whose mm is being typed
|
||||||
|
const [editVal, setEditVal] = useState('');
|
||||||
|
const run = (p: Promise<any>) => p.then(refetch).catch((e) => setErr(String(e?.message ?? e)));
|
||||||
|
const isUB = ant.type !== 'steppir';
|
||||||
|
|
||||||
|
const readLengths = useCallback(async () => {
|
||||||
|
setReading(true); setErr('');
|
||||||
|
try { setLengths(((await MotorReadElements()) ?? []) as number[]); }
|
||||||
|
catch (e: any) { setErr(String(e?.message ?? e)); }
|
||||||
|
finally { setReading(false); }
|
||||||
|
}, []);
|
||||||
|
// Read the current lengths once when the Ultrabeam widget mounts/connects, so
|
||||||
|
// +/- starts from the real values rather than blind.
|
||||||
|
useEffect(() => { if (isUB && ant.connected) readLengths(); }, [isUB, ant.connected, readLengths]);
|
||||||
|
|
||||||
|
// Send an absolute length to one element and remember it as the new baseline.
|
||||||
|
const setLen = async (i: number, mm: number) => {
|
||||||
|
const next = Math.max(0, Math.round(mm));
|
||||||
|
const prev = lengths[i] ?? 0;
|
||||||
|
setBusyEl(i); setErr('');
|
||||||
|
setLengths((ls) => { const c = [...ls]; c[i] = next; return c; }); // optimistic
|
||||||
|
try { await MotorSetElement(i, next); refetch(); }
|
||||||
|
catch (e: any) {
|
||||||
|
// Rejected by the controller — most often the element is at its travel
|
||||||
|
// limit for this band (extending on a low band). Revert the optimistic
|
||||||
|
// value so the display stays truthful, and explain the likely cause when
|
||||||
|
// the failed move was an extension.
|
||||||
|
setLengths((ls) => { const c = [...ls]; c[i] = prev; return c; });
|
||||||
|
setErr(next > prev ? t('station.atMax') : String(e?.message ?? e));
|
||||||
|
}
|
||||||
|
finally { setBusyEl(null); }
|
||||||
|
};
|
||||||
|
// Nudge one element by ±2 mm from its current known length.
|
||||||
|
const nudge = (i: number, delta: number) => setLen(i, (lengths[i] ?? 0) + delta);
|
||||||
|
// Commit a typed exact length (click on the mm value). Lets the operator fix
|
||||||
|
// the baseline when the auto-read is off, so +/- then work reliably.
|
||||||
|
const commitEdit = (i: number) => {
|
||||||
|
const v = parseInt(editVal, 10);
|
||||||
|
setEditingEl(null);
|
||||||
|
if (!isNaN(v) && v >= 0 && v !== lengths[i]) setLen(i, v);
|
||||||
|
};
|
||||||
|
const dirs: [number, string][] = [[0, 'N'], [1, '180°'], [2, t('station.bi')]];
|
||||||
|
return (
|
||||||
|
<div className="rounded-xl border border-border bg-card shadow-sm overflow-hidden h-full flex flex-col min-h-0">
|
||||||
|
<div className="flex items-center gap-2 px-2 py-1.5 border-b border-border/60 bg-muted/30 shrink-0">
|
||||||
|
<AntennaIcon className="size-4 text-primary" />
|
||||||
|
<div className="min-w-0">
|
||||||
|
<div className="text-sm font-semibold truncate">{isUB ? 'Ultrabeam' : 'SteppIR'}</div>
|
||||||
|
{ant.frequency > 0 && <div className="text-[10px] text-muted-foreground font-mono">{(ant.frequency / 1000).toFixed(3)} MHz</div>}
|
||||||
|
</div>
|
||||||
|
{ant.moving && <span className="ml-auto text-[10px] font-semibold text-warning animate-pulse">{t('station.moving')}</span>}
|
||||||
|
<span className={cn('size-2 rounded-full shrink-0', ant.moving ? '' : 'ml-auto', ant.connected ? 'bg-success' : 'bg-muted-foreground/40')}
|
||||||
|
title={ant.connected ? t('station.online') : t('station.offline')} />
|
||||||
|
{onClose && (
|
||||||
|
<button type="button" onClick={onClose} title={t('station.hideWidget')}
|
||||||
|
className="text-muted-foreground hover:text-foreground shrink-0">
|
||||||
|
<X className="size-3.5" />
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
<div className="p-2 space-y-2 flex-1 min-h-0 overflow-auto">
|
||||||
|
<div>
|
||||||
|
{/* No heading: N / 180° / Bi say what they are, and in a docked widget
|
||||||
|
a line of height costs more than the word explains. */}
|
||||||
|
<div className="flex gap-1">
|
||||||
|
{dirs.map(([d, lbl]) => (
|
||||||
|
<button key={d} type="button" disabled={!ant.connected}
|
||||||
|
onClick={() => run(SetUltrabeamDirection(d))}
|
||||||
|
className={cn('flex-1 rounded-md border py-1 text-xs font-semibold transition-colors disabled:opacity-40',
|
||||||
|
ant.direction === d ? 'bg-primary text-primary-foreground border-primary' : 'border-border hover:bg-muted')}>
|
||||||
|
{lbl}
|
||||||
|
</button>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{/* Bands, then a nudge, then tracking — in the order an operator uses
|
||||||
|
them: get to the band, fine-tune inside it, decide whether the
|
||||||
|
antenna should follow the rig from here. */}
|
||||||
|
<div>
|
||||||
|
<div className="text-[10px] font-semibold uppercase tracking-wider text-muted-foreground mb-0.5">{t('station.bands')}</div>
|
||||||
|
<div className="grid grid-cols-5 gap-1">
|
||||||
|
{(ant.bands ?? []).map((b: string) => {
|
||||||
|
// Where this band tunes is resolved by the backend — the operator's
|
||||||
|
// per-band choice from Settings, or the default. ANT_BAND_KHZ is only
|
||||||
|
// the floor for a status poll that hasn't landed yet.
|
||||||
|
const khz = ant.band_freqs?.[b] || ANT_BAND_KHZ[b];
|
||||||
|
if (!khz) return null;
|
||||||
|
// "On this band" from the antenna's own frequency, not the rig's:
|
||||||
|
// the widget must show where the ANTENNA is, which is the whole
|
||||||
|
// reason for tuning it by hand.
|
||||||
|
const here = ant.frequency > 0 && bandOfKHz(ant.frequency) === b;
|
||||||
|
return (
|
||||||
|
<button key={b} type="button" disabled={!ant.connected}
|
||||||
|
onClick={() => run(MotorTuneKHz(khz))}
|
||||||
|
title={`${(khz / 1000).toFixed(3)} MHz`}
|
||||||
|
className={cn('rounded-md border py-0.5 text-[11px] font-mono font-semibold transition-colors disabled:opacity-40',
|
||||||
|
here ? 'bg-primary text-primary-foreground border-primary' : 'border-border hover:bg-muted')}>
|
||||||
|
{b}
|
||||||
|
</button>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="flex items-center gap-1">
|
||||||
|
<button type="button" disabled={!ant.connected}
|
||||||
|
onClick={() => run(MotorNudgeKHz(-NUDGE_KHZ))}
|
||||||
|
title={t('station.nudgeDown', { n: NUDGE_KHZ })}
|
||||||
|
className="flex-1 flex items-center justify-center gap-1 rounded-md border border-border py-1 text-xs font-semibold hover:bg-muted disabled:opacity-40">
|
||||||
|
<ChevronDown className="size-3.5" /> {NUDGE_KHZ}
|
||||||
|
</button>
|
||||||
|
<button type="button" disabled={!ant.connected}
|
||||||
|
onClick={() => run(MotorNudgeKHz(NUDGE_KHZ))}
|
||||||
|
title={t('station.nudgeUp', { n: NUDGE_KHZ })}
|
||||||
|
className="flex-1 flex items-center justify-center gap-1 rounded-md border border-border py-1 text-xs font-semibold hover:bg-muted disabled:opacity-40">
|
||||||
|
<ChevronUp className="size-3.5" /> {NUDGE_KHZ}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Tracking. Here rather than only in Settings because it is an operating
|
||||||
|
decision — off to park the antenna, on to resume — not something set
|
||||||
|
up once. Mode and step only show when tracking is on: settings for
|
||||||
|
something switched off are questions the operator cannot act on. And
|
||||||
|
the step only shows in step mode, where it is the one thing it means. */}
|
||||||
|
{!essentialsOnly && (
|
||||||
|
<div className="space-y-1.5">
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<button type="button"
|
||||||
|
onClick={() => run(SetMotorFollow(!ant.follow, 0, ''))}
|
||||||
|
className={cn('flex-1 rounded-md border py-1 text-xs font-semibold transition-colors',
|
||||||
|
ant.follow ? 'bg-success-muted text-success-muted-foreground border-success-border' : 'border-border hover:bg-muted')}>
|
||||||
|
{ant.follow ? t('station.trackOn') : t('station.trackOff')}
|
||||||
|
</button>
|
||||||
|
{ant.follow && (ant.track_mode || 'step') === 'step' && (
|
||||||
|
<select
|
||||||
|
value={String(ant.step_khz || 50)}
|
||||||
|
onChange={(e) => run(SetMotorFollow(true, parseInt(e.target.value, 10), ''))}
|
||||||
|
className="h-[30px] rounded-md border border-border bg-background px-1 text-xs font-mono"
|
||||||
|
title={t('station.trackStepTip')}
|
||||||
|
>
|
||||||
|
{[25, 50, 100].map((s) => <option key={s} value={s}>{s} kHz</option>)}
|
||||||
|
</select>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
{ant.follow && (
|
||||||
|
<select
|
||||||
|
value={ant.track_mode || 'step'}
|
||||||
|
onChange={(e) => run(SetMotorFollow(true, 0, e.target.value))}
|
||||||
|
className="w-full h-[30px] rounded-md border border-border bg-background px-1.5 text-xs"
|
||||||
|
title={t('station.trackModeTip')}
|
||||||
|
>
|
||||||
|
<option value="always" title={t('station.trackAlwaysTip')}>{t('station.trackAlways')}</option>
|
||||||
|
<option value="step" title={t('station.trackStepTipMode')}>{t('station.trackStep')}</option>
|
||||||
|
<option value="band" title={t('station.trackBandTip')}>{t('station.trackBand')}</option>
|
||||||
|
</select>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<button type="button" disabled={!ant.connected}
|
||||||
|
onClick={() => run(UltrabeamRetract())}
|
||||||
|
className="w-full flex items-center justify-center gap-1.5 rounded-md border border-warning-border bg-warning-muted text-warning-muted-foreground py-1 text-xs font-semibold hover:brightness-95 disabled:opacity-40">
|
||||||
|
<ArrowDownToLine className="size-3.5" /> {t('station.retract')}
|
||||||
|
</button>
|
||||||
|
|
||||||
|
{isUB && !essentialsOnly && (
|
||||||
|
<div>
|
||||||
|
<div className="flex items-center gap-2 mb-1.5">
|
||||||
|
<span className="text-[10px] font-semibold uppercase tracking-wider text-muted-foreground">{t('station.elements')}</span>
|
||||||
|
<button type="button" onClick={readLengths} disabled={!ant.connected || reading}
|
||||||
|
className="text-[10px] text-primary hover:underline inline-flex items-center gap-1 disabled:opacity-40" title={t('station.readLengths')}>
|
||||||
|
<RefreshCw className={cn('size-3', reading && 'animate-spin')} /> {t('station.read')}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
{lengths.length === 0 ? (
|
||||||
|
<p className="text-[11px] text-muted-foreground">{t('station.noLengths')}</p>
|
||||||
|
) : (
|
||||||
|
<div className="space-y-1.5">
|
||||||
|
{/* The READ_BANDS reply is undocumented and its 16-bit parse picks
|
||||||
|
up structural bytes past the real data (varying by band), which
|
||||||
|
made 6+ bogus "elements" appear. Ultrabeam beams are 3-element,
|
||||||
|
and ModifyElement addresses elements 0..2 — so show just those. */}
|
||||||
|
{lengths.map((mm, i) => ({ mm, i })).slice(0, 3).map(({ mm, i }) => (
|
||||||
|
<div key={i} className="flex items-center gap-2">
|
||||||
|
<span className="text-xs w-20 shrink-0 text-muted-foreground truncate">{elementName(i, t)}</span>
|
||||||
|
<button type="button" disabled={!ant.connected || busyEl !== null}
|
||||||
|
onClick={() => nudge(i, -ELEMENT_STEP)}
|
||||||
|
className="flex items-center justify-center size-7 rounded-md border border-border hover:bg-muted disabled:opacity-40 shrink-0">
|
||||||
|
<Minus className="size-3.5" />
|
||||||
|
</button>
|
||||||
|
{editingEl === i ? (
|
||||||
|
<input autoFocus type="number" value={editVal}
|
||||||
|
onChange={(e) => setEditVal(e.target.value)}
|
||||||
|
onBlur={() => commitEdit(i)}
|
||||||
|
onKeyDown={(e) => { if (e.key === 'Enter') commitEdit(i); if (e.key === 'Escape') setEditingEl(null); }}
|
||||||
|
className="text-sm font-mono font-bold flex-1 min-w-0 text-center tabular-nums bg-transparent border border-primary rounded px-1" />
|
||||||
|
) : (
|
||||||
|
<span className="text-sm font-mono font-bold flex-1 min-w-0 text-center tabular-nums cursor-pointer hover:underline"
|
||||||
|
title={t('station.setExactLen')}
|
||||||
|
onClick={() => { setEditingEl(i); setEditVal(String(mm)); }}>
|
||||||
|
{busyEl === i ? <Loader2 className="size-3.5 animate-spin inline" /> : `${mm} mm`}
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
<button type="button" disabled={!ant.connected || busyEl !== null}
|
||||||
|
onClick={() => nudge(i, ELEMENT_STEP)}
|
||||||
|
className="flex items-center justify-center size-7 rounded-md border border-border hover:bg-muted disabled:opacity-40 shrink-0">
|
||||||
|
<Plus className="size-3.5" />
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
<p className="text-[10px] text-muted-foreground mt-1">{t('station.elementsHint')}</p>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
{err && <div className="text-[11px] text-destructive break-words">{err}</div>}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -49,6 +49,7 @@ type QSOMenuHandlers = {
|
|||||||
onUpdateFromCty?: (ids: number[]) => void;
|
onUpdateFromCty?: (ids: number[]) => void;
|
||||||
onUpdateFromQRZ?: (ids: number[]) => void;
|
onUpdateFromQRZ?: (ids: number[]) => void;
|
||||||
onUpdateFromClublog?: (ids: number[]) => void;
|
onUpdateFromClublog?: (ids: number[]) => void;
|
||||||
|
onUpdateCountyFromULS?: (ids: number[]) => void;
|
||||||
onSendTo?: (service: string, ids: number[]) => void;
|
onSendTo?: (service: string, ids: number[]) => void;
|
||||||
onSendRecording?: (ids: number[]) => void;
|
onSendRecording?: (ids: number[]) => void;
|
||||||
onSendEQSL?: (ids: number[]) => void;
|
onSendEQSL?: (ids: number[]) => void;
|
||||||
|
|||||||
@@ -111,7 +111,38 @@ export function fmtQslDate(s?: string): string {
|
|||||||
|
|
||||||
// QSL Manager as an in-app tab panel: upload logged QSOs to online logbooks
|
// QSL Manager as an in-app tab panel: upload logged QSOs to online logbooks
|
||||||
// and download confirmations, while the rest of the app stays usable.
|
// and download confirmations, while the rest of the app stays usable.
|
||||||
export function QSLManagerPanel({ onEditQSO }: { onEditQSO?: (id: number) => void } = {}) {
|
// GridActions are the row actions the context menu offers, forwarded straight to
|
||||||
|
// whichever grid this panel is showing.
|
||||||
|
//
|
||||||
|
// The FILTERED exports are deliberately absent. "Export everything the filter
|
||||||
|
// matches" means the Recent-QSOs filter, and the rows here come from a different
|
||||||
|
// query entirely — offering it would export something other than what is on the
|
||||||
|
// screen, which is the one thing an export must never do. Selection-based
|
||||||
|
// exports have no such ambiguity: the ids are the rows you ticked.
|
||||||
|
export type GridActions = {
|
||||||
|
onUpdateFromCty?: (ids: number[]) => void;
|
||||||
|
onUpdateFromQRZ?: (ids: number[]) => void;
|
||||||
|
onUpdateFromClublog?: (ids: number[]) => void;
|
||||||
|
onUpdateCountyFromULS?: (ids: number[]) => void;
|
||||||
|
onSendTo?: (service: string, ids: number[]) => void;
|
||||||
|
onSendRecording?: (ids: number[]) => void;
|
||||||
|
onSendEQSL?: (ids: number[]) => void;
|
||||||
|
onBulkEdit?: (ids: number[]) => void;
|
||||||
|
onExportSelected?: (ids: number[]) => void;
|
||||||
|
onExportSelectedFields?: (ids: number[]) => void;
|
||||||
|
onExportCabrilloSelected?: (ids: number[]) => void;
|
||||||
|
onDelete?: (ids: number[]) => void;
|
||||||
|
};
|
||||||
|
|
||||||
|
export function QSLManagerPanel({ onEditQSO, actions, paperRequest }: {
|
||||||
|
onEditQSO?: (id: number) => void;
|
||||||
|
actions?: GridActions;
|
||||||
|
// A callsign to open the Paper QSL view on, sent from elsewhere in the app
|
||||||
|
// (the awards grid). Carries a counter rather than being a bare string: the
|
||||||
|
// panel is force-mounted and keeps its state, so asking twice for the SAME
|
||||||
|
// callsign has to be two requests, not one unchanged prop.
|
||||||
|
paperRequest?: { call: string; n: number };
|
||||||
|
} = {}) {
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const [service, setService] = useState('lotw');
|
const [service, setService] = useState('lotw');
|
||||||
// The callsign this profile signs/uploads/downloads as for the selected
|
// The callsign this profile signs/uploads/downloads as for the selected
|
||||||
@@ -172,6 +203,27 @@ export function QSLManagerPanel({ onEditQSO }: { onEditQSO?: (id: number) => voi
|
|||||||
}, [paperCall]);
|
}, [paperCall]);
|
||||||
|
|
||||||
|
|
||||||
|
// Honour an incoming request: switch to Paper QSL, fill the callsign, search.
|
||||||
|
// The search runs from the effect below once paperCall has actually changed —
|
||||||
|
// searchPaper closes over paperCall, so calling it here would search the
|
||||||
|
// PREVIOUS callsign.
|
||||||
|
// The pending request's callsign, so the search fires for THAT callsign and
|
||||||
|
// for nothing else: the effect below also wakes on every keystroke in the
|
||||||
|
// field, and searching on each of them would query the log letter by letter.
|
||||||
|
const pendingPaperCall = useRef('');
|
||||||
|
useEffect(() => {
|
||||||
|
const call = paperRequest?.call?.trim().toUpperCase();
|
||||||
|
if (!call) return;
|
||||||
|
setService('paper');
|
||||||
|
setPaperCall(call);
|
||||||
|
pendingPaperCall.current = call;
|
||||||
|
}, [paperRequest?.call, paperRequest?.n]);
|
||||||
|
useEffect(() => {
|
||||||
|
if (!pendingPaperCall.current || paperCall !== pendingPaperCall.current) return;
|
||||||
|
pendingPaperCall.current = '';
|
||||||
|
searchPaper();
|
||||||
|
}, [paperCall, searchPaper]);
|
||||||
|
|
||||||
async function applyPaper() {
|
async function applyPaper() {
|
||||||
const ids = paperRows.filter((r) => paperSel.has(r.id)).map((r) => r.id);
|
const ids = paperRows.filter((r) => paperSel.has(r.id)).map((r) => r.id);
|
||||||
if (ids.length === 0) return;
|
if (ids.length === 0) return;
|
||||||
@@ -443,6 +495,8 @@ export function QSLManagerPanel({ onEditQSO }: { onEditQSO?: (id: number) => voi
|
|||||||
total={paperRows.length}
|
total={paperRows.length}
|
||||||
selectAllSignal={paperSelAllSig}
|
selectAllSignal={paperSelAllSig}
|
||||||
onRowSelected={(ids) => setPaperSel(new Set(ids))}
|
onRowSelected={(ids) => setPaperSel(new Set(ids))}
|
||||||
|
{...actions}
|
||||||
|
onRowDoubleClicked={onEditQSO ? (q) => onEditQSO(q.id as number) : undefined}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
@@ -549,6 +603,8 @@ export function QSLManagerPanel({ onEditQSO }: { onEditQSO?: (id: number) => voi
|
|||||||
total={rows.length}
|
total={rows.length}
|
||||||
selectAllSignal={uploadSelAllSig}
|
selectAllSignal={uploadSelAllSig}
|
||||||
onRowSelected={onUploadRowSelected}
|
onRowSelected={onUploadRowSelected}
|
||||||
|
{...actions}
|
||||||
|
onRowDoubleClicked={onEditQSO ? (q) => onEditQSO(q.id as number) : undefined}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { useEffect, useLayoutEffect, useRef, useState } from 'react';
|
import { useEffect, useLayoutEffect, useRef, useState } from 'react';
|
||||||
import { Globe2, RefreshCw, Upload, BadgeCheck, Mail, FileDown, PencilLine, Trash2 } from 'lucide-react';
|
import { Globe2, RefreshCw, Upload, BadgeCheck, Mail, FileDown, PencilLine, Trash2, MapPin } from 'lucide-react';
|
||||||
import { useI18n } from '@/lib/i18n';
|
import { useI18n } from '@/lib/i18n';
|
||||||
|
|
||||||
export type QSOMenuState = { x: number; y: number; ids: number[] } | null;
|
export type QSOMenuState = { x: number; y: number; ids: number[] } | null;
|
||||||
@@ -7,9 +7,12 @@ export type QSOMenuState = { x: number; y: number; ids: number[] } | null;
|
|||||||
type Props = {
|
type Props = {
|
||||||
menu: QSOMenuState;
|
menu: QSOMenuState;
|
||||||
onClose: () => void;
|
onClose: () => 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;
|
||||||
|
// Only passed once the offline US county database has been downloaded —
|
||||||
|
// an entry that can only ever answer "no database" is not worth a line here.
|
||||||
|
onUpdateCountyFromULS?: (ids: number[]) => void;
|
||||||
onSendTo?: (service: string, ids: number[]) => void;
|
onSendTo?: (service: string, ids: number[]) => void;
|
||||||
onSendRecording?: (ids: number[]) => void;
|
onSendRecording?: (ids: number[]) => void;
|
||||||
onSendEQSL?: (ids: number[]) => void;
|
onSendEQSL?: (ids: number[]) => void;
|
||||||
@@ -36,7 +39,7 @@ const UPLOAD_TARGETS: { service: string; name: string }[] = [
|
|||||||
// or picks a command. (We deliberately do NOT close on scroll/resize: the QSO
|
// or picks a command. (We deliberately do NOT close on scroll/resize: the QSO
|
||||||
// list auto-refreshes and AG Grid fires internal scroll events on refresh,
|
// list auto-refreshes and AG Grid fires internal scroll events on refresh,
|
||||||
// which used to dismiss the menu the instant it appeared.)
|
// which used to dismiss the menu the instant it appeared.)
|
||||||
export function QSOContextMenu({ menu, onClose, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onSendTo, onSendRecording, onSendEQSL, onBulkEdit, onExportSelected, onExportSelectedFields, onExportFiltered, onExportCabrilloSelected, onExportCabrilloFiltered, onDelete }: Props) {
|
export function QSOContextMenu({ menu, onClose, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onUpdateCountyFromULS, onSendTo, onSendRecording, onSendEQSL, onBulkEdit, onExportSelected, onExportSelectedFields, onExportFiltered, onExportCabrilloSelected, onExportCabrilloFiltered, onDelete }: Props) {
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const boxRef = useRef<HTMLDivElement>(null);
|
const boxRef = useRef<HTMLDivElement>(null);
|
||||||
// Starts at the cursor; the layout effect corrects it once the real size is
|
// Starts at the cursor; the layout effect corrects it once the real size is
|
||||||
@@ -95,20 +98,28 @@ export function QSOContextMenu({ menu, onClose, onUpdateFromCty, onUpdateFromQRZ
|
|||||||
<div className="px-3 py-1 text-[11px] uppercase tracking-wider text-muted-foreground">
|
<div className="px-3 py-1 text-[11px] uppercase tracking-wider text-muted-foreground">
|
||||||
{t('qctx.selected', { n })}
|
{t('qctx.selected', { n })}
|
||||||
</div>
|
</div>
|
||||||
<button
|
{/* Conditional like every other entry. These two were drawn
|
||||||
className="flex w-full items-center gap-2 px-3 py-1.5 text-left hover:bg-accent/50"
|
unconditionally, and the grid passes them through an arrow that calls
|
||||||
onClick={() => { onUpdateFromCty(menu.ids); onClose(); }}
|
an optional handler — so in a grid that wires neither (the QSL
|
||||||
>
|
Manager) both appeared and did precisely nothing when clicked. */}
|
||||||
<Globe2 className="size-4 text-primary" />
|
{onUpdateFromCty && (
|
||||||
<span>{t('qctx.fixCountry')}</span>
|
<button
|
||||||
</button>
|
className="flex w-full items-center gap-2 px-3 py-1.5 text-left hover:bg-accent/50"
|
||||||
<button
|
onClick={() => { onUpdateFromCty(menu.ids); onClose(); }}
|
||||||
className="flex w-full items-center gap-2 px-3 py-1.5 text-left hover:bg-accent/50"
|
>
|
||||||
onClick={() => { onUpdateFromQRZ(menu.ids); onClose(); }}
|
<Globe2 className="size-4 text-primary" />
|
||||||
>
|
<span>{t('qctx.fixCountry')}</span>
|
||||||
<RefreshCw className="size-4 text-info" />
|
</button>
|
||||||
<span>{t('qctx.updateQrz')}</span>
|
)}
|
||||||
</button>
|
{onUpdateFromQRZ && (
|
||||||
|
<button
|
||||||
|
className="flex w-full items-center gap-2 px-3 py-1.5 text-left hover:bg-accent/50"
|
||||||
|
onClick={() => { onUpdateFromQRZ(menu.ids); onClose(); }}
|
||||||
|
>
|
||||||
|
<RefreshCw className="size-4 text-info" />
|
||||||
|
<span>{t('qctx.updateQrz')}</span>
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
{onUpdateFromClublog && (
|
{onUpdateFromClublog && (
|
||||||
<button
|
<button
|
||||||
className="flex w-full items-center gap-2 px-3 py-1.5 text-left hover:bg-accent/50"
|
className="flex w-full items-center gap-2 px-3 py-1.5 text-left hover:bg-accent/50"
|
||||||
@@ -118,6 +129,16 @@ export function QSOContextMenu({ menu, onClose, onUpdateFromCty, onUpdateFromQRZ
|
|||||||
<span>{t('qctx.updateClublog')}</span>
|
<span>{t('qctx.updateClublog')}</span>
|
||||||
</button>
|
</button>
|
||||||
)}
|
)}
|
||||||
|
{onUpdateCountyFromULS && (
|
||||||
|
<button
|
||||||
|
className="flex w-full items-center gap-2 px-3 py-1.5 text-left hover:bg-accent/50"
|
||||||
|
onClick={() => { onUpdateCountyFromULS(menu.ids); onClose(); }}
|
||||||
|
title={t('qctx.updateUlsCountyTitle')}
|
||||||
|
>
|
||||||
|
<MapPin className="size-4 text-info" />
|
||||||
|
<span>{t('qctx.updateUlsCounty')}</span>
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
|
||||||
{(onSendRecording || onSendEQSL) && (
|
{(onSendRecording || onSendEQSL) && (
|
||||||
<>
|
<>
|
||||||
|
|||||||
@@ -374,7 +374,10 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
|
|||||||
// refreshes it. A cached answer from a thinner QRZ subscription (or any
|
// refreshes it. A cached answer from a thinner QRZ subscription (or any
|
||||||
// stale row) otherwise stayed for its whole 30-day life and the button
|
// stale row) otherwise stayed for its whole 30-day life and the button
|
||||||
// appeared to do nothing.
|
// appeared to do nothing.
|
||||||
const r: any = await LookupCallsignFresh(call);
|
// The QSO's OWN date: a ClubLog exception is resolved as of when the
|
||||||
|
// contact happened, not as of today. Re-looking-up a DXpedition contact
|
||||||
|
// months later must not move it to whatever the prefix means now.
|
||||||
|
const r: any = await LookupCallsignFresh(call, (dateOn || '').slice(0, 10));
|
||||||
// The lookup WINS over what is in the record — that is the point of asking
|
// The lookup WINS over what is in the record — that is the point of asking
|
||||||
// for it. But an EMPTY result must never blank a good value: `??` only
|
// for it. But an EMPTY result must never blank a good value: `??` only
|
||||||
// guards against null, and Go marshals an unset string as "", so a QRZ
|
// guards against null, and Go marshals an unset string as "", so a QRZ
|
||||||
@@ -623,6 +626,7 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
|
|||||||
</div>
|
</div>
|
||||||
<div className="flex items-end gap-2">
|
<div className="flex items-end gap-2">
|
||||||
<div className="flex flex-col flex-1"><Label>{t('qedit.grid')}</Label><Input value={draft.grid ?? ''} onChange={(e) => set('grid', e.target.value)} className="font-mono uppercase" /></div>
|
<div className="flex flex-col flex-1"><Label>{t('qedit.grid')}</Label><Input value={draft.grid ?? ''} onChange={(e) => set('grid', e.target.value)} className="font-mono uppercase" /></div>
|
||||||
|
<div className="flex flex-col w-24"><Label>{t('qedit.gridExt')}</Label><Input title={t('qedit.gridExtTip')} value={draft.gridsquare_ext ?? ''} onChange={(e) => set('gridsquare_ext', e.target.value)} className="font-mono uppercase" /></div>
|
||||||
<div className="flex flex-col w-24"><Label>PFX</Label><Input readOnly value={pfxOf(draft.callsign ?? '')} className="font-mono bg-muted/40" /></div>
|
<div className="flex flex-col w-24"><Label>PFX</Label><Input readOnly value={pfxOf(draft.callsign ?? '')} className="font-mono bg-muted/40" /></div>
|
||||||
</div>
|
</div>
|
||||||
<div><Label>{t('qedit.comment')}</Label><Input value={draft.comment ?? ''} onChange={(e) => set('comment', e.target.value)}
|
<div><Label>{t('qedit.comment')}</Label><Input value={draft.comment ?? ''} onChange={(e) => set('comment', e.target.value)}
|
||||||
@@ -864,7 +868,7 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
|
|||||||
<F label={t('qedit.stationCallsign')} span={3}><Input value={draft.station_callsign ?? ''} onChange={(e) => set('station_callsign', e.target.value)} /></F>
|
<F label={t('qedit.stationCallsign')} span={3}><Input value={draft.station_callsign ?? ''} onChange={(e) => set('station_callsign', e.target.value)} /></F>
|
||||||
<F label={t('qedit.operator')} span={3}><Input value={draft.operator ?? ''} onChange={(e) => set('operator', e.target.value)} /></F>
|
<F label={t('qedit.operator')} span={3}><Input value={draft.operator ?? ''} onChange={(e) => set('operator', e.target.value)} /></F>
|
||||||
<F label={t('qedit.myGrid')}><Input value={draft.my_grid ?? ''} onChange={(e) => set('my_grid', e.target.value)} /></F>
|
<F label={t('qedit.myGrid')}><Input value={draft.my_grid ?? ''} onChange={(e) => set('my_grid', e.target.value)} /></F>
|
||||||
<F label={t('qedit.gridExt')}><Input value={draft.my_gridsquare_ext ?? ''} onChange={(e) => set('my_gridsquare_ext', e.target.value)} /></F>
|
<F label={t('qedit.myGridExt')}><Input title={t('qedit.gridExtTip')} value={draft.my_gridsquare_ext ?? ''} onChange={(e) => set('my_gridsquare_ext', e.target.value)} /></F>
|
||||||
<F label={t('qedit.country')} span={2}><Combobox value={draft.my_country ?? ''} options={countries} placeholder={t('qedit.country')} onChange={(v) => set('my_country', v)} /></F>
|
<F label={t('qedit.country')} span={2}><Combobox value={draft.my_country ?? ''} options={countries} placeholder={t('qedit.country')} onChange={(v) => set('my_country', v)} /></F>
|
||||||
<F label={t('qedit.state')}><Input value={draft.my_state ?? ''} onChange={(e) => set('my_state', e.target.value)} /></F>
|
<F label={t('qedit.state')}><Input value={draft.my_state ?? ''} onChange={(e) => set('my_state', e.target.value)} /></F>
|
||||||
<F label={t('qedit.county')}><Input value={draft.my_cnty ?? ''} onChange={(e) => set('my_cnty', e.target.value)} /></F>
|
<F label={t('qedit.county')}><Input value={draft.my_cnty ?? ''} onChange={(e) => set('my_cnty', e.target.value)} /></F>
|
||||||
@@ -900,6 +904,10 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
|
|||||||
<div>
|
<div>
|
||||||
<p className="text-[11px] font-semibold text-muted-foreground uppercase tracking-wider mb-2">{t('qedit.powerWeather')}</p>
|
<p className="text-[11px] font-semibold text-muted-foreground uppercase tracking-wider mb-2">{t('qedit.powerWeather')}</p>
|
||||||
<div className="grid grid-cols-6 gap-3">
|
<div className="grid grid-cols-6 gap-3">
|
||||||
|
{/* YOUR power first, then theirs. tx_pwr was saved by this
|
||||||
|
editor but had no field: a contact logged at the wrong
|
||||||
|
power could be read back and never corrected. */}
|
||||||
|
<F label={t('qedit.txPower')}><Input type="number" value={draft.tx_pwr ?? ''} onChange={(e) => set('tx_pwr', numOrUndef(e.target.value) as any)} /></F>
|
||||||
<F label={t('qedit.rxPower')}><Input type="number" value={draft.rx_pwr ?? ''} onChange={(e) => set('rx_pwr', numOrUndef(e.target.value) as any)} /></F>
|
<F label={t('qedit.rxPower')}><Input type="number" value={draft.rx_pwr ?? ''} onChange={(e) => set('rx_pwr', numOrUndef(e.target.value) as any)} /></F>
|
||||||
<F label={t('qedit.distance')}><Input type="number" value={draft.distance ?? ''} onChange={(e) => set('distance', numOrUndef(e.target.value) as any)} /></F>
|
<F label={t('qedit.distance')}><Input type="number" value={draft.distance ?? ''} onChange={(e) => set('distance', numOrUndef(e.target.value) as any)} /></F>
|
||||||
<F label={t('qedit.aIndex')}><Input type="number" value={draft.a_index ?? ''} onChange={(e) => set('a_index', numOrUndef(e.target.value) as any)} /></F>
|
<F label={t('qedit.aIndex')}><Input type="number" value={draft.a_index ?? ''} onChange={(e) => set('a_index', numOrUndef(e.target.value) as any)} /></F>
|
||||||
|
|||||||
@@ -64,6 +64,7 @@ type Props = {
|
|||||||
onUpdateFromCty?: (ids: number[]) => void;
|
onUpdateFromCty?: (ids: number[]) => void;
|
||||||
onUpdateFromQRZ?: (ids: number[]) => void;
|
onUpdateFromQRZ?: (ids: number[]) => void;
|
||||||
onUpdateFromClublog?: (ids: number[]) => void;
|
onUpdateFromClublog?: (ids: number[]) => void;
|
||||||
|
onUpdateCountyFromULS?: (ids: number[]) => void;
|
||||||
onSendTo?: (service: string, ids: number[]) => void;
|
onSendTo?: (service: string, ids: number[]) => void;
|
||||||
onSendRecording?: (ids: number[]) => void;
|
onSendRecording?: (ids: number[]) => void;
|
||||||
onSendEQSL?: (ids: number[]) => void;
|
onSendEQSL?: (ids: number[]) => void;
|
||||||
@@ -308,7 +309,7 @@ const sanitizeAwardCols = (st: any[] | null | undefined): any[] =>
|
|||||||
return rest;
|
return rest;
|
||||||
});
|
});
|
||||||
|
|
||||||
export function RecentQSOsGrid({ rows, myGrid, selectAllSignal, selectRowSignal, rowDragCall, passOrder, onGridApi, storageKey, onRowDoubleClicked, onRowClicked, onRowSelected, onRowSelectedQso, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onSendTo, onSendRecording, onSendEQSL, onBulkEdit, onExportSelected, onExportSelectedFields, onExportFiltered, onExportCabrilloSelected, onExportCabrilloFiltered, onDelete, onFilteredCountChange, awardCols, rowColors }: Props) {
|
export function RecentQSOsGrid({ rows, myGrid, selectAllSignal, selectRowSignal, rowDragCall, passOrder, onGridApi, storageKey, onRowDoubleClicked, onRowClicked, onRowSelected, onRowSelectedQso, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onUpdateCountyFromULS, onSendTo, onSendRecording, onSendEQSL, onBulkEdit, onExportSelected, onExportSelectedFields, onExportFiltered, onExportCabrilloSelected, onExportCabrilloFiltered, onDelete, onFilteredCountChange, awardCols, rowColors }: Props) {
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const gridRef = useRef<any>(null);
|
const gridRef = useRef<any>(null);
|
||||||
const [pickerOpen, setPickerOpen] = useState(false);
|
const [pickerOpen, setPickerOpen] = useState(false);
|
||||||
@@ -630,6 +631,20 @@ export function RecentQSOsGrid({ rows, myGrid, selectAllSignal, selectRowSignal,
|
|||||||
api.setColumnsVisible(ids, false);
|
api.setColumnsVisible(ids, false);
|
||||||
saveColumnState();
|
saveColumnState();
|
||||||
}
|
}
|
||||||
|
// Whole-dialog show/hide. showAll/hideAll cover the CATALOGUE only; the award
|
||||||
|
// columns live in their own persisted code set, so a global that skipped them
|
||||||
|
// would leave a row of columns behind and look broken.
|
||||||
|
function setEverything(visible: boolean) {
|
||||||
|
const api = gridRef.current?.api;
|
||||||
|
if (!api) return;
|
||||||
|
api.setColumnsVisible(COL_CATALOG.map((c) => c.colId!), visible);
|
||||||
|
if (awardCols && awardCols.length > 0) {
|
||||||
|
persistAwardShown(visible ? new Set(awardCols.map((a) => a.code.toUpperCase())) : new Set());
|
||||||
|
api.setColumnsVisible(awardCols.map((a) => `award_${a.code}`), visible);
|
||||||
|
}
|
||||||
|
saveColumnState();
|
||||||
|
}
|
||||||
|
|
||||||
function resetDefaults() {
|
function resetDefaults() {
|
||||||
const api = gridRef.current?.api;
|
const api = gridRef.current?.api;
|
||||||
if (!api) return;
|
if (!api) return;
|
||||||
@@ -705,17 +720,22 @@ export function RecentQSOsGrid({ rows, myGrid, selectAllSignal, selectRowSignal,
|
|||||||
animateRows={false}
|
animateRows={false}
|
||||||
suppressCellFocus
|
suppressCellFocus
|
||||||
getRowId={(p) => String((p.data as any).id)}
|
getRowId={(p) => String((p.data as any).id)}
|
||||||
getRowStyle={(p) => rowStyleFor(p.data, rowColors ?? null)}
|
getRowStyle={(p) => rowStyleFor(p.data, rowColors ?? null, p.node.rowIndex ?? undefined)}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{/* Every handler is passed STRAIGHT through, never wrapped in an arrow: a
|
||||||
|
wrapper is always truthy, so the menu drew "Fix country" and "Update
|
||||||
|
from the callsign databases" even in a grid that wired neither — and
|
||||||
|
clicking them did nothing at all. */}
|
||||||
<QSOContextMenu
|
<QSOContextMenu
|
||||||
menu={menu}
|
menu={menu}
|
||||||
onClose={() => setMenu(null)}
|
onClose={() => setMenu(null)}
|
||||||
onUpdateFromCty={(ids) => onUpdateFromCty?.(ids)}
|
onUpdateFromCty={onUpdateFromCty}
|
||||||
onUpdateFromQRZ={(ids) => onUpdateFromQRZ?.(ids)}
|
onUpdateFromQRZ={onUpdateFromQRZ}
|
||||||
onUpdateFromClublog={onUpdateFromClublog}
|
onUpdateFromClublog={onUpdateFromClublog}
|
||||||
|
onUpdateCountyFromULS={onUpdateCountyFromULS}
|
||||||
onSendTo={onSendTo}
|
onSendTo={onSendTo}
|
||||||
onSendRecording={onSendRecording}
|
onSendRecording={onSendRecording}
|
||||||
onSendEQSL={onSendEQSL}
|
onSendEQSL={onSendEQSL}
|
||||||
@@ -736,6 +756,16 @@ export function RecentQSOsGrid({ rows, myGrid, selectAllSignal, selectRowSignal,
|
|||||||
{t('rqg.pickerDesc')}
|
{t('rqg.pickerDesc')}
|
||||||
</DialogDescription>
|
</DialogDescription>
|
||||||
</DialogHeader>
|
</DialogHeader>
|
||||||
|
{/* Whole-dialog controls. The per-group links alone meant hiding
|
||||||
|
everything was one click PER GROUP, and there are a dozen. */}
|
||||||
|
<div className="flex items-center gap-1 px-5 text-[11px] text-muted-foreground">
|
||||||
|
<span>{t('rqg.pickerAllGroups')}</span>
|
||||||
|
<button type="button" className="text-[11px] text-primary hover:underline px-1"
|
||||||
|
onClick={() => setEverything(true)}>{t('rqg.all')}</button>
|
||||||
|
<span className="opacity-40">·</span>
|
||||||
|
<button type="button" className="text-[11px] text-muted-foreground hover:underline px-1"
|
||||||
|
onClick={() => setEverything(false)}>{t('rqg.none')}</button>
|
||||||
|
</div>
|
||||||
<div className="grid grid-cols-3 gap-4 max-h-[60vh] overflow-y-auto px-5 py-3">
|
<div className="grid grid-cols-3 gap-4 max-h-[60vh] overflow-y-auto px-5 py-3">
|
||||||
{GROUP_ORDER.map((group) => {
|
{GROUP_ORDER.map((group) => {
|
||||||
const cols = COL_CATALOG.filter((c) => c.group === group);
|
const cols = COL_CATALOG.filter((c) => c.group === group);
|
||||||
|
|||||||
@@ -5,12 +5,13 @@
|
|||||||
// when an Ultrabeam is bidirectional, the opposite one when reversed); a small
|
// when an Ultrabeam is bidirectional, the opposite one when reversed); a small
|
||||||
// red marker on the bezel shows the short-path bearing to the DX. Click the dial
|
// red marker on the bezel shows the short-path bearing to the DX. Click the dial
|
||||||
// to turn the antenna there.
|
// to turn the antenna there.
|
||||||
import { useMemo } from 'react';
|
import { useEffect, useMemo, useRef, useState } from 'react';
|
||||||
import { geoAzimuthalEquidistant, geoPath, geoGraticule10 } from 'd3-geo';
|
import { geoAzimuthalEquidistant, geoPath, geoGraticule10 } from 'd3-geo';
|
||||||
import { feature } from 'topojson-client';
|
import { feature } from 'topojson-client';
|
||||||
import landTopo from 'world-atlas/land-110m.json';
|
import landTopo from 'world-atlas/land-110m.json';
|
||||||
import { Compass, X } from 'lucide-react';
|
import { Compass, X, Play, Square } from 'lucide-react';
|
||||||
import { cn } from '@/lib/utils';
|
import { cn } from '@/lib/utils';
|
||||||
|
import { useI18n } from '@/lib/i18n';
|
||||||
|
|
||||||
// Decode the coastline outline once (≈110 m simplified land polygons).
|
// Decode the coastline outline once (≈110 m simplified land polygons).
|
||||||
const LAND = feature(landTopo as any, (landTopo as any).objects.land);
|
const LAND = feature(landTopo as any, (landTopo as any).objects.land);
|
||||||
@@ -29,6 +30,11 @@ interface Props {
|
|||||||
onSelectRotor?: (i: number) => void; // switch the active rotor
|
onSelectRotor?: (i: number) => void; // switch the active rotor
|
||||||
onGoto?: (az: number) => void; // click-to-turn
|
onGoto?: (az: number) => void; // click-to-turn
|
||||||
onClose?: () => void;
|
onClose?: () => void;
|
||||||
|
// Quick-turn buttons and the azimuth box, shown only where the caller wants
|
||||||
|
// them: Station Control draws its own GoTo/Stop around this compass, and two
|
||||||
|
// sets of the same controls side by side would be nothing but confusing.
|
||||||
|
presets?: { label: string; azimuth: number }[];
|
||||||
|
onStop?: () => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
const SIZE = 168;
|
const SIZE = 168;
|
||||||
@@ -41,7 +47,58 @@ function pt(az: number, radius: number): [number, number] {
|
|||||||
return [C + radius * Math.cos(a), C + radius * Math.sin(a)];
|
return [C + radius * Math.cos(a), C + radius * Math.sin(a)];
|
||||||
}
|
}
|
||||||
|
|
||||||
export function RotorCompass({ bearing, headings, boomHeading, pattern, centerLat, centerLon, rotorEnabled, rotors, activeRotor, onSelectRotor, onGoto, onClose }: Props) {
|
export function RotorCompass({ bearing, headings, boomHeading, pattern, centerLat, centerLon, rotorEnabled, rotors, activeRotor, onSelectRotor, onGoto, onClose, presets, onStop }: Props) {
|
||||||
|
const { t } = useI18n();
|
||||||
|
// Raw text, not a number: binding the input to a normalised value makes
|
||||||
|
// Backspace fight the operator on the way from "230" to "23". It is parsed
|
||||||
|
// when it is sent, and only then.
|
||||||
|
const [azText, setAzText] = useState('');
|
||||||
|
const showControls = !!(presets || onStop);
|
||||||
|
|
||||||
|
// Which preset was just pressed, so it can light up for a moment.
|
||||||
|
//
|
||||||
|
// A rotor takes seconds to start moving and the needle barely twitches at
|
||||||
|
// first, so without this the only answer to "did that register?" is to press
|
||||||
|
// it again — which is how an antenna ends up ordered somewhere twice. The
|
||||||
|
// acknowledgement has to come from the button itself, at once.
|
||||||
|
const [flashIdx, setFlashIdx] = useState<number | null>(null);
|
||||||
|
const flashTimer = useRef<number | undefined>(undefined);
|
||||||
|
useEffect(() => () => window.clearTimeout(flashTimer.current), []);
|
||||||
|
const pressPreset = (i: number, az: number) => {
|
||||||
|
if (!onGoto) return;
|
||||||
|
setFlashIdx(i);
|
||||||
|
window.clearTimeout(flashTimer.current);
|
||||||
|
flashTimer.current = window.setTimeout(() => setFlashIdx(null), 450);
|
||||||
|
onGoto(az);
|
||||||
|
};
|
||||||
|
|
||||||
|
// Stop needs the same acknowledgement, for the same reason and one more: it
|
||||||
|
// is pressed when something is already wrong, and a button that stays inert
|
||||||
|
// gets hit again and again. Its own flag, so stopping does not blank a preset
|
||||||
|
// that is still lit.
|
||||||
|
const [stopFlash, setStopFlash] = useState(false);
|
||||||
|
const stopTimer = useRef<number | undefined>(undefined);
|
||||||
|
useEffect(() => () => window.clearTimeout(stopTimer.current), []);
|
||||||
|
const pressStop = () => {
|
||||||
|
if (!onStop) return;
|
||||||
|
setStopFlash(true);
|
||||||
|
window.clearTimeout(stopTimer.current);
|
||||||
|
stopTimer.current = window.setTimeout(() => setStopFlash(false), 450);
|
||||||
|
onStop();
|
||||||
|
};
|
||||||
|
|
||||||
|
// 0-359 and nothing else. 360 is refused rather than folded to 0 — it is
|
||||||
|
// almost always a typo for 36 or 306, and a rotor swinging through north on a
|
||||||
|
// slip of the finger is worth one rejected keypress.
|
||||||
|
const sendAz = () => {
|
||||||
|
const s = azText.trim();
|
||||||
|
if (s === '' || !onGoto) return;
|
||||||
|
const n = Number(s);
|
||||||
|
if (!Number.isFinite(n) || !Number.isInteger(n) || n < 0 || n > 359) return;
|
||||||
|
onGoto(n);
|
||||||
|
setAzText('');
|
||||||
|
};
|
||||||
|
|
||||||
const cardinals = useMemo(
|
const cardinals = useMemo(
|
||||||
() => [ { d: 0, l: 'N' }, { d: 45, l: 'NE' }, { d: 90, l: 'E' }, { d: 135, l: 'SE' },
|
() => [ { d: 0, l: 'N' }, { d: 45, l: 'NE' }, { d: 90, l: 'E' }, { d: 135, l: 'SE' },
|
||||||
{ d: 180, l: 'S' }, { d: 225, l: 'SW' }, { d: 270, l: 'W' }, { d: 315, l: 'NW' } ],
|
{ d: 180, l: 'S' }, { d: 225, l: 'SW' }, { d: 270, l: 'W' }, { d: 315, l: 'NW' } ],
|
||||||
@@ -72,6 +129,35 @@ export function RotorCompass({ bearing, headings, boomHeading, pattern, centerLa
|
|||||||
|
|
||||||
const headLabel = headings.length ? headings[0] : null;
|
const headLabel = headings.length ? headings[0] : null;
|
||||||
|
|
||||||
|
// Short and long path to the DX, in figures.
|
||||||
|
//
|
||||||
|
// The bezel already carries the short path as a red marker, but a marker is a
|
||||||
|
// direction, not a number — the same pair sits in the status bar at 10px and
|
||||||
|
// operators reported not being able to read it. It lives here because it
|
||||||
|
// belongs to the compass: every place that draws one gets the readout, instead
|
||||||
|
// of each caller inventing its own. Clickable when the caller can turn, like
|
||||||
|
// the status bar's. Built as a value because it is placed in one of two
|
||||||
|
// columns depending on whether the controls are shown.
|
||||||
|
const pathReadout = (
|
||||||
|
<div className="flex gap-1.5 mt-2 font-mono w-full">
|
||||||
|
{([['SP', bearing ?? null], ['LP', bearing == null ? null : (bearing + 180) % 360]] as const).map(([lbl, az]) => (
|
||||||
|
<button key={lbl} type="button" disabled={az == null || !onGoto}
|
||||||
|
onClick={() => { if (az != null && onGoto) onGoto(Math.round(az)); }}
|
||||||
|
title={az == null ? '' : `${lbl} ${Math.round(az)}°`}
|
||||||
|
className={
|
||||||
|
'flex-1 rounded-md border py-1 text-xs font-semibold tabular-nums transition-colors active:scale-95 ' +
|
||||||
|
(az == null
|
||||||
|
? 'border-border text-muted-foreground/50 cursor-not-allowed'
|
||||||
|
: onGoto
|
||||||
|
? 'border-info-border text-info-muted-foreground hover:bg-info-muted cursor-pointer'
|
||||||
|
: 'border-border text-muted-foreground cursor-default')
|
||||||
|
}>
|
||||||
|
{lbl} {az == null ? '—' : `${Math.round(az)}°`}
|
||||||
|
</button>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<section className="flex flex-col h-full min-h-0 rounded-lg border border-border bg-card overflow-hidden">
|
<section className="flex flex-col h-full min-h-0 rounded-lg border border-border bg-card overflow-hidden">
|
||||||
{/* Header — matches the WinKeyer / Voice keyer panels. */}
|
{/* Header — matches the WinKeyer / Voice keyer panels. */}
|
||||||
@@ -128,9 +214,13 @@ export function RotorCompass({ bearing, headings, boomHeading, pattern, centerLa
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
{/* Dial on the left, controls on the right. The controls column is sized to
|
||||||
|
fit WITHIN the dial's height: the widget sits in a row whose height is
|
||||||
|
set by the entry strip, so it may grow sideways but never downwards. */}
|
||||||
|
<div className="flex items-start gap-2 p-2 min-h-0">
|
||||||
{/* flex-col: the readout goes BELOW the dial. This wrapper was a row, so a
|
{/* flex-col: the readout goes BELOW the dial. This wrapper was a row, so a
|
||||||
sibling of the <svg> landed beside it. */}
|
sibling of the <svg> landed beside it. */}
|
||||||
<div className="flex flex-col items-center justify-center p-2 min-h-0">
|
<div className="flex flex-col items-center justify-center min-h-0 shrink-0">
|
||||||
<svg
|
<svg
|
||||||
viewBox={`0 0 ${SIZE} ${SIZE}`}
|
viewBox={`0 0 ${SIZE} ${SIZE}`}
|
||||||
className={onGoto ? 'cursor-pointer select-none' : 'select-none'}
|
className={onGoto ? 'cursor-pointer select-none' : 'select-none'}
|
||||||
@@ -191,30 +281,92 @@ export function RotorCompass({ bearing, headings, boomHeading, pattern, centerLa
|
|||||||
<circle cx={C} cy={C} r={3.5} fill="#15803d" stroke="#fff" strokeWidth={1} />
|
<circle cx={C} cy={C} r={3.5} fill="#15803d" stroke="#fff" strokeWidth={1} />
|
||||||
</svg>
|
</svg>
|
||||||
|
|
||||||
{/* Short and long path to the DX, in figures.
|
{/* With the controls column present the readout goes at the FOOT OF IT
|
||||||
The bezel already carries the short path as a red marker, but a
|
instead: the dial sets the widget's height, the controls are shorter
|
||||||
marker is a direction, not a number — the same pair sits in the
|
than the dial, and that leftover space is exactly the right size for
|
||||||
status bar at 10px and operators reported not being able to read it.
|
the pair. Under the dial it would push the whole widget taller. */}
|
||||||
Here because it belongs to the compass: every place that draws one
|
{!showControls && pathReadout}
|
||||||
gets the readout, instead of each caller inventing its own.
|
</div>
|
||||||
Clickable when the caller can turn, like the status bar's. */}
|
|
||||||
<div className="flex gap-1.5 mt-2 font-mono w-full">
|
{/* Quick turns + free azimuth + Stop. */}
|
||||||
{([['SP', bearing ?? null], ['LP', bearing == null ? null : (bearing + 180) % 360]] as const).map(([lbl, az]) => (
|
{showControls && (
|
||||||
<button key={lbl} type="button" disabled={az == null || !onGoto}
|
<div className="flex flex-col gap-1.5 flex-1 min-w-0">
|
||||||
onClick={() => { if (az != null && onGoto) onGoto(Math.round(az)); }}
|
{/* Two columns so six regions fit beside the dial rather than under
|
||||||
title={az == null ? '' : `${lbl} ${Math.round(az)}°`}
|
it. An operator with fewer keeps the same compact block. */}
|
||||||
className={
|
{!!presets?.length && (
|
||||||
'flex-1 rounded-md border py-1 text-xs font-semibold tabular-nums transition-colors ' +
|
<div className="grid grid-cols-2 gap-1">
|
||||||
(az == null
|
{presets.map((p, i) => (
|
||||||
? 'border-border text-muted-foreground/50 cursor-not-allowed'
|
<button
|
||||||
: onGoto
|
key={`${p.label}-${i}`}
|
||||||
? 'border-info-border text-info-muted-foreground hover:bg-info-muted cursor-pointer'
|
type="button"
|
||||||
: 'border-border text-muted-foreground cursor-default')
|
disabled={!onGoto}
|
||||||
}>
|
onClick={() => pressPreset(i, p.azimuth)}
|
||||||
{lbl} {az == null ? '—' : `${Math.round(az)}°`}
|
title={`${p.label} — ${p.azimuth}°`}
|
||||||
|
className={cn(
|
||||||
|
'rounded-md border py-1 text-xs font-semibold truncate transition-all duration-150 active:scale-95',
|
||||||
|
flashIdx === i
|
||||||
|
// Lit, and showing the azimuth it just sent: the label alone
|
||||||
|
// would only say the press landed, not what was ordered.
|
||||||
|
? 'border-success bg-success text-success-foreground scale-95'
|
||||||
|
: 'border-border bg-muted/40',
|
||||||
|
onGoto && flashIdx !== i ? 'hover:bg-muted' : '',
|
||||||
|
!onGoto ? 'opacity-50 cursor-not-allowed' : '',
|
||||||
|
)}
|
||||||
|
>
|
||||||
|
{flashIdx === i ? `${p.azimuth}°` : p.label}
|
||||||
|
</button>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* Free azimuth: Enter sends, so the whole thing is type-three-digits
|
||||||
|
-and-go without reaching for the mouse. */}
|
||||||
|
<div className="flex gap-1">
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
inputMode="numeric"
|
||||||
|
value={azText}
|
||||||
|
onChange={(e) => setAzText(e.target.value.replace(/[^0-9]/g, '').slice(0, 3))}
|
||||||
|
onKeyDown={(e) => { if (e.key === 'Enter') { e.preventDefault(); sendAz(); } }}
|
||||||
|
placeholder={t('rotor.azPh')}
|
||||||
|
title={t('rotor.azTitle')}
|
||||||
|
disabled={!onGoto}
|
||||||
|
className="min-w-0 flex-1 rounded-md border border-border bg-background px-2 py-1 text-xs font-mono tabular-nums text-center disabled:opacity-50"
|
||||||
|
/>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={sendAz}
|
||||||
|
disabled={!onGoto || azText.trim() === ''}
|
||||||
|
title={t('rotor.go')}
|
||||||
|
className="flex items-center gap-1 rounded-md border border-success/60 bg-success-muted px-2 py-1 text-xs font-bold text-success-muted-foreground transition-transform hover:bg-success/25 active:scale-95 disabled:opacity-40 disabled:cursor-not-allowed"
|
||||||
|
>
|
||||||
|
<Play className="size-3" /> {t('rotor.go')}
|
||||||
</button>
|
</button>
|
||||||
))}
|
</div>
|
||||||
|
|
||||||
|
{onStop && (
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={pressStop}
|
||||||
|
title={t('rotor.stop')}
|
||||||
|
className={cn(
|
||||||
|
'flex items-center justify-center gap-1.5 rounded-md border py-1 text-xs font-bold transition-all duration-150 active:scale-95',
|
||||||
|
stopFlash
|
||||||
|
// Solid, not a tint: STOP reads the same in both languages, so
|
||||||
|
// the fill is the whole acknowledgement.
|
||||||
|
? 'border-destructive bg-destructive text-destructive-foreground scale-95'
|
||||||
|
: 'border-destructive/60 bg-destructive/15 text-destructive hover:bg-destructive/25',
|
||||||
|
)}
|
||||||
|
>
|
||||||
|
<Square className="size-3 fill-current" /> {t('rotor.stop')}
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* mt-auto: the readout sits at the FOOT of the column, level with the
|
||||||
|
bottom of the dial, instead of floating under the Stop button. */}
|
||||||
|
<div className="mt-auto">{pathReadout}</div>
|
||||||
</div>
|
</div>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
);
|
);
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -3,31 +3,88 @@ import { Plus, Pencil, Trash2, Power, PlugZap, Loader2, Check, X, Compass, Squar
|
|||||||
import { Button } from '@/components/ui/button';
|
import { Button } from '@/components/ui/button';
|
||||||
import { Input } from '@/components/ui/input';
|
import { Input } from '@/components/ui/input';
|
||||||
import { Label } from '@/components/ui/label';
|
import { Label } from '@/components/ui/label';
|
||||||
|
import { Checkbox } from '@/components/ui/checkbox';
|
||||||
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
|
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
|
||||||
import { cn } from '@/lib/utils';
|
import { cn } from '@/lib/utils';
|
||||||
|
import { MotorAntennaWidget, type AntStatus } from '@/components/MotorAntennaWidget';
|
||||||
import { useI18n } from '@/lib/i18n';
|
import { useI18n } from '@/lib/i18n';
|
||||||
import { writeUiPref } from '@/lib/uiPref';
|
import { writeUiPref } from '@/lib/uiPref';
|
||||||
|
import { subscribeRotorHeading, pokeRotorHeading } from '@/lib/rotorHeading';
|
||||||
import { RotorCompass } from '@/components/RotorCompass';
|
import { RotorCompass } from '@/components/RotorCompass';
|
||||||
import { AmpCard } from '@/components/AmpCard';
|
import { AmpCard } from '@/components/AmpCard';
|
||||||
import { TunerCard } from '@/components/TunerCard';
|
import { TunerCard } from '@/components/TunerCard';
|
||||||
import type { TGStatus } from '@/components/TunerGeniusPanel';
|
import type { TGStatus } from '@/components/TunerGeniusPanel';
|
||||||
import {
|
import {
|
||||||
GetStationDevices, SaveStationDevices, GetStationStatus, StationSetRelay,
|
GetStationDevices, SaveStationDevices, GetStationStatus, StationSetRelay,
|
||||||
GetRotatorHeading, RotatorGoTo, RotatorStop, SetActiveRotor,
|
RotatorGoTo, RotatorStop, SetActiveRotor,
|
||||||
GetUltrabeamStatus, SetUltrabeamDirection, UltrabeamRetract, MotorSetElement, MotorReadElements,
|
GetUltrabeamStatus, SetUltrabeamDirection, UltrabeamRetract, MotorSetElement, MotorReadElements,
|
||||||
MotorTuneKHz, MotorNudgeKHz, SetMotorFollow,
|
MotorTuneKHz, MotorNudgeKHz, SetMotorFollow,
|
||||||
ListDenkoviDevices, ListSerialPorts, TestStationDevice,
|
ListDenkoviDevices, ListSerialPorts, TestStationDevice,
|
||||||
GetAmpStatuses, GetFlexState,
|
GetAmpStatuses, GetFlexState,
|
||||||
GetTunerGeniusStatus, GetTunerGeniusSettings,
|
GetTunerGeniusStatus, GetTunerGeniusSettings,
|
||||||
|
GetPSUStatus, GetPSUSettings, SetPSUOutput,
|
||||||
} from '../../wailsjs/go/main/App';
|
} from '../../wailsjs/go/main/App';
|
||||||
|
|
||||||
type RotatorProps = { centerLat?: number | null; centerLon?: number | null; bearing?: number | null };
|
type RotatorProps = { centerLat?: number | null; centerLon?: number | null; bearing?: number | null };
|
||||||
|
|
||||||
|
type PSUState = { connected: boolean; on: boolean; volts: number; amps: number; watts: number; set_volts: number; set_amps: number; protected: number; error?: string };
|
||||||
|
|
||||||
|
// The bench supply. One button — the output — and the three numbers that say
|
||||||
|
// what it is actually delivering.
|
||||||
|
//
|
||||||
|
// The SET points are shown beside them, small, because "13.8 V set" next to
|
||||||
|
// "0.02 A out" is how an operator sees at a glance that the supply is on but
|
||||||
|
// the radio is not drawing. They are not editable: OpsLog reads them and never
|
||||||
|
// writes them, which is the whole safety story of this device.
|
||||||
|
function PSUCard({ st, busy, onToggle, t }: {
|
||||||
|
st: PSUState; busy: boolean; onToggle: (on: boolean) => void; t: (k: string, v?: any) => string;
|
||||||
|
}) {
|
||||||
|
const tripped = (st.protected ?? 0) !== 0;
|
||||||
|
return (
|
||||||
|
<div className="rounded-xl border border-border bg-card shadow-sm overflow-hidden h-full">
|
||||||
|
<div className="flex items-center gap-2 px-3 py-2 border-b border-border/60 bg-muted/30">
|
||||||
|
<Power className="size-4 text-primary" />
|
||||||
|
<div className="text-sm font-semibold truncate">{t('psu.title')}</div>
|
||||||
|
<span className={cn('ml-auto size-2 rounded-full shrink-0', st.connected ? 'bg-success' : 'bg-muted-foreground/40')}
|
||||||
|
title={st.connected ? t('station.online') : (st.error || t('psu.offline'))} />
|
||||||
|
</div>
|
||||||
|
<div className="p-3 space-y-2">
|
||||||
|
<div className="flex items-center gap-3">
|
||||||
|
<button type="button" disabled={!st.connected || busy}
|
||||||
|
onClick={() => onToggle(!st.on)}
|
||||||
|
className={cn('flex items-center gap-2 rounded-md border px-3 py-1.5 transition-colors disabled:opacity-40',
|
||||||
|
st.on ? 'bg-success/15 border-success/50' : 'bg-muted/30 border-border hover:bg-muted')}>
|
||||||
|
<span className={cn('flex items-center justify-center size-6 rounded shrink-0',
|
||||||
|
st.on ? 'bg-success text-success-foreground' : 'bg-muted-foreground/15 text-muted-foreground')}>
|
||||||
|
{busy ? <Loader2 className="size-3.5 animate-spin" /> : <Power className="size-3.5" />}
|
||||||
|
</span>
|
||||||
|
<span className="text-xs font-semibold">{t('psu.output')}</span>
|
||||||
|
<span className={cn('text-[10px] font-bold', st.on ? 'text-success' : 'text-muted-foreground/60')}>
|
||||||
|
{st.on ? t('station.on') : t('station.off')}
|
||||||
|
</span>
|
||||||
|
</button>
|
||||||
|
<div className="flex-1 min-w-0 font-mono tabular-nums text-right">
|
||||||
|
<span className="text-lg font-bold">{(st.volts ?? 0).toFixed(2)}</span><span className="text-xs text-muted-foreground"> V</span>
|
||||||
|
<span className="text-lg font-bold ml-3">{(st.amps ?? 0).toFixed(3)}</span><span className="text-xs text-muted-foreground"> A</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="flex items-center justify-between text-[11px] text-muted-foreground font-mono">
|
||||||
|
<span>{(st.watts ?? 0).toFixed(1)} W</span>
|
||||||
|
<span>{t('psu.setTo')} {(st.set_volts ?? 0).toFixed(2)} V / {(st.set_amps ?? 0).toFixed(3)} A</span>
|
||||||
|
</div>
|
||||||
|
{tripped && (
|
||||||
|
<div className="text-[11px] font-bold text-danger">{t('psu.tripped')} (0x{(st.protected ?? 0).toString(16).toUpperCase()})</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
type Device = {
|
type Device = {
|
||||||
id: string; type: string; name: string; host: string;
|
id: string; type: string; name: string; host: string;
|
||||||
user?: string; pass?: string; channels?: number; labels: string[];
|
user?: string; pass?: string; channels?: number; labels: string[];
|
||||||
// Generic HTTP board only. The per-relay URLs win over the patterns.
|
// Generic HTTP board only. The per-relay URLs win over the patterns.
|
||||||
on_urls?: string[]; off_urls?: string[]; on_pattern?: string; off_pattern?: string;
|
on_urls?: string[]; off_urls?: string[]; on_pattern?: string; off_pattern?: string; insecure_tls?: boolean;
|
||||||
};
|
};
|
||||||
type Relay = { number: number; label: string; on: boolean };
|
type Relay = { number: number; label: string; on: boolean };
|
||||||
type DevStatus = { id: string; name: string; type: string; connected: boolean; error?: string; relays: Relay[] };
|
type DevStatus = { id: string; name: string; type: string; connected: boolean; error?: string; relays: Relay[] };
|
||||||
@@ -129,267 +186,6 @@ function RotatorWidget({ hd, refetch, centerLat, centerLon, bearing, t }: Rotato
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
type AntStatus = { enabled: boolean; type: string; connected: boolean; direction: number; frequency: number; moving: boolean; elements: number[]; follow?: boolean; step_khz?: number; track_mode?: string; bands?: string[]; band_freqs?: Record<string, number> };
|
|
||||||
|
|
||||||
// Where each band button points the antenna.
|
|
||||||
//
|
|
||||||
// Not the arithmetic centre of the band. An antenna is tuned for where people
|
|
||||||
// actually work: 20 m centres on 14175 but nobody lives there, and 10 m spans
|
|
||||||
// 1.7 MHz of which the top half is empty. These are the points that leave the
|
|
||||||
// elements closest to right for the whole band, and one nudge away from the rest.
|
|
||||||
const ANT_BAND_KHZ: Record<string, number> = {
|
|
||||||
'40m': 7100, '30m': 10125, '20m': 14150, '17m': 18110,
|
|
||||||
'15m': 21150, '12m': 24930, '10m': 28400, '6m': 50150,
|
|
||||||
};
|
|
||||||
|
|
||||||
// NUDGE_KHZ is the up/down step. 25 kHz because that is also the finest tracking
|
|
||||||
// threshold: a nudge smaller than the tracking step would be undone by the next
|
|
||||||
// poll while tracking is on.
|
|
||||||
const NUDGE_KHZ = 25;
|
|
||||||
|
|
||||||
// bandOfKHz names the band a frequency sits in, so a band button can light up
|
|
||||||
// when the ANTENNA is already there. Deliberately generous at the edges: the
|
|
||||||
// antenna's reported frequency is where it was commanded, which can sit slightly
|
|
||||||
// outside the allocation.
|
|
||||||
function bandOfKHz(khz: number): string {
|
|
||||||
const edges: [number, number, string][] = [
|
|
||||||
[6900, 7300, '40m'], [10050, 10200, '30m'], [13900, 14400, '20m'],
|
|
||||||
[18000, 18200, '17m'], [20900, 21500, '15m'], [24800, 25000, '12m'],
|
|
||||||
[27900, 29800, '10m'], [49900, 50600, '6m'],
|
|
||||||
];
|
|
||||||
for (const [lo, hi, b] of edges) if (khz >= lo && khz <= hi) return b;
|
|
||||||
return '';
|
|
||||||
}
|
|
||||||
|
|
||||||
// MotorAntennaWidget controls a motorized antenna (Ultrabeam / SteppIR) from the
|
|
||||||
// Station Control tab: pattern (Normal / 180° / Bi), Retract, and — Ultrabeam
|
|
||||||
// only — per-element length adjustment. Heading/state is polled by the panel.
|
|
||||||
const ELEMENT_STEP = 2; // the physical console adjusts 2 mm per press
|
|
||||||
|
|
||||||
// elementName maps an element index to a ham-radio name: 0 = reflector,
|
|
||||||
// 1 = driven element, then Director 1, 2, 3…
|
|
||||||
function elementName(i: number, t: (k: string, v?: any) => string): string {
|
|
||||||
if (i === 0) return t('station.reflector');
|
|
||||||
if (i === 1) return t('station.driven');
|
|
||||||
return `${t('station.director')} ${i - 1}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
function MotorAntennaWidget({ ant, refetch, t }: { ant: AntStatus; refetch: () => void; t: (k: string, v?: any) => string }) {
|
|
||||||
const [err, setErr] = useState('');
|
|
||||||
const [lengths, setLengths] = useState<number[]>([]); // current element lengths (mm), from ReadElements
|
|
||||||
const [reading, setReading] = useState(false);
|
|
||||||
const [busyEl, setBusyEl] = useState<number | null>(null);
|
|
||||||
const [editingEl, setEditingEl] = useState<number | null>(null); // element whose mm is being typed
|
|
||||||
const [editVal, setEditVal] = useState('');
|
|
||||||
const run = (p: Promise<any>) => p.then(refetch).catch((e) => setErr(String(e?.message ?? e)));
|
|
||||||
const isUB = ant.type !== 'steppir';
|
|
||||||
|
|
||||||
const readLengths = useCallback(async () => {
|
|
||||||
setReading(true); setErr('');
|
|
||||||
try { setLengths(((await MotorReadElements()) ?? []) as number[]); }
|
|
||||||
catch (e: any) { setErr(String(e?.message ?? e)); }
|
|
||||||
finally { setReading(false); }
|
|
||||||
}, []);
|
|
||||||
// Read the current lengths once when the Ultrabeam widget mounts/connects, so
|
|
||||||
// +/- starts from the real values rather than blind.
|
|
||||||
useEffect(() => { if (isUB && ant.connected) readLengths(); }, [isUB, ant.connected, readLengths]);
|
|
||||||
|
|
||||||
// Send an absolute length to one element and remember it as the new baseline.
|
|
||||||
const setLen = async (i: number, mm: number) => {
|
|
||||||
const next = Math.max(0, Math.round(mm));
|
|
||||||
const prev = lengths[i] ?? 0;
|
|
||||||
setBusyEl(i); setErr('');
|
|
||||||
setLengths((ls) => { const c = [...ls]; c[i] = next; return c; }); // optimistic
|
|
||||||
try { await MotorSetElement(i, next); refetch(); }
|
|
||||||
catch (e: any) {
|
|
||||||
// Rejected by the controller — most often the element is at its travel
|
|
||||||
// limit for this band (extending on a low band). Revert the optimistic
|
|
||||||
// value so the display stays truthful, and explain the likely cause when
|
|
||||||
// the failed move was an extension.
|
|
||||||
setLengths((ls) => { const c = [...ls]; c[i] = prev; return c; });
|
|
||||||
setErr(next > prev ? t('station.atMax') : String(e?.message ?? e));
|
|
||||||
}
|
|
||||||
finally { setBusyEl(null); }
|
|
||||||
};
|
|
||||||
// Nudge one element by ±2 mm from its current known length.
|
|
||||||
const nudge = (i: number, delta: number) => setLen(i, (lengths[i] ?? 0) + delta);
|
|
||||||
// Commit a typed exact length (click on the mm value). Lets the operator fix
|
|
||||||
// the baseline when the auto-read is off, so +/- then work reliably.
|
|
||||||
const commitEdit = (i: number) => {
|
|
||||||
const v = parseInt(editVal, 10);
|
|
||||||
setEditingEl(null);
|
|
||||||
if (!isNaN(v) && v >= 0 && v !== lengths[i]) setLen(i, v);
|
|
||||||
};
|
|
||||||
const dirs: [number, string][] = [[0, 'N'], [1, '180°'], [2, t('station.bi')]];
|
|
||||||
return (
|
|
||||||
<div className="rounded-xl border border-border bg-card shadow-sm overflow-hidden h-full">
|
|
||||||
<div className="flex items-center gap-2 px-3 py-2 border-b border-border/60 bg-muted/30">
|
|
||||||
<AntennaIcon className="size-4 text-primary" />
|
|
||||||
<div className="min-w-0">
|
|
||||||
<div className="text-sm font-semibold truncate">{isUB ? 'Ultrabeam' : 'SteppIR'}</div>
|
|
||||||
{ant.frequency > 0 && <div className="text-[10px] text-muted-foreground font-mono">{(ant.frequency / 1000).toFixed(3)} MHz</div>}
|
|
||||||
</div>
|
|
||||||
{ant.moving && <span className="ml-auto text-[10px] font-semibold text-warning animate-pulse">{t('station.moving')}</span>}
|
|
||||||
<span className={cn('size-2 rounded-full shrink-0', ant.moving ? '' : 'ml-auto', ant.connected ? 'bg-success' : 'bg-muted-foreground/40')}
|
|
||||||
title={ant.connected ? t('station.online') : t('station.offline')} />
|
|
||||||
</div>
|
|
||||||
<div className="p-3 space-y-3">
|
|
||||||
<div>
|
|
||||||
<div className="text-[10px] font-semibold uppercase tracking-wider text-muted-foreground mb-1">{t('station.pattern')}</div>
|
|
||||||
<div className="flex gap-1">
|
|
||||||
{dirs.map(([d, lbl]) => (
|
|
||||||
<button key={d} type="button" disabled={!ant.connected}
|
|
||||||
onClick={() => run(SetUltrabeamDirection(d))}
|
|
||||||
className={cn('flex-1 rounded-md border py-1.5 text-xs font-semibold transition-colors disabled:opacity-40',
|
|
||||||
ant.direction === d ? 'bg-primary text-primary-foreground border-primary' : 'border-border hover:bg-muted')}>
|
|
||||||
{lbl}
|
|
||||||
</button>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{/* Bands, then a nudge, then tracking — in the order an operator uses
|
|
||||||
them: get to the band, fine-tune inside it, decide whether the
|
|
||||||
antenna should follow the rig from here. */}
|
|
||||||
<div>
|
|
||||||
<div className="text-[10px] font-semibold uppercase tracking-wider text-muted-foreground mb-1">{t('station.bands')}</div>
|
|
||||||
<div className="grid grid-cols-5 gap-1">
|
|
||||||
{(ant.bands ?? []).map((b: string) => {
|
|
||||||
// Where this band tunes is resolved by the backend — the operator's
|
|
||||||
// per-band choice from Settings, or the default. ANT_BAND_KHZ is only
|
|
||||||
// the floor for a status poll that hasn't landed yet.
|
|
||||||
const khz = ant.band_freqs?.[b] || ANT_BAND_KHZ[b];
|
|
||||||
if (!khz) return null;
|
|
||||||
// "On this band" from the antenna's own frequency, not the rig's:
|
|
||||||
// the widget must show where the ANTENNA is, which is the whole
|
|
||||||
// reason for tuning it by hand.
|
|
||||||
const here = ant.frequency > 0 && bandOfKHz(ant.frequency) === b;
|
|
||||||
return (
|
|
||||||
<button key={b} type="button" disabled={!ant.connected}
|
|
||||||
onClick={() => run(MotorTuneKHz(khz))}
|
|
||||||
title={`${(khz / 1000).toFixed(3)} MHz`}
|
|
||||||
className={cn('rounded-md border py-1 text-[11px] font-mono font-semibold transition-colors disabled:opacity-40',
|
|
||||||
here ? 'bg-primary text-primary-foreground border-primary' : 'border-border hover:bg-muted')}>
|
|
||||||
{b}
|
|
||||||
</button>
|
|
||||||
);
|
|
||||||
})}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="flex items-center gap-1">
|
|
||||||
<button type="button" disabled={!ant.connected}
|
|
||||||
onClick={() => run(MotorNudgeKHz(-NUDGE_KHZ))}
|
|
||||||
title={t('station.nudgeDown', { n: NUDGE_KHZ })}
|
|
||||||
className="flex-1 flex items-center justify-center gap-1 rounded-md border border-border py-1.5 text-xs font-semibold hover:bg-muted disabled:opacity-40">
|
|
||||||
<ChevronDown className="size-3.5" /> {NUDGE_KHZ}
|
|
||||||
</button>
|
|
||||||
<button type="button" disabled={!ant.connected}
|
|
||||||
onClick={() => run(MotorNudgeKHz(NUDGE_KHZ))}
|
|
||||||
title={t('station.nudgeUp', { n: NUDGE_KHZ })}
|
|
||||||
className="flex-1 flex items-center justify-center gap-1 rounded-md border border-border py-1.5 text-xs font-semibold hover:bg-muted disabled:opacity-40">
|
|
||||||
<ChevronUp className="size-3.5" /> {NUDGE_KHZ}
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Tracking. Here rather than only in Settings because it is an operating
|
|
||||||
decision — off to park the antenna, on to resume — not something set
|
|
||||||
up once. Mode and step only show when tracking is on: settings for
|
|
||||||
something switched off are questions the operator cannot act on. And
|
|
||||||
the step only shows in step mode, where it is the one thing it means. */}
|
|
||||||
<div className="space-y-1.5">
|
|
||||||
<div className="flex items-center gap-2">
|
|
||||||
<button type="button"
|
|
||||||
onClick={() => run(SetMotorFollow(!ant.follow, 0, ''))}
|
|
||||||
className={cn('flex-1 rounded-md border py-1.5 text-xs font-semibold transition-colors',
|
|
||||||
ant.follow ? 'bg-success-muted text-success-muted-foreground border-success-border' : 'border-border hover:bg-muted')}>
|
|
||||||
{ant.follow ? t('station.trackOn') : t('station.trackOff')}
|
|
||||||
</button>
|
|
||||||
{ant.follow && (ant.track_mode || 'step') === 'step' && (
|
|
||||||
<select
|
|
||||||
value={String(ant.step_khz || 50)}
|
|
||||||
onChange={(e) => run(SetMotorFollow(true, parseInt(e.target.value, 10), ''))}
|
|
||||||
className="h-[30px] rounded-md border border-border bg-background px-1 text-xs font-mono"
|
|
||||||
title={t('station.trackStepTip')}
|
|
||||||
>
|
|
||||||
{[25, 50, 100].map((s) => <option key={s} value={s}>{s} kHz</option>)}
|
|
||||||
</select>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
{ant.follow && (
|
|
||||||
<select
|
|
||||||
value={ant.track_mode || 'step'}
|
|
||||||
onChange={(e) => run(SetMotorFollow(true, 0, e.target.value))}
|
|
||||||
className="w-full h-[30px] rounded-md border border-border bg-background px-1.5 text-xs"
|
|
||||||
title={t('station.trackModeTip')}
|
|
||||||
>
|
|
||||||
<option value="always" title={t('station.trackAlwaysTip')}>{t('station.trackAlways')}</option>
|
|
||||||
<option value="step" title={t('station.trackStepTipMode')}>{t('station.trackStep')}</option>
|
|
||||||
<option value="band" title={t('station.trackBandTip')}>{t('station.trackBand')}</option>
|
|
||||||
</select>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<button type="button" disabled={!ant.connected}
|
|
||||||
onClick={() => run(UltrabeamRetract())}
|
|
||||||
className="w-full flex items-center justify-center gap-1.5 rounded-md border border-warning-border bg-warning-muted text-warning-muted-foreground py-1.5 text-xs font-semibold hover:brightness-95 disabled:opacity-40">
|
|
||||||
<ArrowDownToLine className="size-3.5" /> {t('station.retract')}
|
|
||||||
</button>
|
|
||||||
|
|
||||||
{isUB && (
|
|
||||||
<div>
|
|
||||||
<div className="flex items-center gap-2 mb-1.5">
|
|
||||||
<span className="text-[10px] font-semibold uppercase tracking-wider text-muted-foreground">{t('station.elements')}</span>
|
|
||||||
<button type="button" onClick={readLengths} disabled={!ant.connected || reading}
|
|
||||||
className="text-[10px] text-primary hover:underline inline-flex items-center gap-1 disabled:opacity-40" title={t('station.readLengths')}>
|
|
||||||
<RefreshCw className={cn('size-3', reading && 'animate-spin')} /> {t('station.read')}
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
{lengths.length === 0 ? (
|
|
||||||
<p className="text-[11px] text-muted-foreground">{t('station.noLengths')}</p>
|
|
||||||
) : (
|
|
||||||
<div className="space-y-1.5">
|
|
||||||
{/* The READ_BANDS reply is undocumented and its 16-bit parse picks
|
|
||||||
up structural bytes past the real data (varying by band), which
|
|
||||||
made 6+ bogus "elements" appear. Ultrabeam beams are 3-element,
|
|
||||||
and ModifyElement addresses elements 0..2 — so show just those. */}
|
|
||||||
{lengths.map((mm, i) => ({ mm, i })).slice(0, 3).map(({ mm, i }) => (
|
|
||||||
<div key={i} className="flex items-center gap-2">
|
|
||||||
<span className="text-xs w-20 shrink-0 text-muted-foreground truncate">{elementName(i, t)}</span>
|
|
||||||
<button type="button" disabled={!ant.connected || busyEl !== null}
|
|
||||||
onClick={() => nudge(i, -ELEMENT_STEP)}
|
|
||||||
className="flex items-center justify-center size-7 rounded-md border border-border hover:bg-muted disabled:opacity-40 shrink-0">
|
|
||||||
<Minus className="size-3.5" />
|
|
||||||
</button>
|
|
||||||
{editingEl === i ? (
|
|
||||||
<input autoFocus type="number" value={editVal}
|
|
||||||
onChange={(e) => setEditVal(e.target.value)}
|
|
||||||
onBlur={() => commitEdit(i)}
|
|
||||||
onKeyDown={(e) => { if (e.key === 'Enter') commitEdit(i); if (e.key === 'Escape') setEditingEl(null); }}
|
|
||||||
className="text-sm font-mono font-bold flex-1 min-w-0 text-center tabular-nums bg-transparent border border-primary rounded px-1" />
|
|
||||||
) : (
|
|
||||||
<span className="text-sm font-mono font-bold flex-1 min-w-0 text-center tabular-nums cursor-pointer hover:underline"
|
|
||||||
title={t('station.setExactLen')}
|
|
||||||
onClick={() => { setEditingEl(i); setEditVal(String(mm)); }}>
|
|
||||||
{busyEl === i ? <Loader2 className="size-3.5 animate-spin inline" /> : `${mm} mm`}
|
|
||||||
</span>
|
|
||||||
)}
|
|
||||||
<button type="button" disabled={!ant.connected || busyEl !== null}
|
|
||||||
onClick={() => nudge(i, ELEMENT_STEP)}
|
|
||||||
className="flex items-center justify-center size-7 rounded-md border border-border hover:bg-muted disabled:opacity-40 shrink-0">
|
|
||||||
<Plus className="size-3.5" />
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
<p className="text-[10px] text-muted-foreground mt-1">{t('station.elementsHint')}</p>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
{err && <div className="text-[11px] text-destructive break-words">{err}</div>}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
export function StationControlPanel({ centerLat, centerLon, bearing }: RotatorProps) {
|
export function StationControlPanel({ centerLat, centerLon, bearing }: RotatorProps) {
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
@@ -457,6 +253,32 @@ export function StationControlPanel({ centerLat, centerLon, bearing }: RotatorPr
|
|||||||
return () => { alive = false; window.clearInterval(id); };
|
return () => { alive = false; window.clearInterval(id); };
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
|
// Bench power supply. Polled slower than the tuner: it has no meters that
|
||||||
|
// track a transmission, and every poll is three Modbus exchanges on a 9600
|
||||||
|
// baud line the operator may also be using to switch the output.
|
||||||
|
const [psu, setPsu] = useState<PSUState>({ connected: false, on: false, volts: 0, amps: 0, watts: 0, set_volts: 0, set_amps: 0, protected: 0 });
|
||||||
|
const [psuEnabled, setPsuEnabled] = useState(false);
|
||||||
|
const [psuBusy, setPsuBusy] = useState(false);
|
||||||
|
useEffect(() => {
|
||||||
|
let alive = true;
|
||||||
|
const load = async () => {
|
||||||
|
try { const en: any = await GetPSUSettings(); if (alive) setPsuEnabled(!!en?.enabled); } catch {}
|
||||||
|
try { const st: any = await GetPSUStatus(); if (alive && st) setPsu(st as PSUState); } catch {}
|
||||||
|
};
|
||||||
|
load();
|
||||||
|
const id = window.setInterval(load, 1500);
|
||||||
|
return () => { alive = false; window.clearInterval(id); };
|
||||||
|
}, []);
|
||||||
|
const togglePSU = useCallback(async (on: boolean) => {
|
||||||
|
setPsuBusy(true);
|
||||||
|
// No optimistic flip here, unlike the relays: the supply echoes the value it
|
||||||
|
// actually set, so showing ON before it confirms would be showing something
|
||||||
|
// OpsLog does not know. A power switch is the wrong place to guess.
|
||||||
|
try { await SetPSUOutput(on); const st: any = await GetPSUStatus(); if (st) setPsu(st as PSUState); }
|
||||||
|
catch { /* the poll will tell the truth */ }
|
||||||
|
finally { setPsuBusy(false); }
|
||||||
|
}, []);
|
||||||
|
|
||||||
const loadDevices = useCallback(async () => {
|
const loadDevices = useCallback(async () => {
|
||||||
try { setDevices(((await GetStationDevices()) ?? []) as Device[]); } catch { /* db not ready */ }
|
try { setDevices(((await GetStationDevices()) ?? []) as Device[]); } catch { /* db not ready */ }
|
||||||
}, []);
|
}, []);
|
||||||
@@ -467,19 +289,21 @@ export function StationControlPanel({ centerLat, centerLon, bearing }: RotatorPr
|
|||||||
setStatus(Object.fromEntries(s.map((d) => [d.id, d])));
|
setStatus(Object.fromEntries(s.map((d) => [d.id, d])));
|
||||||
} catch { /* ignore transient */ }
|
} catch { /* ignore transient */ }
|
||||||
}, []);
|
}, []);
|
||||||
const pollRot = useCallback(async () => {
|
|
||||||
try { setRot((await GetRotatorHeading()) as any); } catch { /* ignore */ }
|
|
||||||
}, []);
|
|
||||||
const pollAnt = useCallback(async () => {
|
const pollAnt = useCallback(async () => {
|
||||||
try { setAnt((await GetUltrabeamStatus()) as any); } catch { /* ignore */ }
|
try { setAnt((await GetUltrabeamStatus()) as any); } catch { /* ignore */ }
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
useEffect(() => { loadDevices(); }, [loadDevices]);
|
useEffect(() => { loadDevices(); }, [loadDevices]);
|
||||||
|
// The heading comes from the shared poller: one loop for the whole app, fast
|
||||||
|
// while the antenna turns and slow while it is parked. Every poll opens and
|
||||||
|
// closes the controller's port, and this panel used to run its own alongside
|
||||||
|
// the status bar's — the same controller asked twice over.
|
||||||
|
useEffect(() => subscribeRotorHeading((h) => setRot(h as any)), []);
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
poll(); pollRot(); pollAnt();
|
poll(); pollAnt();
|
||||||
const id = window.setInterval(() => { poll(); pollRot(); pollAnt(); }, 3000);
|
const id = window.setInterval(() => { poll(); pollAnt(); }, 3000);
|
||||||
return () => window.clearInterval(id);
|
return () => window.clearInterval(id);
|
||||||
}, [poll, pollRot, pollAnt, devices.length]);
|
}, [poll, pollAnt, devices.length]);
|
||||||
|
|
||||||
const persistOrder = (next: string[]) => { setOrder(next); writeUiPref('opslog.stationOrder', JSON.stringify(next)); };
|
const persistOrder = (next: string[]) => { setOrder(next); writeUiPref('opslog.stationOrder', JSON.stringify(next)); };
|
||||||
// Reorder so `dragged` lands just before `target`.
|
// Reorder so `dragged` lands just before `target`.
|
||||||
@@ -527,16 +351,25 @@ export function StationControlPanel({ centerLat, centerLon, bearing }: RotatorPr
|
|||||||
const deviceCard = (dev: Device) => {
|
const deviceCard = (dev: Device) => {
|
||||||
const st = status[dev.id];
|
const st = status[dev.id];
|
||||||
const relays = st?.relays ?? dev.labels.map((label, i) => ({ number: i + 1, label, on: false }));
|
const relays = st?.relays ?? dev.labels.map((label, i) => ({ number: i + 1, label, on: false }));
|
||||||
|
// The generic HTTP board has no address of its own and nothing to poll: its
|
||||||
|
// relays can each live on a different box, and no status endpoint is read
|
||||||
|
// back. So no host under the name, no online dot, and the buttons are never
|
||||||
|
// greyed out waiting for a connection that is never made.
|
||||||
|
const fireAndForget = dev.type === 'httpgen';
|
||||||
return (
|
return (
|
||||||
<div className="rounded-xl border border-border bg-card shadow-sm overflow-hidden h-full">
|
<div className="rounded-xl border border-border bg-card shadow-sm overflow-hidden h-full">
|
||||||
<div className="flex items-center gap-2 px-3 py-2 border-b border-border/60 bg-muted/30">
|
<div className="flex items-center gap-2 px-3 py-2 border-b border-border/60 bg-muted/30">
|
||||||
<PlugZap className="size-4 text-primary" />
|
<PlugZap className="size-4 text-primary" />
|
||||||
<div className="min-w-0">
|
<div className="min-w-0">
|
||||||
<div className="text-sm font-semibold truncate">{dev.name || TYPE_LABEL[dev.type]}</div>
|
<div className="text-sm font-semibold truncate">{dev.name || TYPE_LABEL[dev.type]}</div>
|
||||||
<div className="text-[10px] text-muted-foreground font-mono truncate">{TYPE_LABEL[dev.type]} · {dev.host}</div>
|
<div className="text-[10px] text-muted-foreground font-mono truncate">
|
||||||
|
{TYPE_LABEL[dev.type]}{fireAndForget || !dev.host ? '' : ` · ${dev.host}`}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<span className={cn('ml-auto size-2 rounded-full shrink-0', st?.connected ? 'bg-success' : 'bg-muted-foreground/40')}
|
{fireAndForget ? <span className="ml-auto" /> : (
|
||||||
title={st?.connected ? t('station.online') : (st?.error || t('station.offline'))} />
|
<span className={cn('ml-auto size-2 rounded-full shrink-0', st?.connected ? 'bg-success' : 'bg-muted-foreground/40')}
|
||||||
|
title={st?.connected ? t('station.online') : (st?.error || t('station.offline'))} />
|
||||||
|
)}
|
||||||
<button className="text-muted-foreground hover:text-foreground" title={t('station.edit')}
|
<button className="text-muted-foreground hover:text-foreground" title={t('station.edit')}
|
||||||
onClick={() => setEditing({ ...dev, labels: [...dev.labels] })}><Pencil className="size-3.5" /></button>
|
onClick={() => setEditing({ ...dev, labels: [...dev.labels] })}><Pencil className="size-3.5" /></button>
|
||||||
<button className="text-muted-foreground hover:text-destructive" title={t('station.delete')}
|
<button className="text-muted-foreground hover:text-destructive" title={t('station.delete')}
|
||||||
@@ -549,7 +382,7 @@ export function StationControlPanel({ centerLat, centerLon, bearing }: RotatorPr
|
|||||||
const key = `${dev.id}:${r.number}`;
|
const key = `${dev.id}:${r.number}`;
|
||||||
const label = r.label || `${t('station.relay')} ${r.number}`;
|
const label = r.label || `${t('station.relay')} ${r.number}`;
|
||||||
return (
|
return (
|
||||||
<button key={r.number} type="button" disabled={!st?.connected}
|
<button key={r.number} type="button" disabled={!fireAndForget && !st?.connected}
|
||||||
title={label}
|
title={label}
|
||||||
onClick={() => toggle(dev, r.number, !r.on)}
|
onClick={() => toggle(dev, r.number, !r.on)}
|
||||||
className={cn('w-[150px] flex items-center gap-1.5 rounded-md border px-2 py-1 text-left transition-colors disabled:opacity-40',
|
className={cn('w-[150px] flex items-center gap-1.5 rounded-md border px-2 py-1 text-left transition-colors disabled:opacity-40',
|
||||||
@@ -576,7 +409,7 @@ export function StationControlPanel({ centerLat, centerLon, bearing }: RotatorPr
|
|||||||
// full-width, and they need that room here too.
|
// full-width, and they need that room here too.
|
||||||
const widgets: { id: string; node: React.ReactNode; wide?: boolean }[] = [];
|
const widgets: { id: string; node: React.ReactNode; wide?: boolean }[] = [];
|
||||||
if (rot.enabled) {
|
if (rot.enabled) {
|
||||||
widgets.push({ id: 'rotator', node: <RotatorWidget hd={rot} refetch={pollRot} centerLat={centerLat} centerLon={centerLon} bearing={bearing} t={t} /> });
|
widgets.push({ id: 'rotator', node: <RotatorWidget hd={rot} refetch={pokeRotorHeading} centerLat={centerLat} centerLon={centerLon} bearing={bearing} t={t} /> });
|
||||||
}
|
}
|
||||||
if (ant.enabled) {
|
if (ant.enabled) {
|
||||||
widgets.push({ id: 'antenna', node: <MotorAntennaWidget ant={ant} refetch={pollAnt} t={t} /> });
|
widgets.push({ id: 'antenna', node: <MotorAntennaWidget ant={ant} refetch={pollAnt} t={t} /> });
|
||||||
@@ -585,6 +418,7 @@ export function StationControlPanel({ centerLat, centerLon, bearing }: RotatorPr
|
|||||||
for (const amp of amps) widgets.push({ id: `amp:${amp.id}`, node: <AmpCard amp={amp} flex={flexState} t={t} />, wide: true });
|
for (const amp of amps) widgets.push({ id: `amp:${amp.id}`, node: <AmpCard amp={amp} flex={flexState} t={t} />, wide: true });
|
||||||
// Tuner Genius XL card (identical to the Flex panel's).
|
// Tuner Genius XL card (identical to the Flex panel's).
|
||||||
if (tgEnabled) widgets.push({ id: 'tuner', node: <TunerCard status={tg} t={t} />, wide: true });
|
if (tgEnabled) widgets.push({ id: 'tuner', node: <TunerCard status={tg} t={t} />, wide: true });
|
||||||
|
if (psuEnabled) widgets.push({ id: 'psu', node: <PSUCard st={psu} busy={psuBusy} onToggle={togglePSU} t={t} /> });
|
||||||
for (const dev of devices) widgets.push({ id: dev.id, node: deviceCard(dev) });
|
for (const dev of devices) widgets.push({ id: dev.id, node: deviceCard(dev) });
|
||||||
|
|
||||||
const rank = (id: string) => { const i = order.indexOf(id); return i < 0 ? 1e6 : i; };
|
const rank = (id: string) => { const i = order.indexOf(id); return i < 0 ? 1e6 : i; };
|
||||||
@@ -687,6 +521,19 @@ function DeviceEditor({ device, onChange, onSave, onCancel, t }: {
|
|||||||
const isDenkovi = device.type === 'denkovi';
|
const isDenkovi = device.type === 'denkovi';
|
||||||
const isUsbRelay = device.type === 'usbrelay';
|
const isUsbRelay = device.type === 'usbrelay';
|
||||||
const isHTTPGen = device.type === 'httpgen';
|
const isHTTPGen = device.type === 'httpgen';
|
||||||
|
// {value} sends a relay's label, so a URL using it on an unnamed relay would
|
||||||
|
// go out with an empty parameter. Warn while it is being typed rather than at
|
||||||
|
// the moment an antenna fails to switch.
|
||||||
|
const valueNeedsLabels = isHTTPGen
|
||||||
|
&& [...(device.on_urls ?? []), ...(device.off_urls ?? []), device.on_pattern ?? '', device.off_pattern ?? '']
|
||||||
|
.some((s) => (s ?? '').includes('{value}'))
|
||||||
|
&& device.labels.some((l) => !l.trim());
|
||||||
|
// Any https:// among this board's URLs. A relay box on the LAN signs its own
|
||||||
|
// certificate, so HTTPS to one cannot be verified — the operator has to say
|
||||||
|
// whether to accept that, and the question only arises once they type https.
|
||||||
|
const usesHTTPS = isHTTPGen
|
||||||
|
&& [...(device.on_urls ?? []), ...(device.off_urls ?? []), device.on_pattern ?? '', device.off_pattern ?? '']
|
||||||
|
.some((u) => (u ?? '').trim().toLowerCase().startsWith('https://'));
|
||||||
// COM ports for the generic USB-serial relay picker.
|
// COM ports for the generic USB-serial relay picker.
|
||||||
const [serialPorts, setSerialPorts] = useState<string[]>([]);
|
const [serialPorts, setSerialPorts] = useState<string[]>([]);
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -795,7 +642,12 @@ function DeviceEditor({ device, onChange, onSave, onCancel, t }: {
|
|||||||
</div>
|
</div>
|
||||||
<p className="text-[10px] text-muted-foreground">{t('station.usbRelayHint')}</p>
|
<p className="text-[10px] text-muted-foreground">{t('station.usbRelayHint')}</p>
|
||||||
</div>
|
</div>
|
||||||
) : (
|
) : isHTTPGen ? null : (
|
||||||
|
/* No Host for the generic board: its driver never reads one. Each URL
|
||||||
|
below carries its own address, and they need not even share it — one
|
||||||
|
relay can sit on a different box from the next. A field that changes
|
||||||
|
nothing is worse than no field: it reads as the thing to fill in first,
|
||||||
|
and then the URLs look like they should be relative to it. */
|
||||||
<div className={cn('grid gap-3', (isKM || isDingtian) ? 'grid-cols-3' : 'grid-cols-1')}>
|
<div className={cn('grid gap-3', (isKM || isDingtian) ? 'grid-cols-3' : 'grid-cols-1')}>
|
||||||
<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>
|
||||||
@@ -854,6 +706,19 @@ function DeviceEditor({ device, onChange, onSave, onCancel, t }: {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="text-[10px] text-muted-foreground">{t('station.patternHint')}</div>
|
<div className="text-[10px] text-muted-foreground">{t('station.patternHint')}</div>
|
||||||
|
{/* Shown only once an https:// URL is actually in use. A board on
|
||||||
|
plain HTTP has no certificate to argue about, and an option that
|
||||||
|
cannot matter yet is one more thing to wonder about. */}
|
||||||
|
{usesHTTPS && (
|
||||||
|
<label className="flex items-start gap-2 text-xs cursor-pointer">
|
||||||
|
<Checkbox className="mt-0.5" checked={!!device.insecure_tls}
|
||||||
|
onCheckedChange={(c) => onChange({ ...device, insecure_tls: !!c })} />
|
||||||
|
<span>
|
||||||
|
{t('station.insecureTls')}
|
||||||
|
<span className="block text-[10px] text-muted-foreground">{t('station.insecureTlsHint')}</span>
|
||||||
|
</span>
|
||||||
|
</label>
|
||||||
|
)}
|
||||||
<div className="space-y-1">
|
<div className="space-y-1">
|
||||||
<Label>{t('station.perRelayUrls')}</Label>
|
<Label>{t('station.perRelayUrls')}</Label>
|
||||||
<div className="space-y-1">
|
<div className="space-y-1">
|
||||||
@@ -886,6 +751,10 @@ function DeviceEditor({ device, onChange, onSave, onCancel, t }: {
|
|||||||
|
|
||||||
<div className="space-y-1">
|
<div className="space-y-1">
|
||||||
<Label>{t('station.labels')}</Label>
|
<Label>{t('station.labels')}</Label>
|
||||||
|
{/* {value} sends the label, so an unnamed relay would go out as "?on=".
|
||||||
|
Said here, beside the empty box, rather than when the antenna fails
|
||||||
|
to switch and the log is the only place that explains why. */}
|
||||||
|
{valueNeedsLabels && <p className="text-[10px] text-warning">{t('station.valueNeedsLabels')}</p>}
|
||||||
<div className="grid grid-cols-4 gap-2">
|
<div className="grid grid-cols-4 gap-2">
|
||||||
{device.labels.map((lab, i) => (
|
{device.labels.map((lab, i) => (
|
||||||
<Input key={i} value={lab} placeholder={`${t('station.relay')} ${i + 1}`} className="h-8 text-xs"
|
<Input key={i} value={lab} placeholder={`${t('station.relay')} ${i + 1}`} className="h-8 text-xs"
|
||||||
@@ -901,12 +770,20 @@ function DeviceEditor({ device, onChange, onSave, onCancel, t }: {
|
|||||||
</span>
|
</span>
|
||||||
)}
|
)}
|
||||||
<div className="ml-auto flex gap-2">
|
<div className="ml-auto flex gap-2">
|
||||||
<Button size="sm" variant="outline" onClick={testDevice} disabled={testing || !device.host.trim()}>
|
{/* No connection test for the generic board, and no host required to
|
||||||
{testing ? <Loader2 className="size-3.5 mr-1 animate-spin" /> : <PlugZap className="size-3.5 mr-1" />}
|
save it. There is nothing to test: it has no address of its own and
|
||||||
{t('station.test')}
|
no status to read — its URLs are fired and forgotten. A button that
|
||||||
</Button>
|
can only ever say "OK, 4 relays" tests nothing, and a Save greyed
|
||||||
|
out for a missing host made a perfectly complete configuration —
|
||||||
|
four full URLs — impossible to store. */}
|
||||||
|
{!isHTTPGen && (
|
||||||
|
<Button size="sm" variant="outline" onClick={testDevice} disabled={testing || !device.host.trim()}>
|
||||||
|
{testing ? <Loader2 className="size-3.5 mr-1 animate-spin" /> : <PlugZap className="size-3.5 mr-1" />}
|
||||||
|
{t('station.test')}
|
||||||
|
</Button>
|
||||||
|
)}
|
||||||
<Button size="sm" variant="ghost" onClick={onCancel}><X className="size-3.5 mr-1" />{t('station.cancel')}</Button>
|
<Button size="sm" variant="ghost" onClick={onCancel}><X className="size-3.5 mr-1" />{t('station.cancel')}</Button>
|
||||||
<Button size="sm" onClick={onSave} disabled={!device.host.trim()}><Check className="size-3.5 mr-1" />{t('station.save')}</Button>
|
<Button size="sm" onClick={onSave} disabled={!isHTTPGen && !device.host.trim()}><Check className="size-3.5 mr-1" />{t('station.save')}</Button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ type ContestRun = { id: string; year: number; count: number; start: string; end:
|
|||||||
type Stats = {
|
type Stats = {
|
||||||
total: number; unique_calls: number; entities: number; continents: number;
|
total: number; unique_calls: number; entities: number; continents: number;
|
||||||
first_qso: string; last_qso: string;
|
first_qso: string; last_qso: string;
|
||||||
|
last_new_dxcc: string; last_new_dxcc_num: number; last_new_dxcc_call: string; last_new_dxcc_date: string;
|
||||||
confirmed_lotw: number; confirmed_eqsl: number; confirmed_qsl: number; confirmed_any: number;
|
confirmed_lotw: number; confirmed_eqsl: number; confirmed_qsl: number; confirmed_any: number;
|
||||||
by_mode: Bucket[]; by_band: Bucket[]; by_band_category: BandCat[]; by_operator: Bucket[]; by_station: Bucket[];
|
by_mode: Bucket[]; by_band: Bucket[]; by_band_category: BandCat[]; by_operator: Bucket[]; by_station: Bucket[];
|
||||||
by_continent: Bucket[]; top_entities: Bucket[]; by_year: Bucket[]; by_month: Bucket[];
|
by_continent: Bucket[]; top_entities: Bucket[]; by_year: Bucket[]; by_month: Bucket[];
|
||||||
@@ -681,6 +682,16 @@ export function StatsPanel() {
|
|||||||
// real operating session (which is exactly when an hourly rate chart exists).
|
// real operating session (which is exactly when an hourly rate chart exists).
|
||||||
const windowed = contest !== '' || (period === 'custom' && (stats?.rate?.length ?? 0) > 1);
|
const windowed = contest !== '' || (period === 'custom' && (stats?.rate?.length ?? 0) > 1);
|
||||||
|
|
||||||
|
// "last new: France - F5ABC - 2019-03-01": the entity most recently added to
|
||||||
|
// the log, and the contact that added it. Empty when no dated entity exists.
|
||||||
|
const lastNew = useMemo(() => {
|
||||||
|
if (!stats?.last_new_dxcc_date) return '';
|
||||||
|
const day = stats.last_new_dxcc_date.slice(0, 10);
|
||||||
|
const who = stats.last_new_dxcc_call ? ` · ${stats.last_new_dxcc_call}` : '';
|
||||||
|
const what = stats.last_new_dxcc || String(stats.last_new_dxcc_num || '');
|
||||||
|
return `${t('stats.lastNewDxcc')}: ${what}${who} · ${day}`;
|
||||||
|
}, [stats, t]);
|
||||||
|
|
||||||
const span = useMemo(() => {
|
const span = useMemo(() => {
|
||||||
if (!stats?.first_qso) return '';
|
if (!stats?.first_qso) return '';
|
||||||
const f = new Date(stats.first_qso), l = new Date(stats.last_qso);
|
const f = new Date(stats.first_qso), l = new Date(stats.last_qso);
|
||||||
@@ -774,7 +785,11 @@ export function StatsPanel() {
|
|||||||
<div className="grid grid-cols-2 md:grid-cols-5 gap-2.5 mb-3">
|
<div className="grid grid-cols-2 md:grid-cols-5 gap-2.5 mb-3">
|
||||||
<StatTile label={t('stats.qsos')} value={nf(stats.total)} sub={span} accent="var(--chart-1)" />
|
<StatTile label={t('stats.qsos')} value={nf(stats.total)} sub={span} accent="var(--chart-1)" />
|
||||||
<StatTile label={t('stats.uniqueCalls')} value={nf(stats.unique_calls)} accent="var(--chart-2)" />
|
<StatTile label={t('stats.uniqueCalls')} value={nf(stats.unique_calls)} accent="var(--chart-2)" />
|
||||||
<StatTile label={t('stats.entities')} value={nf(stats.entities)} sub="DXCC" accent="var(--chart-5)" />
|
{/* The last one ADDED rides on the entities tile: it is the same
|
||||||
|
subject, and a tile of its own would push the five headline figures
|
||||||
|
onto two rows for one line of text. */}
|
||||||
|
<StatTile label={t('stats.entities')} value={nf(stats.entities)}
|
||||||
|
sub={lastNew || "DXCC"} accent="var(--chart-5)" />
|
||||||
<StatTile label={t('stats.continents')} value={nf(stats.continents)} sub="/ 7" accent="var(--chart-8)" />
|
<StatTile label={t('stats.continents')} value={nf(stats.continents)} sub="/ 7" accent="var(--chart-8)" />
|
||||||
<StatTile label={t('stats.confirmed')} value={`${stats.total ? ((stats.confirmed_any / stats.total) * 100).toFixed(0) : 0}%`}
|
<StatTile label={t('stats.confirmed')} value={`${stats.total ? ((stats.confirmed_any / stats.total) * 100).toFixed(0) : 0}%`}
|
||||||
sub={`${nf(stats.confirmed_any)} / ${nf(stats.total)}`} accent="var(--success)" />
|
sub={`${nf(stats.confirmed_any)} / ${nf(stats.total)}`} accent="var(--success)" />
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ type UDPConfig = {
|
|||||||
direction: 'inbound' | 'outbound';
|
direction: 'inbound' | 'outbound';
|
||||||
name: string;
|
name: string;
|
||||||
port: number;
|
port: number;
|
||||||
service_type: 'wsjt' | 'adif' | 'n1mm' | 'remote_call' | 'db_updated' | 'pstrotator_freq' | 'n1mm_radioinfo' | 'wsjt_log' | 'custom';
|
service_type: 'wsjt' | 'adif' | 'n1mm' | 'remote_call' | 'db_updated' | 'pstrotator_freq' | 'n1mm_radioinfo' | 'wsjt_log' | 'wsjt_relay' | 'custom';
|
||||||
// Custom rows only.
|
// Custom rows only.
|
||||||
trigger?: string;
|
trigger?: string;
|
||||||
template?: string;
|
template?: string;
|
||||||
@@ -95,6 +95,19 @@ const SERVICE_TYPES: Array<{
|
|||||||
hint: 'udpp.svcWsjtLogHint',
|
hint: 'udpp.svcWsjtLogHint',
|
||||||
defaults: { port: 2250, destination_ip: '127.0.0.1' },
|
defaults: { port: 2250, destination_ip: '127.0.0.1' },
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
// Feeds a SECOND application the stream this OpsLog receives. WSJT-X, JTDX
|
||||||
|
// and MSHV each send to ONE address, so without a relay the choice is
|
||||||
|
// between OpsLog and JTAlert/GridTracker rather than both.
|
||||||
|
//
|
||||||
|
// 2238 by default: beside the 2237 the sender uses, and free. Pointing it AT
|
||||||
|
// 2237 would name an OpsLog listener, which the relay refuses.
|
||||||
|
id: 'wsjt_relay',
|
||||||
|
direction: 'outbound',
|
||||||
|
label: 'udpp.svcWsjtRelayLabel',
|
||||||
|
hint: 'udpp.svcWsjtRelayHint',
|
||||||
|
defaults: { port: 2238, destination_ip: '127.0.0.1' },
|
||||||
|
},
|
||||||
{
|
{
|
||||||
// The general case: the operator picks the moment and writes the message.
|
// The general case: the operator picks the moment and writes the message.
|
||||||
// Mainly for antenna switches, which are driven by a URL and want the band
|
// Mainly for antenna switches, which are driven by a URL and want the band
|
||||||
|
|||||||
@@ -35,6 +35,7 @@ type Props = {
|
|||||||
onUpdateFromCty?: (ids: number[]) => void;
|
onUpdateFromCty?: (ids: number[]) => void;
|
||||||
onUpdateFromQRZ?: (ids: number[]) => void;
|
onUpdateFromQRZ?: (ids: number[]) => void;
|
||||||
onUpdateFromClublog?: (ids: number[]) => void;
|
onUpdateFromClublog?: (ids: number[]) => void;
|
||||||
|
onUpdateCountyFromULS?: (ids: number[]) => void;
|
||||||
onSendTo?: (service: string, ids: number[]) => void;
|
onSendTo?: (service: string, ids: number[]) => void;
|
||||||
onSendRecording?: (ids: number[]) => void;
|
onSendRecording?: (ids: number[]) => void;
|
||||||
onSendEQSL?: (ids: number[]) => void;
|
onSendEQSL?: (ids: number[]) => void;
|
||||||
@@ -57,7 +58,7 @@ function fmtDate(s: any): string {
|
|||||||
return `${d.getUTCFullYear()}-${p(d.getUTCMonth() + 1)}-${p(d.getUTCDate())}`;
|
return `${d.getUTCFullYear()}-${p(d.getUTCMonth() + 1)}-${p(d.getUTCDate())}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function WorkedBeforeGrid({ wb, myGrid, busy, currentCall, onRowDoubleClicked, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onSendTo, onSendRecording, onSendEQSL, onBulkEdit, onExportSelected, onExportSelectedFields, onExportCabrilloSelected, onDelete, awardCols }: Props) {
|
export function WorkedBeforeGrid({ wb, myGrid, busy, currentCall, onRowDoubleClicked, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onUpdateCountyFromULS, onSendTo, onSendRecording, onSendEQSL, onBulkEdit, onExportSelected, onExportSelectedFields, onExportCabrilloSelected, onDelete, awardCols }: Props) {
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const gridRef = useRef<any>(null);
|
const gridRef = useRef<any>(null);
|
||||||
const [pickerOpen, setPickerOpen] = useState(false);
|
const [pickerOpen, setPickerOpen] = useState(false);
|
||||||
@@ -272,6 +273,7 @@ export function WorkedBeforeGrid({ wb, myGrid, busy, currentCall, onRowDoubleCli
|
|||||||
onUpdateFromCty={(ids) => onUpdateFromCty?.(ids)}
|
onUpdateFromCty={(ids) => onUpdateFromCty?.(ids)}
|
||||||
onUpdateFromQRZ={(ids) => onUpdateFromQRZ?.(ids)}
|
onUpdateFromQRZ={(ids) => onUpdateFromQRZ?.(ids)}
|
||||||
onUpdateFromClublog={onUpdateFromClublog}
|
onUpdateFromClublog={onUpdateFromClublog}
|
||||||
|
onUpdateCountyFromULS={onUpdateCountyFromULS}
|
||||||
onSendTo={onSendTo}
|
onSendTo={onSendTo}
|
||||||
onSendRecording={onSendRecording}
|
onSendRecording={onSendRecording}
|
||||||
onSendEQSL={onSendEQSL}
|
onSendEQSL={onSendEQSL}
|
||||||
@@ -296,6 +298,20 @@ export function WorkedBeforeGrid({ wb, myGrid, busy, currentCall, onRowDoubleCli
|
|||||||
{t('wbg.pickerDesc')}
|
{t('wbg.pickerDesc')}
|
||||||
</DialogDescription>
|
</DialogDescription>
|
||||||
</DialogHeader>
|
</DialogHeader>
|
||||||
|
{/* Whole-dialog controls — the award columns included, which the
|
||||||
|
catalogue-only helpers do not cover. */}
|
||||||
|
<div className="flex items-center gap-1 px-5 text-[11px] text-muted-foreground">
|
||||||
|
<span>{t('wbg.allGroups')}</span>
|
||||||
|
<button type="button" className="text-[11px] text-primary hover:underline px-1"
|
||||||
|
onClick={() => { showAll(); (awardCols ?? []).forEach((a) => setColVisible(`award_${a.code}`, true)); }}>
|
||||||
|
{t('wbg.all')}
|
||||||
|
</button>
|
||||||
|
<span className="opacity-40">·</span>
|
||||||
|
<button type="button" className="text-[11px] text-muted-foreground hover:underline px-1"
|
||||||
|
onClick={() => { hideAll(); (awardCols ?? []).forEach((a) => setColVisible(`award_${a.code}`, false)); }}>
|
||||||
|
{t('wbg.none')}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
<div className="grid grid-cols-2 gap-4 max-h-[60vh] overflow-y-auto px-5 py-3">
|
<div className="grid grid-cols-2 gap-4 max-h-[60vh] overflow-y-auto px-5 py-3">
|
||||||
{GROUP_ORDER.map((group) => {
|
{GROUP_ORDER.map((group) => {
|
||||||
const cols = COL_CATALOG.filter((c) => c.group === group);
|
const cols = COL_CATALOG.filter((c) => c.group === group);
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import {
|
|||||||
} from '@/components/ui/select';
|
} from '@/components/ui/select';
|
||||||
import { Separator } from '@/components/ui/separator';
|
import { Separator } from '@/components/ui/separator';
|
||||||
import { cn } from '@/lib/utils';
|
import { cn } from '@/lib/utils';
|
||||||
|
import { QSO_BOX_FIELDS, QSO_FIELD_LABELS } from './qslTypes';
|
||||||
import type { CardTemplate, CardElement, QSOBox, QSLPresetInfo, StyleParams } from './qslTypes';
|
import type { CardTemplate, CardElement, QSOBox, QSLPresetInfo, StyleParams } from './qslTypes';
|
||||||
import type { CardSelection } from './CardPreview';
|
import type { CardSelection } from './CardPreview';
|
||||||
import { StylePresetPicker, NumberField } from './StylePresetPicker';
|
import { StylePresetPicker, NumberField } from './StylePresetPicker';
|
||||||
@@ -199,6 +200,26 @@ export function EditorPanel({ template, sel, presets, fontFamilies, onPatchEleme
|
|||||||
<Input className="h-7 w-44 font-mono text-xs" value={box.title ?? ''}
|
<Input className="h-7 w-44 font-mono text-xs" value={box.title ?? ''}
|
||||||
onChange={(ev) => onPatchBox({ title: ev.target.value })} />
|
onChange={(ev) => onPatchBox({ title: ev.target.value })} />
|
||||||
</div>
|
</div>
|
||||||
|
<div className="space-y-1">
|
||||||
|
<Label className="text-xs text-muted-foreground">Columns</Label>
|
||||||
|
{/* Rebuilt from the canonical order every time rather than
|
||||||
|
appended to: a box whose columns come out in the order they
|
||||||
|
were ticked reads as a bug, and the widths are tuned for this
|
||||||
|
order. */}
|
||||||
|
<div className="grid grid-cols-2 gap-x-2">
|
||||||
|
{QSO_BOX_FIELDS.map((f) => (
|
||||||
|
<label key={f} className="flex items-center gap-1.5 text-xs">
|
||||||
|
<Checkbox
|
||||||
|
checked={box.fields.includes(f)}
|
||||||
|
onCheckedChange={(v) => onPatchBox({
|
||||||
|
fields: QSO_BOX_FIELDS.filter((k) => (k === f ? v === true : box.fields.includes(k))),
|
||||||
|
})}
|
||||||
|
/>
|
||||||
|
{QSO_FIELD_LABELS[f] ?? f}
|
||||||
|
</label>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div className="flex items-center justify-between gap-2">
|
<div className="flex items-center justify-between gap-2">
|
||||||
<Label className="text-xs text-muted-foreground">Footer</Label>
|
<Label className="text-xs text-muted-foreground">Footer</Label>
|
||||||
<Input className="h-7 w-44 font-mono text-xs" value={box.footer}
|
<Input className="h-7 w-44 font-mono text-xs" value={box.footer}
|
||||||
|
|||||||
@@ -165,6 +165,12 @@ export interface QSLPresetInfo {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Human labels for the QSO box fields the renderer knows.
|
// Human labels for the QSO box fields the renderer knows.
|
||||||
|
// QSO_BOX_FIELDS is the canonical COLUMN ORDER of the confirmation box, and
|
||||||
|
// the whole list the designer offers. The renderer's column widths are tuned
|
||||||
|
// for it, so a box is always rebuilt from this order rather than from the
|
||||||
|
// order the operator happened to tick the boxes in.
|
||||||
|
export const QSO_BOX_FIELDS = ['qso_date', 'time_on', 'band', 'freq', 'mode', 'submode', 'rst_sent'] as const;
|
||||||
|
|
||||||
export const QSO_FIELD_LABELS: Record<string, string> = {
|
export const QSO_FIELD_LABELS: Record<string, string> = {
|
||||||
qso_date: 'Date',
|
qso_date: 'Date',
|
||||||
time_on: 'UTC',
|
time_on: 'UTC',
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import { useEffect, useRef, useState } from 'react';
|
import { useEffect, useRef, useState } from 'react';
|
||||||
|
import { ChevronDown } from 'lucide-react';
|
||||||
import { Input } from './input';
|
import { Input } from './input';
|
||||||
import { cn } from '@/lib/utils';
|
import { cn } from '@/lib/utils';
|
||||||
|
|
||||||
@@ -7,6 +8,7 @@ import { cn } from '@/lib/utils';
|
|||||||
// can't hold a typo'd value that isn't in the list.
|
// can't hold a typo'd value that isn't in the list.
|
||||||
export function Combobox({
|
export function Combobox({
|
||||||
value, onChange, options, placeholder, className, allowFreeText = false, commitOnType = false,
|
value, onChange, options, placeholder, className, allowFreeText = false, commitOnType = false,
|
||||||
|
showToggle = false,
|
||||||
}: {
|
}: {
|
||||||
value: string;
|
value: string;
|
||||||
onChange: (v: string) => void;
|
onChange: (v: string) => void;
|
||||||
@@ -18,9 +20,21 @@ export function Combobox({
|
|||||||
// fields read live by other actions — e.g. RST, so a CW macro sent without
|
// fields read live by other actions — e.g. RST, so a CW macro sent without
|
||||||
// leaving the field uses the value just typed.
|
// leaving the field uses the value just typed.
|
||||||
commitOnType?: boolean;
|
commitOnType?: boolean;
|
||||||
|
// Draw a chevron that opens the full list on click.
|
||||||
|
//
|
||||||
|
// Without it this control is indistinguishable from a plain text box: it opens
|
||||||
|
// only on a keystroke or ArrowDown, both of which have to be known about
|
||||||
|
// first. That is fine for a field whose list is a convenience (RST), and wrong
|
||||||
|
// for one whose list is the ANSWER — the COM ports actually present on this
|
||||||
|
// machine, which nobody can be expected to recall.
|
||||||
|
showToggle?: boolean;
|
||||||
}) {
|
}) {
|
||||||
const [open, setOpen] = useState(false);
|
const [open, setOpen] = useState(false);
|
||||||
const [query, setQuery] = useState('');
|
const [query, setQuery] = useState('');
|
||||||
|
// Opened by the chevron rather than by typing: the whole list is on offer, not
|
||||||
|
// the part matching what is already in the field — a box holding COM7 would
|
||||||
|
// otherwise "open" onto COM7 alone.
|
||||||
|
const [browse, setBrowse] = useState(false);
|
||||||
const ref = useRef<HTMLDivElement>(null);
|
const ref = useRef<HTMLDivElement>(null);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -31,20 +45,22 @@ export function Combobox({
|
|||||||
return () => document.removeEventListener('mousedown', onDoc);
|
return () => document.removeEventListener('mousedown', onDoc);
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
const filtered = open
|
const filtered = !open ? []
|
||||||
? options.filter((o) => o.toLowerCase().includes(query.toLowerCase())).slice(0, 60)
|
: browse ? options.slice(0, 60)
|
||||||
: [];
|
: options.filter((o) => o.toLowerCase().includes(query.toLowerCase())).slice(0, 60);
|
||||||
|
|
||||||
function commit(v: string) {
|
function commit(v: string) {
|
||||||
onChange(v);
|
onChange(v);
|
||||||
setQuery(v);
|
setQuery(v);
|
||||||
setOpen(false);
|
setOpen(false);
|
||||||
|
setBrowse(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
function onBlur() {
|
function onBlur() {
|
||||||
// Defer so a click on an option registers first.
|
// Defer so a click on an option registers first.
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
setOpen(false);
|
setOpen(false);
|
||||||
|
setBrowse(false);
|
||||||
const trimmed = query.trim();
|
const trimmed = query.trim();
|
||||||
const exact = options.find((o) => o.toLowerCase() === trimmed.toLowerCase());
|
const exact = options.find((o) => o.toLowerCase() === trimmed.toLowerCase());
|
||||||
// Only fire onChange when the value actually changed — committing an
|
// Only fire onChange when the value actually changed — committing an
|
||||||
@@ -68,6 +84,7 @@ export function Combobox({
|
|||||||
const v = e.target.value;
|
const v = e.target.value;
|
||||||
setQuery(v);
|
setQuery(v);
|
||||||
setOpen(true);
|
setOpen(true);
|
||||||
|
setBrowse(false); // typing filters again
|
||||||
// Commit-on-type pushes the value live to the parent (so a CW macro sent
|
// Commit-on-type pushes the value live to the parent (so a CW macro sent
|
||||||
// without leaving the field uses what was just typed). With free text that's
|
// without leaving the field uses what was just typed). With free text that's
|
||||||
// any input; a restricted field (allowFreeText=false) commits ONLY a value
|
// any input; a restricted field (allowFreeText=false) commits ONLY a value
|
||||||
@@ -76,14 +93,34 @@ export function Combobox({
|
|||||||
if (commitOnType && (allowFreeText || options.some((o) => o.toLowerCase() === v.trim().toLowerCase()))) onChange(v);
|
if (commitOnType && (allowFreeText || options.some((o) => o.toLowerCase() === v.trim().toLowerCase()))) onChange(v);
|
||||||
}}
|
}}
|
||||||
onBlur={onBlur}
|
onBlur={onBlur}
|
||||||
|
className={showToggle ? 'pr-7' : undefined}
|
||||||
onKeyDown={(e) => {
|
onKeyDown={(e) => {
|
||||||
if ((e.key === 'ArrowDown' || e.key === 'Alt') && !open) { setOpen(true); }
|
if ((e.key === 'ArrowDown' || e.key === 'Alt') && !open) { setOpen(true); setBrowse(true); }
|
||||||
else if (e.key === 'Enter' && open && filtered.length > 0) { e.preventDefault(); commit(filtered[0]); }
|
else if (e.key === 'Enter' && open && filtered.length > 0) { e.preventDefault(); commit(filtered[0]); }
|
||||||
else if (e.key === 'Escape') { setQuery(value); setOpen(false); }
|
else if (e.key === 'Escape') { setQuery(value); setOpen(false); }
|
||||||
// Tab: just let it move on; onBlur commits/closes. Options are
|
// Tab: just let it move on; onBlur commits/closes. Options are
|
||||||
// tabIndex=-1 so a single Tab leaves the field.
|
// tabIndex=-1 so a single Tab leaves the field.
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
|
{showToggle && (
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
tabIndex={-1}
|
||||||
|
aria-label="Show list"
|
||||||
|
className="absolute inset-y-0 right-0 flex w-7 items-center justify-center text-muted-foreground hover:text-foreground"
|
||||||
|
// mousedown, not click: the input's blur fires first otherwise and
|
||||||
|
// closes the list the same instant this opens it.
|
||||||
|
onMouseDown={(e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
if (open) { setOpen(false); setBrowse(false); return; }
|
||||||
|
setQuery(value);
|
||||||
|
setBrowse(true);
|
||||||
|
setOpen(true);
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<ChevronDown className="size-3.5" />
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
{open && filtered.length > 0 && (
|
{open && filtered.length > 0 && (
|
||||||
<div className="absolute z-50 mt-1 max-h-60 w-full overflow-auto rounded-md border border-border bg-card shadow-lg text-xs">
|
<div className="absolute z-50 mt-1 max-h-60 w-full overflow-auto rounded-md border border-border bg-card shadow-lg text-xs">
|
||||||
{filtered.map((o) => (
|
{filtered.map((o) => (
|
||||||
|
|||||||
@@ -0,0 +1,208 @@
|
|||||||
|
// Auto-call: let OpsLog answer a decode without the operator clicking it.
|
||||||
|
//
|
||||||
|
// WITHDRAWN FROM THE INTERFACE, because DXHunter already does it.
|
||||||
|
//
|
||||||
|
// Two programs from the same shack deciding on their own to answer the same
|
||||||
|
// decode is worse than either doing it alone: they cannot see each other, so
|
||||||
|
// they key over one another, and afterwards there is no telling which of them
|
||||||
|
// called. The duplicate is the one to remove, and DXHunter is where this lives.
|
||||||
|
//
|
||||||
|
// There is no switch in Preferences and no button on the decodes toolbar, and
|
||||||
|
// App.tsx returns before the loop can run. The file is kept whole: the rules
|
||||||
|
// below are the delicate part, argued over and tested, and rewriting them from
|
||||||
|
// memory later would be worse than leaving them here. Reinstating the feature
|
||||||
|
// means restoring all three — the settings page, the button, and the guard.
|
||||||
|
//
|
||||||
|
// This KEYS THE TRANSMITTER on its own, which is why the rules here are written
|
||||||
|
// as a series of refusals rather than a search for a reason to call. Everything
|
||||||
|
// below has to be true; anything unknown means no.
|
||||||
|
//
|
||||||
|
// The decision is made here, in one pure function, precisely because it is the
|
||||||
|
// dangerous part: it can be read, argued with and tested without a radio.
|
||||||
|
|
||||||
|
export type AutoCallCriteria = {
|
||||||
|
dxcc: boolean; // entity never worked
|
||||||
|
bandmode: boolean; // entity worked, but neither this band nor this mode
|
||||||
|
band: boolean; // entity never worked on this band
|
||||||
|
mode: boolean; // entity never worked in this mode
|
||||||
|
slot: boolean; // band and mode each worked, never together
|
||||||
|
grid: boolean; // square wanted under the grid scope
|
||||||
|
county: boolean; // US county never worked
|
||||||
|
pota: boolean; // park never worked
|
||||||
|
// No SOTA here, though the shape invites it: a decode carries no summit
|
||||||
|
// reference and the backend publishes no "new summit" flag, so a criterion
|
||||||
|
// for it could never be true. It WAS declared, translated and impossible to
|
||||||
|
// tick — a field that lies about what the feature can do.
|
||||||
|
pfx: boolean; // CQ WPX prefix never worked
|
||||||
|
};
|
||||||
|
|
||||||
|
export type AutoCallSettings = {
|
||||||
|
enabled: boolean;
|
||||||
|
criteria: AutoCallCriteria;
|
||||||
|
// Callsigns to answer on sight, wildcards allowed (4S7*, */P). Each is still
|
||||||
|
// subject to `watchCriteria` — "call TM0HQ, but only if it is a new band" is
|
||||||
|
// the request, not "call it every time it appears".
|
||||||
|
watch: string[];
|
||||||
|
// Empty means call a watched callsign whenever it is not already worked.
|
||||||
|
watchCriteria: AutoCallCriteria;
|
||||||
|
// Seconds to ignore a callsign after calling it, so a station that keeps
|
||||||
|
// sending CQ is not re-answered every slot while the QSO is in progress.
|
||||||
|
cooldownSec: number;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const emptyCriteria: AutoCallCriteria = {
|
||||||
|
dxcc: false, bandmode: false, band: false, mode: false, slot: false,
|
||||||
|
grid: false, county: false, pota: false, pfx: false,
|
||||||
|
};
|
||||||
|
|
||||||
|
export const defaultAutoCall: AutoCallSettings = {
|
||||||
|
// OFF, and it stays off until asked for. Unattended transmit is not something
|
||||||
|
// to inherit from an upgrade.
|
||||||
|
enabled: false,
|
||||||
|
criteria: { ...emptyCriteria },
|
||||||
|
watch: [],
|
||||||
|
watchCriteria: { ...emptyCriteria },
|
||||||
|
cooldownSec: 120,
|
||||||
|
};
|
||||||
|
|
||||||
|
const AC_KEY = 'opslog.autoCall';
|
||||||
|
|
||||||
|
export function loadAutoCall(): AutoCallSettings {
|
||||||
|
try {
|
||||||
|
const raw = localStorage.getItem(AC_KEY);
|
||||||
|
if (!raw) return { ...defaultAutoCall };
|
||||||
|
const v = JSON.parse(raw);
|
||||||
|
return {
|
||||||
|
...defaultAutoCall,
|
||||||
|
...v,
|
||||||
|
criteria: { ...emptyCriteria, ...(v?.criteria ?? {}) },
|
||||||
|
watchCriteria: { ...emptyCriteria, ...(v?.watchCriteria ?? {}) },
|
||||||
|
watch: Array.isArray(v?.watch) ? v.watch : [],
|
||||||
|
};
|
||||||
|
} catch { return { ...defaultAutoCall }; }
|
||||||
|
}
|
||||||
|
|
||||||
|
export const autoCallKey = AC_KEY;
|
||||||
|
|
||||||
|
// A decode's resolved novelty, the same shape the panel already renders from.
|
||||||
|
export type DecodeStatus = {
|
||||||
|
status?: string;
|
||||||
|
worked_call?: boolean;
|
||||||
|
new_grid?: boolean;
|
||||||
|
grid_state?: string;
|
||||||
|
new_county?: boolean;
|
||||||
|
new_pota?: boolean;
|
||||||
|
new_pfx?: boolean;
|
||||||
|
};
|
||||||
|
|
||||||
|
// matchesWildcard is the same rule the alert filters use: * is any run, ? is one.
|
||||||
|
export function matchesWildcard(pattern: string, call: string): boolean {
|
||||||
|
const p = pattern.trim().toUpperCase();
|
||||||
|
const c = call.trim().toUpperCase();
|
||||||
|
if (!p) return false;
|
||||||
|
const re = new RegExp('^' + p.split('').map((ch) => (
|
||||||
|
ch === '*' ? '.*' : ch === '?' ? '.' : ch.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
|
||||||
|
)).join('') + '$');
|
||||||
|
return re.test(c);
|
||||||
|
}
|
||||||
|
|
||||||
|
// anyCriterion is false for an all-off set, which is what makes "watch this
|
||||||
|
// callsign, no conditions" expressible.
|
||||||
|
function anyCriterion(c: AutoCallCriteria): boolean {
|
||||||
|
return Object.values(c).some(Boolean);
|
||||||
|
}
|
||||||
|
|
||||||
|
// meets reports whether a decode satisfies at least one ticked criterion.
|
||||||
|
function meets(c: AutoCallCriteria, e: DecodeStatus): boolean {
|
||||||
|
if (c.dxcc && e.status === 'new') return true;
|
||||||
|
// Each status is exclusive, so a station that is new on both counts matches
|
||||||
|
// ONLY this criterion — ticking "new band" alone would not catch it, which is
|
||||||
|
// the wrong way round: it is the better catch of the two.
|
||||||
|
if (c.bandmode && e.status === 'new-band-mode') return true;
|
||||||
|
if (c.band && e.status === 'new-band') return true;
|
||||||
|
if (c.mode && e.status === 'new-mode') return true;
|
||||||
|
if (c.slot && e.status === 'new-slot') return true;
|
||||||
|
// A square that is merely UNCONFIRMED is not called: the QSO is already made,
|
||||||
|
// and calling again would work a duplicate to chase a QSL.
|
||||||
|
if (c.grid && e.new_grid && e.grid_state !== 'unconf') return true;
|
||||||
|
if (c.county && e.new_county) return true;
|
||||||
|
if (c.pota && e.new_pota) return true;
|
||||||
|
if (c.pfx && e.new_pfx) return true;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
export type AutoCallDecode = {
|
||||||
|
call: string;
|
||||||
|
cq?: boolean;
|
||||||
|
msg?: string;
|
||||||
|
instance?: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
// shouldAutoCall decides whether to answer one decode. The reason is returned
|
||||||
|
// for the log: an automatic transmission with no record of WHY is the thing an
|
||||||
|
// operator cannot argue with after the fact.
|
||||||
|
export function shouldAutoCall(
|
||||||
|
s: AutoCallSettings,
|
||||||
|
d: AutoCallDecode,
|
||||||
|
e: DecodeStatus | undefined,
|
||||||
|
opts: {
|
||||||
|
// busy is "some receiver is mid-QSO", NOT "this one is transmitting".
|
||||||
|
//
|
||||||
|
// The distinction is the whole bug it fixes: with two instances the caller
|
||||||
|
// used to test a single global transmit flag, which belonged to whichever
|
||||||
|
// receiver reported last. So while slice A worked a station, slice B looked
|
||||||
|
// idle and auto-call started another QSO on it — and the moment either
|
||||||
|
// finished it chained straight into the next. One station at a time means
|
||||||
|
// one across ALL receivers, not one per receiver.
|
||||||
|
busy: boolean;
|
||||||
|
calledAt: Map<string, number>;
|
||||||
|
now: number;
|
||||||
|
myCall?: string;
|
||||||
|
},
|
||||||
|
): { call: boolean; reason: string } {
|
||||||
|
const no = (why: string) => ({ call: false, reason: why });
|
||||||
|
if (!s.enabled) return no('off');
|
||||||
|
if (!e) return no('status not resolved yet');
|
||||||
|
const call = (d.call ?? '').trim().toUpperCase();
|
||||||
|
if (!call) return no('no callsign');
|
||||||
|
// Never answer ourselves, however the decode reached us.
|
||||||
|
if (opts.myCall && call === opts.myCall.trim().toUpperCase()) return no('own callsign');
|
||||||
|
// NOT limited to a CQ, deliberately.
|
||||||
|
//
|
||||||
|
// It used to be, on the reasoning that answering a station mid-QSO is calling
|
||||||
|
// over somebody. That reasoning ignored the case the feature exists for: a
|
||||||
|
// DXpedition running a pileup never sends CQ at all — it works caller after
|
||||||
|
// caller — so the rule sat out the one contact auto-call was turned on for. A
|
||||||
|
// new entity on 15 m FT8, decode after decode, and not a single transmission.
|
||||||
|
//
|
||||||
|
// WHEN to transmit is not ours to decide either: the Reply goes to the
|
||||||
|
// decoder, and MSHV starts at once while JTDX waits for a CQ. Two correct
|
||||||
|
// behaviours, both belonging to the program that owns the timing. Here the
|
||||||
|
// question is only whether the station is one the operator wants — the
|
||||||
|
// criteria below answer that, and the cooldown and the busy check keep it from
|
||||||
|
// calling twice.
|
||||||
|
// Not while ANY receiver is mid-QSO — transmitting, or holding a DX call it
|
||||||
|
// has not finished with. Starting a second exchange before the first is done
|
||||||
|
// is what turned this into a machine that called without stopping.
|
||||||
|
if (opts.busy) return no('a QSO is already in progress');
|
||||||
|
const last = opts.calledAt.get(call);
|
||||||
|
if (last !== undefined && opts.now - last < s.cooldownSec * 1000) return no('called recently');
|
||||||
|
|
||||||
|
// The watch list first: an explicitly named station outranks the general
|
||||||
|
// criteria, and may carry conditions of its own.
|
||||||
|
const watched = s.watch.some((p) => matchesWildcard(p, call));
|
||||||
|
if (watched) {
|
||||||
|
if (!anyCriterion(s.watchCriteria)) {
|
||||||
|
// No conditions attached: call it unless it is already worked.
|
||||||
|
return e.worked_call ? no('watched, but already worked') : { call: true, reason: 'watch list' };
|
||||||
|
}
|
||||||
|
return meets(s.watchCriteria, e)
|
||||||
|
? { call: true, reason: 'watch list + criteria' }
|
||||||
|
: no('watched, but no criterion met');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!anyCriterion(s.criteria)) return no('no criteria ticked');
|
||||||
|
return meets(s.criteria, e)
|
||||||
|
? { call: true, reason: 'criteria' }
|
||||||
|
: no('no criterion met');
|
||||||
|
}
|
||||||
@@ -192,3 +192,45 @@ export function spotRefList(byCode: Record<string, string>, fieldOf: Record<stri
|
|||||||
}
|
}
|
||||||
return out.sort((a, b) => a.length - b.length || a.localeCompare(b));
|
return out.sort((a, b) => a.length - b.length || a.localeCompare(b));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// withIOTARef adds an island reference from the callbook to an entry's award
|
||||||
|
// references, unless the operator has already set one.
|
||||||
|
//
|
||||||
|
// QRZ sends <iota> for an operator on an island and OpsLog used to read past it.
|
||||||
|
// It matters more here than it would for another award: unlike POTA there is no
|
||||||
|
// live "who is on an island right now" feed anywhere, so the callbook record is
|
||||||
|
// the practical source — and it is known before the contact is logged, which is
|
||||||
|
// when it is useful.
|
||||||
|
//
|
||||||
|
// A reference the operator typed or picked wins. A callbook entry can be years
|
||||||
|
// old, and the operator in front of the radio has just been told where the
|
||||||
|
// station is.
|
||||||
|
// withRDARef adds a Russian district from the callbook to an entry's award
|
||||||
|
// references, on the same terms as the island above.
|
||||||
|
//
|
||||||
|
// HamQTH publishes the district a station operates from TODAY. That is the
|
||||||
|
// right answer for the contact being typed and the wrong one for any other, so
|
||||||
|
// this is only ever called on the entry — never on a QSO already in the log.
|
||||||
|
// A station can move district; stamping today's on last year's contact turns a
|
||||||
|
// correct entry into a false one, and nothing downstream could tell.
|
||||||
|
export function withRDARef(awardRefs: string, rda: string): string {
|
||||||
|
const ref = (rda || '').trim().toUpperCase();
|
||||||
|
// Two letters, a hyphen, two digits. Anything else is not a district.
|
||||||
|
if (!/^[A-Z]{2}-\d{2}$/.test(ref)) return awardRefs;
|
||||||
|
const byCode = parseAwardRefs(awardRefs);
|
||||||
|
if ((byCode['RDA'] ?? '').trim() !== '') return awardRefs; // already set: leave it
|
||||||
|
const sep = awardRefs.trim() === '' ? '' : ';';
|
||||||
|
return awardRefs + sep + 'RDA@' + ref;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function withIOTARef(awardRefs: string, iota: string): string {
|
||||||
|
const ref = (iota || '').trim().toUpperCase();
|
||||||
|
// EU-048: two letters, a hyphen, three digits. Anything else is not an IOTA
|
||||||
|
// reference, and writing it into the award would make a reference that no
|
||||||
|
// list contains — which counts for nothing and has to be found by hand later.
|
||||||
|
if (!/^[A-Z]{2}-\d{3}$/.test(ref)) return awardRefs;
|
||||||
|
const byCode = parseAwardRefs(awardRefs);
|
||||||
|
if ((byCode['IOTA'] ?? '').trim() !== '') return awardRefs; // already set: leave it
|
||||||
|
const sep = awardRefs.trim() === '' ? '' : ';';
|
||||||
|
return awardRefs + sep + 'IOTA@' + ref;
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,57 @@
|
|||||||
|
// Cluster command macros — a named button for a command you would otherwise
|
||||||
|
// retype.
|
||||||
|
//
|
||||||
|
// Twelve slots, fixed. A list you can grow needs add/remove/reorder controls and
|
||||||
|
// a decision about what an empty row means; twelve boxes you fill in need
|
||||||
|
// neither, and nobody has thirteen cluster commands they use daily. A slot with
|
||||||
|
// no command is simply not drawn, so the toolbar is as long as the operator made
|
||||||
|
// it and no longer.
|
||||||
|
//
|
||||||
|
// Stored through writeUiPref like every other portable preference, so the
|
||||||
|
// buttons travel with data/ rather than living in one browser profile.
|
||||||
|
|
||||||
|
import { writeUiPref } from '@/lib/uiPref';
|
||||||
|
|
||||||
|
export type ClusterMacro = {
|
||||||
|
label: string; // what the button says
|
||||||
|
cmd: string; // what is sent to the master server
|
||||||
|
};
|
||||||
|
|
||||||
|
export const CLUSTER_MACRO_COUNT = 12;
|
||||||
|
export const clusterMacrosKey = 'opslog.clusterMacros';
|
||||||
|
|
||||||
|
export const emptyClusterMacros = (): ClusterMacro[] =>
|
||||||
|
Array.from({ length: CLUSTER_MACRO_COUNT }, () => ({ label: '', cmd: '' }));
|
||||||
|
|
||||||
|
// loadClusterMacros always returns exactly CLUSTER_MACRO_COUNT entries, whatever
|
||||||
|
// was stored: a saved list from a build with fewer slots must not leave the
|
||||||
|
// editor rendering undefined rows.
|
||||||
|
export function loadClusterMacros(): ClusterMacro[] {
|
||||||
|
const out = emptyClusterMacros();
|
||||||
|
try {
|
||||||
|
const raw = localStorage.getItem(clusterMacrosKey);
|
||||||
|
if (!raw) return out;
|
||||||
|
const v = JSON.parse(raw);
|
||||||
|
if (!Array.isArray(v)) return out;
|
||||||
|
for (let i = 0; i < CLUSTER_MACRO_COUNT && i < v.length; i++) {
|
||||||
|
out[i] = {
|
||||||
|
label: String(v[i]?.label ?? '').slice(0, 24),
|
||||||
|
cmd: String(v[i]?.cmd ?? '').slice(0, 120),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
} catch { /* a corrupt preference is not worth failing the panel over */ }
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function saveClusterMacros(macros: ClusterMacro[]): void {
|
||||||
|
writeUiPref(clusterMacrosKey, JSON.stringify(macros));
|
||||||
|
}
|
||||||
|
|
||||||
|
// visibleClusterMacros drops the slots that would send nothing. The COMMAND is
|
||||||
|
// what decides: a slot with a label and no command is a button that lies, and a
|
||||||
|
// command with no label still has something to show — its own text.
|
||||||
|
export function visibleClusterMacros(macros: ClusterMacro[]): ClusterMacro[] {
|
||||||
|
return macros
|
||||||
|
.filter((m) => m.cmd.trim() !== '')
|
||||||
|
.map((m) => ({ label: m.label.trim() || m.cmd.trim(), cmd: m.cmd.trim() }));
|
||||||
|
}
|
||||||
+186
-74
File diff suppressed because one or more lines are too long
@@ -0,0 +1,66 @@
|
|||||||
|
// Operator overrides for the band/mode matrix palette.
|
||||||
|
//
|
||||||
|
// Applied as inline custom properties on <html>, which is what lets them be
|
||||||
|
// OVERRIDES rather than a palette: the twelve themes each define their own
|
||||||
|
// --mx-* ramp in style.css, an inline value wins over all of them, and removing
|
||||||
|
// it hands the colour straight back to the theme. Nothing has to know which
|
||||||
|
// theme is active, and switching theme with overrides off is a clean revert.
|
||||||
|
|
||||||
|
export type MatrixColors = {
|
||||||
|
enabled: boolean;
|
||||||
|
call_confirmed: string;
|
||||||
|
call_worked: string;
|
||||||
|
entity_confirmed: string;
|
||||||
|
entity_worked: string;
|
||||||
|
not_worked: string;
|
||||||
|
current_entry: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
// The six settings fields and the CSS custom property each one drives. Also the
|
||||||
|
// display order — the same order the legend under the matrix reads in, so the
|
||||||
|
// settings panel and the grid can never disagree about which green is which.
|
||||||
|
export const MATRIX_VARS: { key: keyof Omit<MatrixColors, 'enabled'>; cssVar: string; label: string }[] = [
|
||||||
|
{ key: 'call_confirmed', cssVar: '--mx-call-conf', label: 'mx.callConf' },
|
||||||
|
{ key: 'call_worked', cssVar: '--mx-call-work', label: 'mx.callWork' },
|
||||||
|
{ key: 'entity_confirmed', cssVar: '--mx-dx-conf', label: 'mx.dxConf' },
|
||||||
|
{ key: 'entity_worked', cssVar: '--mx-dx-work', label: 'mx.dxWork' },
|
||||||
|
{ key: 'not_worked', cssVar: '--mx-none', label: 'mx.none' },
|
||||||
|
{ key: 'current_entry', cssVar: '--mx-cur', label: 'mx.current' },
|
||||||
|
];
|
||||||
|
|
||||||
|
export const emptyMatrixColors = (): MatrixColors => ({
|
||||||
|
enabled: false,
|
||||||
|
call_confirmed: '', call_worked: '', entity_confirmed: '',
|
||||||
|
entity_worked: '', not_worked: '', current_entry: '',
|
||||||
|
});
|
||||||
|
|
||||||
|
// applyMatrixColors stamps (or clears) the overrides on <html>. Safe to call as
|
||||||
|
// often as you like — it is the whole rendering path, so the settings panel uses
|
||||||
|
// it for a live preview and the app uses it once at startup.
|
||||||
|
export function applyMatrixColors(c?: MatrixColors | null): void {
|
||||||
|
const root = document.documentElement;
|
||||||
|
for (const { key, cssVar } of MATRIX_VARS) {
|
||||||
|
const v = c?.enabled ? String(c[key] ?? '').trim() : '';
|
||||||
|
if (v) root.style.setProperty(cssVar, v);
|
||||||
|
else root.style.removeProperty(cssVar);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// effectiveMatrixColor reads what the matrix is ACTUALLY painting right now —
|
||||||
|
// the override if there is one, else the active theme's value. It is what seeds
|
||||||
|
// the colour pickers, so the operator starts from the colours in front of them
|
||||||
|
// instead of from a hardcoded palette that may belong to a different theme.
|
||||||
|
//
|
||||||
|
// A custom property's computed value has its var() references substituted, so
|
||||||
|
// --mx-cur resolves to the theme's --warning rather than to the literal text.
|
||||||
|
export function effectiveMatrixColor(cssVar: string): string {
|
||||||
|
try {
|
||||||
|
const v = getComputedStyle(document.documentElement).getPropertyValue(cssVar).trim();
|
||||||
|
// <input type="color"> only accepts #rrggbb. Anything else (a theme that
|
||||||
|
// ever moves to oklch, an empty read during boot) falls back to mid grey
|
||||||
|
// rather than silently resetting the picker to black.
|
||||||
|
return /^#[0-9a-f]{6}$/i.test(v) ? v.toLowerCase() : '#808080';
|
||||||
|
} catch {
|
||||||
|
return '#808080';
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,102 @@
|
|||||||
|
import { GetRotatorHeading } from '../../wailsjs/go/main/App';
|
||||||
|
|
||||||
|
// One poll loop for the antenna heading, shared by everything that shows it.
|
||||||
|
//
|
||||||
|
// TWO PROBLEMS THIS FIXES, both of them invisible until you count.
|
||||||
|
//
|
||||||
|
// The status bar polled, and the Station Control compass polled, and they polled
|
||||||
|
// the SAME binding — so with that tab open the rotator was asked twice as often
|
||||||
|
// as either component believed. Every backend builds a fresh client per call
|
||||||
|
// (spid.New, gs232.NewSerial, dcu1.NewSerial, rotgenius.New…), so one poll is
|
||||||
|
// one OPEN and CLOSE of a serial port or a TCP connection, not a read on a link
|
||||||
|
// already up.
|
||||||
|
//
|
||||||
|
// And a fixed interval has no good value. Three seconds moved the needle in
|
||||||
|
// steps of about thirteen degrees on a turning antenna — a compass that jumps
|
||||||
|
// rather than sweeps. Seven hundred milliseconds sweeps beautifully and opens
|
||||||
|
// the controller's port about ten thousand times an hour to watch an antenna
|
||||||
|
// that has not moved since breakfast.
|
||||||
|
//
|
||||||
|
// So: fast while it is turning, slow while it is not. "Turning" is not something
|
||||||
|
// these controllers report — a SPID answers a position and nothing else — so it
|
||||||
|
// is inferred from the position changing, and held for a few seconds after the
|
||||||
|
// last change so the tail of a movement stays smooth.
|
||||||
|
|
||||||
|
export type RotorHeading = {
|
||||||
|
enabled: boolean; ok: boolean; azimuth: number;
|
||||||
|
rotors?: string[]; active?: number; motorized?: boolean; raw?: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
const MOVING_MS = 500; // while the antenna is turning
|
||||||
|
const IDLE_MS = 3000; // while it is parked — the rate everything used before
|
||||||
|
const SETTLE_MS = 6000; // stay fast this long after the last movement
|
||||||
|
|
||||||
|
const subs = new Set<(h: RotorHeading) => void>();
|
||||||
|
let timer: number | undefined;
|
||||||
|
let inFlight = false;
|
||||||
|
let lastAz: number | null = null;
|
||||||
|
let lastMoveAt = 0;
|
||||||
|
// The last heading anyone received, replayed to whoever subscribes next.
|
||||||
|
//
|
||||||
|
// Without it, opening Station Control left the compass blank for one or two
|
||||||
|
// seconds while every other panel filled at once. Nothing was slow: the status
|
||||||
|
// bar already had the loop running with a tick pending, so a component mounting
|
||||||
|
// halfway through an idle interval simply waited out the rest of it. The
|
||||||
|
// heading was known the whole time — it just had nowhere to be read from.
|
||||||
|
let last: RotorHeading | null = null;
|
||||||
|
|
||||||
|
function schedule(delay: number) {
|
||||||
|
if (timer !== undefined) window.clearTimeout(timer);
|
||||||
|
timer = window.setTimeout(tick, delay);
|
||||||
|
}
|
||||||
|
|
||||||
|
async function tick() {
|
||||||
|
// A slow controller must not stack requests behind itself: at 600 baud a SPID
|
||||||
|
// reply takes a fifth of a second on the wire alone, and a port that is still
|
||||||
|
// open from the last poll cannot be opened again.
|
||||||
|
if (inFlight) { schedule(MOVING_MS); return; }
|
||||||
|
inFlight = true;
|
||||||
|
try {
|
||||||
|
const h = (await GetRotatorHeading()) as unknown as RotorHeading;
|
||||||
|
if (h?.ok && typeof h.azimuth === 'number') {
|
||||||
|
if (lastAz !== null && h.azimuth !== lastAz) lastMoveAt = Date.now();
|
||||||
|
lastAz = h.azimuth;
|
||||||
|
}
|
||||||
|
last = h;
|
||||||
|
subs.forEach((fn) => { try { fn(h); } catch { /* a subscriber must not stop the loop */ } });
|
||||||
|
} catch {
|
||||||
|
// Leave the last heading alone: a single failed poll on a shared serial port
|
||||||
|
// is not news, and blanking the compass on one would make it flicker.
|
||||||
|
} finally {
|
||||||
|
inFlight = false;
|
||||||
|
}
|
||||||
|
if (subs.size > 0) schedule(Date.now() - lastMoveAt < SETTLE_MS ? MOVING_MS : IDLE_MS);
|
||||||
|
else timer = undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
// subscribeRotorHeading starts the loop if it is not running and returns the
|
||||||
|
// unsubscribe. The loop stops when the last subscriber leaves.
|
||||||
|
export function subscribeRotorHeading(fn: (h: RotorHeading) => void): () => void {
|
||||||
|
subs.add(fn);
|
||||||
|
// Hand over what is already known, at once. An Alpha SPID poll is an open,
|
||||||
|
// a read at 600 baud and a close, so even an immediate one takes a moment —
|
||||||
|
// the cached heading is what makes the compass appear with the panel rather
|
||||||
|
// than after it. In a microtask, so a subscriber is never called back before
|
||||||
|
// subscribeRotorHeading has returned to it.
|
||||||
|
if (last) { const h = last; queueMicrotask(() => { if (subs.has(fn)) fn(h); }); }
|
||||||
|
if (timer === undefined && !inFlight) void tick();
|
||||||
|
return () => {
|
||||||
|
subs.delete(fn);
|
||||||
|
if (subs.size === 0 && timer !== undefined) { window.clearTimeout(timer); timer = undefined; }
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// pokeRotorHeading polls at once and switches to the fast rate — call it after
|
||||||
|
// commanding a move, so the needle starts sweeping on the click rather than on
|
||||||
|
// whatever was left of a three-second tick.
|
||||||
|
export function pokeRotorHeading(): void {
|
||||||
|
lastMoveAt = Date.now();
|
||||||
|
if (timer !== undefined) window.clearTimeout(timer);
|
||||||
|
timer = undefined;
|
||||||
|
void tick();
|
||||||
|
}
|
||||||
@@ -16,9 +16,16 @@ export type RowColorSettings = {
|
|||||||
style?: 'bar' | 'tint' | 'both';
|
style?: 'bar' | 'tint' | 'both';
|
||||||
intensity?: number;
|
intensity?: number;
|
||||||
bandmap_lotw?: boolean;
|
bandmap_lotw?: boolean;
|
||||||
|
recent_zebra?: string; // '' = alternate (default), 'off' = every row alike
|
||||||
|
recent_zebra_color?: string; // '' = follow the theme
|
||||||
rules: RowColorRule[];
|
rules: RowColorRule[];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// The banding the grid theme applies on its own. Repeated here because turning
|
||||||
|
// the option OFF means painting every row explicitly — the theme would
|
||||||
|
// otherwise keep striping underneath whatever we do per row.
|
||||||
|
const ZEBRA_DEFAULT = 'color-mix(in srgb, var(--muted) 40%, var(--card))';
|
||||||
|
|
||||||
export const CHANNELS = ['qsl', 'lotw', 'eqsl', 'qrz'] as const;
|
export const CHANNELS = ['qsl', 'lotw', 'eqsl', 'qrz'] as const;
|
||||||
|
|
||||||
// The two QSO fields behind each channel. QRZ.com and Club Log call theirs an
|
// The two QSO fields behind each channel. QRZ.com and Club Log call theirs an
|
||||||
@@ -76,21 +83,43 @@ export function matchRowRule(q: any, cfg: RowColorSettings | null): RowColorRule
|
|||||||
// A log where nearly every contact has SOME QSL state ends up with every row
|
// A log where nearly every contact has SOME QSL state ends up with every row
|
||||||
// painted, and colour that is always present stops being information. The
|
// painted, and colour that is always present stops being information. The
|
||||||
// default is a stripe down the left edge; a tint is offered at a chosen strength.
|
// default is a stripe down the left edge; a tint is offered at a chosen strength.
|
||||||
export function rowStyleFor(q: any, cfg: RowColorSettings | null): Record<string, string> | undefined {
|
// rowIndex is optional: only the Recent QSOs grid bands its rows, and the other
|
||||||
if (!cfg?.enabled) return undefined;
|
// callers have nothing to say about odd and even.
|
||||||
|
export function rowStyleFor(q: any, cfg: RowColorSettings | null, rowIndex?: number): Record<string, string> | undefined {
|
||||||
|
const out: Record<string, string> = {};
|
||||||
|
// Banding first, and INDEPENDENT of cfg.enabled: it is legibility, not QSL
|
||||||
|
// status, and an operator who wants plain rows should not have to turn the
|
||||||
|
// status colours off to get them.
|
||||||
|
if (typeof rowIndex === 'number') {
|
||||||
|
if (cfg?.recent_zebra === 'off') {
|
||||||
|
out.backgroundColor = 'var(--card)';
|
||||||
|
} else if (rowIndex % 2 === 1) {
|
||||||
|
out.backgroundColor = cfg?.recent_zebra_color || ZEBRA_DEFAULT;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
const empty = () => (Object.keys(out).length ? out : undefined);
|
||||||
|
if (!cfg?.enabled) return empty();
|
||||||
const rule = matchRowRule(q, cfg);
|
const rule = matchRowRule(q, cfg);
|
||||||
if (!rule?.color) return undefined;
|
if (!rule?.color) return empty();
|
||||||
|
|
||||||
const style = cfg.style ?? 'bar';
|
const style = cfg.style ?? 'bar';
|
||||||
const pct = Math.max(5, Math.min(45, cfg.intensity ?? 12));
|
const pct = Math.max(5, Math.min(45, cfg.intensity ?? 12));
|
||||||
const out: Record<string, string> = {};
|
|
||||||
if (style === 'tint' || style === 'both') {
|
if (style === 'tint' || style === 'both') {
|
||||||
|
// Overrides the banding on purpose: the QSL colour is information, the
|
||||||
|
// banding is only there to help the eye keep its line.
|
||||||
out.backgroundColor = `color-mix(in srgb, ${rule.color} ${pct}%, transparent)`;
|
out.backgroundColor = `color-mix(in srgb, ${rule.color} ${pct}%, transparent)`;
|
||||||
}
|
}
|
||||||
if (style === 'bar' || style === 'both') {
|
if (style === 'bar' || style === 'both') {
|
||||||
// inset shadow rather than a border: a border would shift the cells three
|
// A background gradient, not a border and not a shadow.
|
||||||
// pixels on coloured rows only, and the columns would stop lining up.
|
//
|
||||||
out.boxShadow = `inset 3px 0 0 ${rule.color}`;
|
// A border would shift the cells three pixels on coloured rows only, and
|
||||||
|
// the columns would stop lining up. An inset box-shadow was the first fix
|
||||||
|
// for that and drew the stripe correctly — but on the grid's transformed,
|
||||||
|
// absolutely-positioned rows it also bled a hairline of the same colour
|
||||||
|
// along the row edges, so every coloured row got a horizontal rule it was
|
||||||
|
// never meant to have. A gradient paints inside the box and nothing else:
|
||||||
|
// three pixels of colour, then transparent, and no edge to bleed from.
|
||||||
|
out.backgroundImage = `linear-gradient(to right, ${rule.color} 0, ${rule.color} 3px, transparent 3px)`;
|
||||||
}
|
}
|
||||||
return out;
|
return out;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,6 +17,8 @@ const PORTABLE_KEYS = [
|
|||||||
'opslog.autofocusWB', // auto-focus Worked-before
|
'opslog.autofocusWB', // auto-focus Worked-before
|
||||||
'hamlog.filterPresets', // Filter Builder saved presets
|
'hamlog.filterPresets', // Filter Builder saved presets
|
||||||
'opslog.showRotor', // rotor compass shown next to the keyers
|
'opslog.showRotor', // rotor compass shown next to the keyers
|
||||||
|
'opslog.rotorCompact', // rotor widget: dial + SP/LP only, no quick-turn buttons or Stop
|
||||||
|
'opslog.decodesGridMap',// FT decodes tab: grid-square map shown beside the table
|
||||||
'opslog.showChaseNew', // Chase New panel shown next to the keyers
|
'opslog.showChaseNew', // Chase New panel shown next to the keyers
|
||||||
'opslog.showAmpWidget', // amplifier widget shown next to the keyers
|
'opslog.showAmpWidget', // amplifier widget shown next to the keyers
|
||||||
'opslog.ampSel.widget', // which amplifier that widget shows ("all" or an amp id)
|
'opslog.ampSel.widget', // which amplifier that widget shows ("all" or an amp id)
|
||||||
@@ -39,11 +41,19 @@ const PORTABLE_KEYS = [
|
|||||||
'opslog.clusterLockBand', 'opslog.clusterLockMode', 'opslog.clusterStatusFilter',
|
'opslog.clusterLockBand', 'opslog.clusterLockMode', 'opslog.clusterStatusFilter',
|
||||||
'opslog.clusterModeFilter', 'opslog.clusterSearch', 'opslog.clusterHideWorked',
|
'opslog.clusterModeFilter', 'opslog.clusterSearch', 'opslog.clusterHideWorked',
|
||||||
'opslog.activeTab', // last selected tab
|
'opslog.activeTab', // last selected tab
|
||||||
'opslog.mainSplit', // Main tab: width share of the left pane (percent)
|
'opslog.mainSplit', // Main tab: width share of the left pane (percent) — legacy, read once to seed mainShares
|
||||||
|
'opslog.mainShares', // Main tab: column shares per column count, as {2:[..],3:[..],4:[..]}
|
||||||
|
'opslog.mainQuad', // Main tab: the 2x2 cross, as {col,row} percentages
|
||||||
'opslog.clusterMuteWorked', // cluster/band map: no colour or badge on worked spots
|
'opslog.clusterMuteWorked', // cluster/band map: no colour or badge on worked spots
|
||||||
'opslog.clusterSlotHighlight', // cluster/band map: colour calls not worked on this band+mode
|
'opslog.clusterSlotHighlight', // cluster/band map: colour calls not worked on this band+mode
|
||||||
'opslog.bandMapWidth', // docked band map: column width (px)
|
'opslog.bandMapWidth', // docked band map: column width (px)
|
||||||
'opslog.bandMapTabWidth', // Band map tab: shared card width (px)
|
'opslog.bandMapTabWidth', // Band map tab: shared card width (px)
|
||||||
|
'opslog.bandMapZoom', // band map zoom (px/kHz step) remembered per band, as one {band: index} map
|
||||||
|
'opslog.decodeColWidths', // FT decodes table: per-column widths (px), as one {col: px} map
|
||||||
|
'opslog.clusterMacros', // cluster console: the twelve named command buttons
|
||||||
|
'opslog.clusterHideSpots', // cluster console: hide the DX spot flood so replies are readable
|
||||||
|
'opslog.clusterConsoleFollow', // cluster console: keep the view pinned to the newest line
|
||||||
|
'opslog.gridMapColorConfirmed', 'opslog.gridMapColorWorked', // grid map: chosen fills (empty = follow the theme)
|
||||||
// NOTE: 'hamlog.awardColsShown' and the grid column layouts are NOT listed here.
|
// NOTE: 'hamlog.awardColsShown' and the grid column layouts are NOT listed here.
|
||||||
// They are handled by lib/gridPrefs, which scopes the localStorage cache PER
|
// They are handled by lib/gridPrefs, which scopes the localStorage cache PER
|
||||||
// PROFILE and mirrors to the DB (already per-profile) itself — mirroring them
|
// PROFILE and mirrors to the DB (already per-profile) itself — mirroring them
|
||||||
|
|||||||
@@ -85,6 +85,12 @@
|
|||||||
--mx-dx-conf: #3730a3; /* entity confirmed*/
|
--mx-dx-conf: #3730a3; /* entity confirmed*/
|
||||||
--mx-dx-work: #a5b4fc; /* entity worked */
|
--mx-dx-work: #a5b4fc; /* entity worked */
|
||||||
--mx-none: #e7e5e4; /* never worked */
|
--mx-none: #e7e5e4; /* never worked */
|
||||||
|
/* Ring on the cell the operator is entering. Declared ONCE, on :root, and
|
||||||
|
deliberately not repeated per theme: it follows --warning, which every theme
|
||||||
|
already tunes to its own background. The token exists so the matrix ring can
|
||||||
|
be recoloured on its own without dragging every other warning in the app
|
||||||
|
with it (Appearance → matrix colours). */
|
||||||
|
--mx-cur: var(--warning);
|
||||||
|
|
||||||
--scrollbar-thumb: #b8a880;
|
--scrollbar-thumb: #b8a880;
|
||||||
--scrollbar-thumb-hover: #968455;
|
--scrollbar-thumb-hover: #968455;
|
||||||
@@ -974,6 +980,7 @@
|
|||||||
--color-mx-dx-conf: var(--mx-dx-conf);
|
--color-mx-dx-conf: var(--mx-dx-conf);
|
||||||
--color-mx-dx-work: var(--mx-dx-work);
|
--color-mx-dx-work: var(--mx-dx-work);
|
||||||
--color-mx-none: var(--mx-none);
|
--color-mx-none: var(--mx-none);
|
||||||
|
--color-mx-cur: var(--mx-cur);
|
||||||
|
|
||||||
--radius: 0.5rem;
|
--radius: 0.5rem;
|
||||||
|
|
||||||
@@ -984,6 +991,18 @@
|
|||||||
@layer base {
|
@layer base {
|
||||||
* { @apply border-border; }
|
* { @apply border-border; }
|
||||||
html, body, #root { height: 100%; }
|
html, body, #root { height: 100%; }
|
||||||
|
/* No rubber-band, and no swipe-to-navigate.
|
||||||
|
|
||||||
|
Chromium lets a scroll that has reached the end pull the content a few
|
||||||
|
pixels and spring back, and a two-finger horizontal swipe means "go back a
|
||||||
|
page". Both are browser behaviours that have no meaning in a logbook: the
|
||||||
|
first makes a table wobble at the bottom of a list, and the second can
|
||||||
|
navigate the WebView away from the app entirely — a blank window and a
|
||||||
|
restart. Neither shows up with a mouse, which is why they went unnoticed;
|
||||||
|
they arrive with a precision touchpad or a touchscreen.
|
||||||
|
|
||||||
|
A no-op wherever the effects don't occur. */
|
||||||
|
html, body { overscroll-behavior: none; }
|
||||||
/* Root rem base. Tailwind sizing (text/heights/padding/gaps) is in rem, so
|
/* Root rem base. Tailwind sizing (text/heights/padding/gaps) is in rem, so
|
||||||
this is the single global density knob — shrinks the whole UI uniformly
|
this is the single global density knob — shrinks the whole UI uniformly
|
||||||
while Leaflet maps (px-based) stay correct. Default browser base is 16px. */
|
while Leaflet maps (px-based) stay correct. Default browser base is 16px. */
|
||||||
@@ -1048,3 +1067,15 @@
|
|||||||
filter: invert(1) brightness(1.8);
|
filter: invert(1) brightness(1.8);
|
||||||
opacity: 0.9;
|
opacity: 0.9;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Every scrollable pane keeps its overscroll to itself.
|
||||||
|
|
||||||
|
"contain" (not "none") on the inside: the pane still scrolls normally, it
|
||||||
|
simply stops passing the leftover motion up to its parent — which is how
|
||||||
|
scrolling a grid to its end used to tug the panel behind it. */
|
||||||
|
.overflow-auto,
|
||||||
|
.overflow-y-auto,
|
||||||
|
.overflow-x-auto,
|
||||||
|
.overflow-scroll {
|
||||||
|
overscroll-behavior: contain;
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
// Single source of truth for the app version shown in the UI (header + About).
|
// Single source of truth for the app version shown in the UI (header + About).
|
||||||
// Bump this on a release (the release script updates it alongside telemetry.go).
|
// Bump this on a release (the release script updates it alongside telemetry.go).
|
||||||
export const APP_VERSION = '0.25.3';
|
export const APP_VERSION = '0.26.6';
|
||||||
|
|
||||||
// Author / credits, shown in Help -> About.
|
// Author / credits, shown in Help -> About.
|
||||||
export const APP_AUTHOR = 'F4BPO';
|
export const APP_AUTHOR = 'F4BPO';
|
||||||
|
|||||||
Vendored
+75
-2
@@ -15,6 +15,7 @@ import {cluster} from '../models';
|
|||||||
import {extsvc} from '../models';
|
import {extsvc} from '../models';
|
||||||
import {powergenius} from '../models';
|
import {powergenius} from '../models';
|
||||||
import {pskr} from '../models';
|
import {pskr} from '../models';
|
||||||
|
import {psu} from '../models';
|
||||||
import {spe} from '../models';
|
import {spe} from '../models';
|
||||||
import {solar} from '../models';
|
import {solar} from '../models';
|
||||||
import {tunergenius} from '../models';
|
import {tunergenius} from '../models';
|
||||||
@@ -52,6 +53,8 @@ export function AmpPower(arg1:string,arg2:boolean):Promise<void>;
|
|||||||
|
|
||||||
export function AmpPowerLevel(arg1:string,arg2:string):Promise<void>;
|
export function AmpPowerLevel(arg1:string,arg2:string):Promise<void>;
|
||||||
|
|
||||||
|
export function AnswerDecode(arg1:string,arg2:number,arg3:number,arg4:number,arg5:number,arg6:string,arg7:string,arg8:boolean):Promise<void>;
|
||||||
|
|
||||||
export function AntGeniusActivate(arg1:number,arg2:number):Promise<void>;
|
export function AntGeniusActivate(arg1:number,arg2:number):Promise<void>;
|
||||||
|
|
||||||
export function AntGeniusDeselect(arg1:number):Promise<void>;
|
export function AntGeniusDeselect(arg1:number):Promise<void>;
|
||||||
@@ -86,10 +89,14 @@ export function AwardMissingQSOs(arg1:string):Promise<Array<qso.QSO>>;
|
|||||||
|
|
||||||
export function AwardRefsForQSOs(arg1:Array<number>):Promise<Record<number, Record<string, string>>>;
|
export function AwardRefsForQSOs(arg1:Array<number>):Promise<Record<number, Record<string, string>>>;
|
||||||
|
|
||||||
|
export function AwardRefsNew(arg1:Array<string>):Promise<main.AwardRefNewResult>;
|
||||||
|
|
||||||
export function AwardsFolder():Promise<string>;
|
export function AwardsFolder():Promise<string>;
|
||||||
|
|
||||||
export function BackfillDistances():Promise<main.BackfillDistancesResult>;
|
export function BackfillDistances():Promise<main.BackfillDistancesResult>;
|
||||||
|
|
||||||
|
export function BackfillRDA(arg1:boolean):Promise<main.BackfillRDAResult>;
|
||||||
|
|
||||||
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 BandSlotQSOs(arg1:string,arg2:number,arg3:string,arg4:string):Promise<Array<qso.QSO>>;
|
||||||
@@ -112,8 +119,12 @@ export function CheckForUpdate():Promise<main.UpdateInfo>;
|
|||||||
|
|
||||||
export function ClearLookupCache():Promise<void>;
|
export function ClearLookupCache():Promise<void>;
|
||||||
|
|
||||||
|
export function CloseAutostartPrograms():Promise<void>;
|
||||||
|
|
||||||
export function ClusterSpotStatuses(arg1:Array<main.SpotQuery>):Promise<Array<main.SpotStatus>>;
|
export function ClusterSpotStatuses(arg1:Array<main.SpotQuery>):Promise<Array<main.SpotStatus>>;
|
||||||
|
|
||||||
|
export function CompactDatabase(arg1:string):Promise<main.CompactResult>;
|
||||||
|
|
||||||
export function ComputeQSOAwardRefs(arg1:qso.QSO):Promise<Array<main.QSOAwardRef>>;
|
export function ComputeQSOAwardRefs(arg1:qso.QSO):Promise<Array<main.QSOAwardRef>>;
|
||||||
|
|
||||||
export function ComputeStationInfo(arg1:string,arg2:string):Promise<main.StationInfoComputed>;
|
export function ComputeStationInfo(arg1:string,arg2:string):Promise<main.StationInfoComputed>;
|
||||||
@@ -196,6 +207,8 @@ export function DownloadULSCounties():Promise<void>;
|
|||||||
|
|
||||||
export function DuplicateProfile(arg1:number,arg2:string):Promise<profile.Profile>;
|
export function DuplicateProfile(arg1:number,arg2:string):Promise<profile.Profile>;
|
||||||
|
|
||||||
|
export function EntryBandChanged(arg1:string):Promise<void>;
|
||||||
|
|
||||||
export function ExplainAward(arg1:string,arg2:string):Promise<Array<main.AwardExplain>>;
|
export function ExplainAward(arg1:string,arg2:string):Promise<Array<main.AwardExplain>>;
|
||||||
|
|
||||||
export function ExportADIF(arg1:string,arg2:boolean,arg3:Array<string>):Promise<adif.ExportResult>;
|
export function ExportADIF(arg1:string,arg2:boolean,arg3:Array<string>):Promise<adif.ExportResult>;
|
||||||
@@ -352,8 +365,12 @@ export function FlexSetXITFreq(arg1:number):Promise<void>;
|
|||||||
|
|
||||||
export function FlexStopCW():Promise<void>;
|
export function FlexStopCW():Promise<void>;
|
||||||
|
|
||||||
|
export function FlexTXOnBand(arg1:string):Promise<void>;
|
||||||
|
|
||||||
export function FlexTune(arg1:boolean):Promise<void>;
|
export function FlexTune(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function FlexZoomForSpot(arg1:string,arg2:number):Promise<void>;
|
||||||
|
|
||||||
export function GetACOMStatus():Promise<acom.Status>;
|
export function GetACOMStatus():Promise<acom.Status>;
|
||||||
|
|
||||||
export function GetADIFMonitor():Promise<main.ADIFMonitorConfig>;
|
export function GetADIFMonitor():Promise<main.ADIFMonitorConfig>;
|
||||||
@@ -448,8 +465,16 @@ export function GetFlexBandPower():Promise<Record<string, main.FlexBandPower>>;
|
|||||||
|
|
||||||
export function GetFlexState():Promise<cat.FlexTXState>;
|
export function GetFlexState():Promise<cat.FlexTXState>;
|
||||||
|
|
||||||
|
export function GetFlexZoom():Promise<main.FlexZoomSettings>;
|
||||||
|
|
||||||
|
export function GetFolderSync():Promise<main.FolderSyncConfig>;
|
||||||
|
|
||||||
|
export function GetFolderSyncStatus():Promise<main.FolderSyncStatus>;
|
||||||
|
|
||||||
export function GetGridCacheStatus():Promise<main.GridCacheStatus>;
|
export function GetGridCacheStatus():Promise<main.GridCacheStatus>;
|
||||||
|
|
||||||
|
export function GetGridScopeSettings():Promise<main.GridScopeSettings>;
|
||||||
|
|
||||||
export function GetIcomState():Promise<cat.IcomTXState>;
|
export function GetIcomState():Promise<cat.IcomTXState>;
|
||||||
|
|
||||||
export function GetLinkedAmps():Promise<Array<string>>;
|
export function GetLinkedAmps():Promise<Array<string>>;
|
||||||
@@ -470,6 +495,8 @@ export function GetLogbookRevision():Promise<string>;
|
|||||||
|
|
||||||
export function GetLookupSettings():Promise<main.LookupSettings>;
|
export function GetLookupSettings():Promise<main.LookupSettings>;
|
||||||
|
|
||||||
|
export function GetMatrixColors():Promise<main.MatrixColors>;
|
||||||
|
|
||||||
export function GetMySQLSettings():Promise<main.MySQLSettings>;
|
export function GetMySQLSettings():Promise<main.MySQLSettings>;
|
||||||
|
|
||||||
export function GetOfflineStatus():Promise<main.OfflineStatus>;
|
export function GetOfflineStatus():Promise<main.OfflineStatus>;
|
||||||
@@ -486,6 +513,10 @@ export function GetPOTAToken():Promise<string>;
|
|||||||
|
|
||||||
export function GetPSKReporterStatus():Promise<pskr.Status>;
|
export function GetPSKReporterStatus():Promise<pskr.Status>;
|
||||||
|
|
||||||
|
export function GetPSUSettings():Promise<main.PSUSettings>;
|
||||||
|
|
||||||
|
export function GetPSUStatus():Promise<psu.Status>;
|
||||||
|
|
||||||
export function GetPendingQSOs():Promise<Array<qso.QSO>>;
|
export function GetPendingQSOs():Promise<Array<qso.QSO>>;
|
||||||
|
|
||||||
export function GetQSLDefaults():Promise<main.QSLDefaults>;
|
export function GetQSLDefaults():Promise<main.QSLDefaults>;
|
||||||
@@ -500,6 +531,8 @@ export function GetRotatorHeading():Promise<main.RotatorHeading>;
|
|||||||
|
|
||||||
export function GetRotators():Promise<Array<main.RotatorDevice>>;
|
export function GetRotators():Promise<Array<main.RotatorDevice>>;
|
||||||
|
|
||||||
|
export function GetRotorPresets():Promise<Array<main.RotorPreset>>;
|
||||||
|
|
||||||
export function GetRowColors():Promise<main.RowColorSettings>;
|
export function GetRowColors():Promise<main.RowColorSettings>;
|
||||||
|
|
||||||
export function GetSPEStatus():Promise<spe.Status>;
|
export function GetSPEStatus():Promise<spe.Status>;
|
||||||
@@ -514,6 +547,8 @@ export function GetSlotStats():Promise<qso.SlotStats>;
|
|||||||
|
|
||||||
export function GetSolarData():Promise<solar.Data>;
|
export function GetSolarData():Promise<solar.Data>;
|
||||||
|
|
||||||
|
export function GetSpotColors():Promise<main.SpotColors>;
|
||||||
|
|
||||||
export function GetSpotTTLMinutes():Promise<number>;
|
export function GetSpotTTLMinutes():Promise<number>;
|
||||||
|
|
||||||
export function GetStartupStatus():Promise<main.StartupStatus>;
|
export function GetStartupStatus():Promise<main.StartupStatus>;
|
||||||
@@ -552,6 +587,10 @@ export function GetWorkedCallVariants():Promise<boolean>;
|
|||||||
|
|
||||||
export function GetYaesuState():Promise<cat.YaesuTXState>;
|
export function GetYaesuState():Promise<cat.YaesuTXState>;
|
||||||
|
|
||||||
|
export function GridSquares(arg1:string):Promise<Array<qso.GridSquare>>;
|
||||||
|
|
||||||
|
export function HaltDecodeTx(arg1:string,arg2:boolean):Promise<void>;
|
||||||
|
|
||||||
export function HasBuiltinReferences(arg1:string):Promise<boolean>;
|
export function HasBuiltinReferences(arg1:string):Promise<boolean>;
|
||||||
|
|
||||||
export function IcomRefresh():Promise<void>;
|
export function IcomRefresh():Promise<void>;
|
||||||
@@ -696,9 +735,9 @@ export function LogUDPLoggedADIF(arg1:string):Promise<number>;
|
|||||||
|
|
||||||
export function LogUIError(arg1:string,arg2:string,arg3:string):Promise<void>;
|
export function LogUIError(arg1:string,arg2:string,arg3:string):Promise<void>;
|
||||||
|
|
||||||
export function LookupCallsign(arg1:string):Promise<lookup.Result>;
|
export function LookupCallsign(arg1:string,arg2:string):Promise<lookup.Result>;
|
||||||
|
|
||||||
export function LookupCallsignFresh(arg1:string):Promise<lookup.Result>;
|
export function LookupCallsignFresh(arg1:string,arg2:string):Promise<lookup.Result>;
|
||||||
|
|
||||||
export function MotorNudgeKHz(arg1:number):Promise<void>;
|
export function MotorNudgeKHz(arg1:number):Promise<void>;
|
||||||
|
|
||||||
@@ -768,6 +807,8 @@ export function PickAudioFolder():Promise<string>;
|
|||||||
|
|
||||||
export function PickBackupFolder():Promise<string>;
|
export function PickBackupFolder():Promise<string>;
|
||||||
|
|
||||||
|
export function PickFolderSyncFolder():Promise<string>;
|
||||||
|
|
||||||
export function PickOpenDatabase():Promise<string>;
|
export function PickOpenDatabase():Promise<string>;
|
||||||
|
|
||||||
export function PickSaveDatabase():Promise<string>;
|
export function PickSaveDatabase():Promise<string>;
|
||||||
@@ -836,8 +877,12 @@ export function QSOAudioStop():Promise<boolean>;
|
|||||||
|
|
||||||
export function QuitApp():Promise<void>;
|
export function QuitApp():Promise<void>;
|
||||||
|
|
||||||
|
export function RDADatabaseCount():Promise<number>;
|
||||||
|
|
||||||
export function RecomputeAllAwardRefs():Promise<number>;
|
export function RecomputeAllAwardRefs():Promise<number>;
|
||||||
|
|
||||||
|
export function RecomputeAwardRefsForCode(arg1:string):Promise<number>;
|
||||||
|
|
||||||
export function RefreshCtyDat():Promise<main.CtyDatInfo>;
|
export function RefreshCtyDat():Promise<main.CtyDatInfo>;
|
||||||
|
|
||||||
export function RefreshSolar():Promise<void>;
|
export function RefreshSolar():Promise<void>;
|
||||||
@@ -848,6 +893,8 @@ export function ReloadUDPIntegrations():Promise<Array<string>>;
|
|||||||
|
|
||||||
export function RemovePassphrase(arg1:string):Promise<void>;
|
export function RemovePassphrase(arg1:string):Promise<void>;
|
||||||
|
|
||||||
|
export function RenameAwardReference(arg1:string,arg2:string,arg3:string):Promise<void>;
|
||||||
|
|
||||||
export function RenameDatabase(arg1:string):Promise<void>;
|
export function RenameDatabase(arg1:string):Promise<void>;
|
||||||
|
|
||||||
export function RenameLogbook(arg1:string):Promise<void>;
|
export function RenameLogbook(arg1:string):Promise<void>;
|
||||||
@@ -866,6 +913,10 @@ export function ResetAwardDefs():Promise<Array<award.Def>>;
|
|||||||
|
|
||||||
export function ResetDatabaseToDefault():Promise<void>;
|
export function ResetDatabaseToDefault():Promise<void>;
|
||||||
|
|
||||||
|
export function ResetRotorPresets():Promise<Array<main.RotorPreset>>;
|
||||||
|
|
||||||
|
export function ResetSpotColors():Promise<main.SpotColors>;
|
||||||
|
|
||||||
export function RestartApp():Promise<void>;
|
export function RestartApp():Promise<void>;
|
||||||
|
|
||||||
export function RestartQSORecorder():Promise<void>;
|
export function RestartQSORecorder():Promise<void>;
|
||||||
@@ -928,10 +979,18 @@ export function SaveFlexBandAntennas(arg1:Record<string, main.FlexBandAnt>):Prom
|
|||||||
|
|
||||||
export function SaveFlexBandPower(arg1:Record<string, main.FlexBandPower>):Promise<void>;
|
export function SaveFlexBandPower(arg1:Record<string, main.FlexBandPower>):Promise<void>;
|
||||||
|
|
||||||
|
export function SaveFlexZoom(arg1:main.FlexZoomSettings):Promise<void>;
|
||||||
|
|
||||||
|
export function SaveFolderSync(arg1:main.FolderSyncConfig):Promise<void>;
|
||||||
|
|
||||||
|
export function SaveGridScopeSettings(arg1:main.GridScopeSettings):Promise<void>;
|
||||||
|
|
||||||
export function SaveListsSettings(arg1:main.ListsSettings):Promise<void>;
|
export function SaveListsSettings(arg1:main.ListsSettings):Promise<void>;
|
||||||
|
|
||||||
export function SaveLookupSettings(arg1:main.LookupSettings):Promise<void>;
|
export function SaveLookupSettings(arg1:main.LookupSettings):Promise<void>;
|
||||||
|
|
||||||
|
export function SaveMatrixColors(arg1:main.MatrixColors):Promise<void>;
|
||||||
|
|
||||||
export function SaveMySQLSettings(arg1:main.MySQLSettings):Promise<void>;
|
export function SaveMySQLSettings(arg1:main.MySQLSettings):Promise<void>;
|
||||||
|
|
||||||
export function SaveOperatingAntenna(arg1:operating.Antenna):Promise<operating.Antenna>;
|
export function SaveOperatingAntenna(arg1:operating.Antenna):Promise<operating.Antenna>;
|
||||||
@@ -942,6 +1001,8 @@ export function SavePGXLSettings(arg1:main.PGXLSettings):Promise<void>;
|
|||||||
|
|
||||||
export function SavePOTAToken(arg1:string):Promise<void>;
|
export function SavePOTAToken(arg1:string):Promise<void>;
|
||||||
|
|
||||||
|
export function SavePSUSettings(arg1:main.PSUSettings):Promise<void>;
|
||||||
|
|
||||||
export function SaveProfile(arg1:profile.Profile):Promise<profile.Profile>;
|
export function SaveProfile(arg1:profile.Profile):Promise<profile.Profile>;
|
||||||
|
|
||||||
export function SaveQSLDefaults(arg1:main.QSLDefaults):Promise<void>;
|
export function SaveQSLDefaults(arg1:main.QSLDefaults):Promise<void>;
|
||||||
@@ -950,10 +1011,14 @@ export function SaveRelayAuto(arg1:main.RelayAutoConfig):Promise<void>;
|
|||||||
|
|
||||||
export function SaveRotators(arg1:Array<main.RotatorDevice>):Promise<void>;
|
export function SaveRotators(arg1:Array<main.RotatorDevice>):Promise<void>;
|
||||||
|
|
||||||
|
export function SaveRotorPresets(arg1:Array<main.RotorPreset>):Promise<void>;
|
||||||
|
|
||||||
export function SaveRowColors(arg1:main.RowColorSettings):Promise<void>;
|
export function SaveRowColors(arg1:main.RowColorSettings):Promise<void>;
|
||||||
|
|
||||||
export function SaveSelfSpotSettings(arg1:main.SelfSpotSettings):Promise<void>;
|
export function SaveSelfSpotSettings(arg1:main.SelfSpotSettings):Promise<void>;
|
||||||
|
|
||||||
|
export function SaveSpotColors(arg1:main.SpotColors):Promise<void>;
|
||||||
|
|
||||||
export function SaveStationDevices(arg1:Array<main.StationDevice>):Promise<void>;
|
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>;
|
||||||
@@ -980,6 +1045,8 @@ export function SendClusterCommand(arg1:string):Promise<void>;
|
|||||||
|
|
||||||
export function SendClusterSpot(arg1:string,arg2:number,arg3:string):Promise<void>;
|
export function SendClusterSpot(arg1:string,arg2:number,arg3:string):Promise<void>;
|
||||||
|
|
||||||
|
export function SendDecodeFreeText(arg1:string,arg2:string,arg3:boolean):Promise<void>;
|
||||||
|
|
||||||
export function SendEQSL(arg1:number,arg2:number,arg3:string):Promise<void>;
|
export function SendEQSL(arg1:number,arg2:number,arg3:string):Promise<void>;
|
||||||
|
|
||||||
export function SendLogToDeveloper():Promise<void>;
|
export function SendLogToDeveloper():Promise<void>;
|
||||||
@@ -1022,6 +1089,8 @@ export function SetMotorFollow(arg1:boolean,arg2:number,arg3:string):Promise<voi
|
|||||||
|
|
||||||
export function SetOpsLogQSLReceived(arg1:number,arg2:boolean):Promise<void>;
|
export function SetOpsLogQSLReceived(arg1:number,arg2:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function SetPSUOutput(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
export function SetPassphrase(arg1:string):Promise<void>;
|
export function SetPassphrase(arg1:string):Promise<void>;
|
||||||
|
|
||||||
export function SetScpEnabled(arg1:boolean):Promise<void>;
|
export function SetScpEnabled(arg1:boolean):Promise<void>;
|
||||||
@@ -1084,6 +1153,8 @@ export function StopCWDecoder():Promise<void>;
|
|||||||
|
|
||||||
export function SwitchCATRig(arg1:number):Promise<void>;
|
export function SwitchCATRig(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function SyncFolderNow():Promise<number>;
|
||||||
|
|
||||||
export function SyncPOTAHunterLog(arg1:boolean,arg2:boolean):Promise<main.POTASyncResult>;
|
export function SyncPOTAHunterLog(arg1:boolean,arg2:boolean):Promise<main.POTASyncResult>;
|
||||||
|
|
||||||
export function TailLogFile(arg1:number):Promise<string>;
|
export function TailLogFile(arg1:number):Promise<string>;
|
||||||
@@ -1138,6 +1209,8 @@ export function UpdateAwardReferenceList(arg1:string):Promise<main.AwardRefMeta>
|
|||||||
|
|
||||||
export function UpdateQSO(arg1:qso.QSO):Promise<void>;
|
export function UpdateQSO(arg1:qso.QSO):Promise<void>;
|
||||||
|
|
||||||
|
export function UpdateQSOsCountyFromULS(arg1:Array<number>):Promise<number>;
|
||||||
|
|
||||||
export function UpdateQSOsFromClublog(arg1:Array<number>):Promise<number>;
|
export function UpdateQSOsFromClublog(arg1:Array<number>):Promise<number>;
|
||||||
|
|
||||||
export function UpdateQSOsFromCty(arg1:Array<number>):Promise<number>;
|
export function UpdateQSOsFromCty(arg1:Array<number>):Promise<number>;
|
||||||
|
|||||||
@@ -46,6 +46,10 @@ export function AmpPowerLevel(arg1, arg2) {
|
|||||||
return window['go']['main']['App']['AmpPowerLevel'](arg1, arg2);
|
return window['go']['main']['App']['AmpPowerLevel'](arg1, arg2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function AnswerDecode(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8) {
|
||||||
|
return window['go']['main']['App']['AnswerDecode'](arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
|
||||||
|
}
|
||||||
|
|
||||||
export function AntGeniusActivate(arg1, arg2) {
|
export function AntGeniusActivate(arg1, arg2) {
|
||||||
return window['go']['main']['App']['AntGeniusActivate'](arg1, arg2);
|
return window['go']['main']['App']['AntGeniusActivate'](arg1, arg2);
|
||||||
}
|
}
|
||||||
@@ -114,6 +118,10 @@ export function AwardRefsForQSOs(arg1) {
|
|||||||
return window['go']['main']['App']['AwardRefsForQSOs'](arg1);
|
return window['go']['main']['App']['AwardRefsForQSOs'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function AwardRefsNew(arg1) {
|
||||||
|
return window['go']['main']['App']['AwardRefsNew'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function AwardsFolder() {
|
export function AwardsFolder() {
|
||||||
return window['go']['main']['App']['AwardsFolder']();
|
return window['go']['main']['App']['AwardsFolder']();
|
||||||
}
|
}
|
||||||
@@ -122,6 +130,10 @@ export function BackfillDistances() {
|
|||||||
return window['go']['main']['App']['BackfillDistances']();
|
return window['go']['main']['App']['BackfillDistances']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function BackfillRDA(arg1) {
|
||||||
|
return window['go']['main']['App']['BackfillRDA'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function BackfillUSCounties() {
|
export function BackfillUSCounties() {
|
||||||
return window['go']['main']['App']['BackfillUSCounties']();
|
return window['go']['main']['App']['BackfillUSCounties']();
|
||||||
}
|
}
|
||||||
@@ -166,10 +178,18 @@ export function ClearLookupCache() {
|
|||||||
return window['go']['main']['App']['ClearLookupCache']();
|
return window['go']['main']['App']['ClearLookupCache']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function CloseAutostartPrograms() {
|
||||||
|
return window['go']['main']['App']['CloseAutostartPrograms']();
|
||||||
|
}
|
||||||
|
|
||||||
export function ClusterSpotStatuses(arg1) {
|
export function ClusterSpotStatuses(arg1) {
|
||||||
return window['go']['main']['App']['ClusterSpotStatuses'](arg1);
|
return window['go']['main']['App']['ClusterSpotStatuses'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function CompactDatabase(arg1) {
|
||||||
|
return window['go']['main']['App']['CompactDatabase'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function ComputeQSOAwardRefs(arg1) {
|
export function ComputeQSOAwardRefs(arg1) {
|
||||||
return window['go']['main']['App']['ComputeQSOAwardRefs'](arg1);
|
return window['go']['main']['App']['ComputeQSOAwardRefs'](arg1);
|
||||||
}
|
}
|
||||||
@@ -334,6 +354,10 @@ export function DuplicateProfile(arg1, arg2) {
|
|||||||
return window['go']['main']['App']['DuplicateProfile'](arg1, arg2);
|
return window['go']['main']['App']['DuplicateProfile'](arg1, arg2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function EntryBandChanged(arg1) {
|
||||||
|
return window['go']['main']['App']['EntryBandChanged'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function ExplainAward(arg1, arg2) {
|
export function ExplainAward(arg1, arg2) {
|
||||||
return window['go']['main']['App']['ExplainAward'](arg1, arg2);
|
return window['go']['main']['App']['ExplainAward'](arg1, arg2);
|
||||||
}
|
}
|
||||||
@@ -646,10 +670,18 @@ export function FlexStopCW() {
|
|||||||
return window['go']['main']['App']['FlexStopCW']();
|
return window['go']['main']['App']['FlexStopCW']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function FlexTXOnBand(arg1) {
|
||||||
|
return window['go']['main']['App']['FlexTXOnBand'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function FlexTune(arg1) {
|
export function FlexTune(arg1) {
|
||||||
return window['go']['main']['App']['FlexTune'](arg1);
|
return window['go']['main']['App']['FlexTune'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function FlexZoomForSpot(arg1, arg2) {
|
||||||
|
return window['go']['main']['App']['FlexZoomForSpot'](arg1, arg2);
|
||||||
|
}
|
||||||
|
|
||||||
export function GetACOMStatus() {
|
export function GetACOMStatus() {
|
||||||
return window['go']['main']['App']['GetACOMStatus']();
|
return window['go']['main']['App']['GetACOMStatus']();
|
||||||
}
|
}
|
||||||
@@ -838,10 +870,26 @@ export function GetFlexState() {
|
|||||||
return window['go']['main']['App']['GetFlexState']();
|
return window['go']['main']['App']['GetFlexState']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function GetFlexZoom() {
|
||||||
|
return window['go']['main']['App']['GetFlexZoom']();
|
||||||
|
}
|
||||||
|
|
||||||
|
export function GetFolderSync() {
|
||||||
|
return window['go']['main']['App']['GetFolderSync']();
|
||||||
|
}
|
||||||
|
|
||||||
|
export function GetFolderSyncStatus() {
|
||||||
|
return window['go']['main']['App']['GetFolderSyncStatus']();
|
||||||
|
}
|
||||||
|
|
||||||
export function GetGridCacheStatus() {
|
export function GetGridCacheStatus() {
|
||||||
return window['go']['main']['App']['GetGridCacheStatus']();
|
return window['go']['main']['App']['GetGridCacheStatus']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function GetGridScopeSettings() {
|
||||||
|
return window['go']['main']['App']['GetGridScopeSettings']();
|
||||||
|
}
|
||||||
|
|
||||||
export function GetIcomState() {
|
export function GetIcomState() {
|
||||||
return window['go']['main']['App']['GetIcomState']();
|
return window['go']['main']['App']['GetIcomState']();
|
||||||
}
|
}
|
||||||
@@ -882,6 +930,10 @@ export function GetLookupSettings() {
|
|||||||
return window['go']['main']['App']['GetLookupSettings']();
|
return window['go']['main']['App']['GetLookupSettings']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function GetMatrixColors() {
|
||||||
|
return window['go']['main']['App']['GetMatrixColors']();
|
||||||
|
}
|
||||||
|
|
||||||
export function GetMySQLSettings() {
|
export function GetMySQLSettings() {
|
||||||
return window['go']['main']['App']['GetMySQLSettings']();
|
return window['go']['main']['App']['GetMySQLSettings']();
|
||||||
}
|
}
|
||||||
@@ -914,6 +966,14 @@ export function GetPSKReporterStatus() {
|
|||||||
return window['go']['main']['App']['GetPSKReporterStatus']();
|
return window['go']['main']['App']['GetPSKReporterStatus']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function GetPSUSettings() {
|
||||||
|
return window['go']['main']['App']['GetPSUSettings']();
|
||||||
|
}
|
||||||
|
|
||||||
|
export function GetPSUStatus() {
|
||||||
|
return window['go']['main']['App']['GetPSUStatus']();
|
||||||
|
}
|
||||||
|
|
||||||
export function GetPendingQSOs() {
|
export function GetPendingQSOs() {
|
||||||
return window['go']['main']['App']['GetPendingQSOs']();
|
return window['go']['main']['App']['GetPendingQSOs']();
|
||||||
}
|
}
|
||||||
@@ -942,6 +1002,10 @@ export function GetRotators() {
|
|||||||
return window['go']['main']['App']['GetRotators']();
|
return window['go']['main']['App']['GetRotators']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function GetRotorPresets() {
|
||||||
|
return window['go']['main']['App']['GetRotorPresets']();
|
||||||
|
}
|
||||||
|
|
||||||
export function GetRowColors() {
|
export function GetRowColors() {
|
||||||
return window['go']['main']['App']['GetRowColors']();
|
return window['go']['main']['App']['GetRowColors']();
|
||||||
}
|
}
|
||||||
@@ -970,6 +1034,10 @@ export function GetSolarData() {
|
|||||||
return window['go']['main']['App']['GetSolarData']();
|
return window['go']['main']['App']['GetSolarData']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function GetSpotColors() {
|
||||||
|
return window['go']['main']['App']['GetSpotColors']();
|
||||||
|
}
|
||||||
|
|
||||||
export function GetSpotTTLMinutes() {
|
export function GetSpotTTLMinutes() {
|
||||||
return window['go']['main']['App']['GetSpotTTLMinutes']();
|
return window['go']['main']['App']['GetSpotTTLMinutes']();
|
||||||
}
|
}
|
||||||
@@ -1046,6 +1114,14 @@ export function GetYaesuState() {
|
|||||||
return window['go']['main']['App']['GetYaesuState']();
|
return window['go']['main']['App']['GetYaesuState']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function GridSquares(arg1) {
|
||||||
|
return window['go']['main']['App']['GridSquares'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function HaltDecodeTx(arg1, arg2) {
|
||||||
|
return window['go']['main']['App']['HaltDecodeTx'](arg1, arg2);
|
||||||
|
}
|
||||||
|
|
||||||
export function HasBuiltinReferences(arg1) {
|
export function HasBuiltinReferences(arg1) {
|
||||||
return window['go']['main']['App']['HasBuiltinReferences'](arg1);
|
return window['go']['main']['App']['HasBuiltinReferences'](arg1);
|
||||||
}
|
}
|
||||||
@@ -1334,12 +1410,12 @@ export function LogUIError(arg1, arg2, arg3) {
|
|||||||
return window['go']['main']['App']['LogUIError'](arg1, arg2, arg3);
|
return window['go']['main']['App']['LogUIError'](arg1, arg2, arg3);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function LookupCallsign(arg1) {
|
export function LookupCallsign(arg1, arg2) {
|
||||||
return window['go']['main']['App']['LookupCallsign'](arg1);
|
return window['go']['main']['App']['LookupCallsign'](arg1, arg2);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function LookupCallsignFresh(arg1) {
|
export function LookupCallsignFresh(arg1, arg2) {
|
||||||
return window['go']['main']['App']['LookupCallsignFresh'](arg1);
|
return window['go']['main']['App']['LookupCallsignFresh'](arg1, arg2);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function MotorNudgeKHz(arg1) {
|
export function MotorNudgeKHz(arg1) {
|
||||||
@@ -1478,6 +1554,10 @@ export function PickBackupFolder() {
|
|||||||
return window['go']['main']['App']['PickBackupFolder']();
|
return window['go']['main']['App']['PickBackupFolder']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function PickFolderSyncFolder() {
|
||||||
|
return window['go']['main']['App']['PickFolderSyncFolder']();
|
||||||
|
}
|
||||||
|
|
||||||
export function PickOpenDatabase() {
|
export function PickOpenDatabase() {
|
||||||
return window['go']['main']['App']['PickOpenDatabase']();
|
return window['go']['main']['App']['PickOpenDatabase']();
|
||||||
}
|
}
|
||||||
@@ -1614,10 +1694,18 @@ export function QuitApp() {
|
|||||||
return window['go']['main']['App']['QuitApp']();
|
return window['go']['main']['App']['QuitApp']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function RDADatabaseCount() {
|
||||||
|
return window['go']['main']['App']['RDADatabaseCount']();
|
||||||
|
}
|
||||||
|
|
||||||
export function RecomputeAllAwardRefs() {
|
export function RecomputeAllAwardRefs() {
|
||||||
return window['go']['main']['App']['RecomputeAllAwardRefs']();
|
return window['go']['main']['App']['RecomputeAllAwardRefs']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function RecomputeAwardRefsForCode(arg1) {
|
||||||
|
return window['go']['main']['App']['RecomputeAwardRefsForCode'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function RefreshCtyDat() {
|
export function RefreshCtyDat() {
|
||||||
return window['go']['main']['App']['RefreshCtyDat']();
|
return window['go']['main']['App']['RefreshCtyDat']();
|
||||||
}
|
}
|
||||||
@@ -1638,6 +1726,10 @@ export function RemovePassphrase(arg1) {
|
|||||||
return window['go']['main']['App']['RemovePassphrase'](arg1);
|
return window['go']['main']['App']['RemovePassphrase'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function RenameAwardReference(arg1, arg2, arg3) {
|
||||||
|
return window['go']['main']['App']['RenameAwardReference'](arg1, arg2, arg3);
|
||||||
|
}
|
||||||
|
|
||||||
export function RenameDatabase(arg1) {
|
export function RenameDatabase(arg1) {
|
||||||
return window['go']['main']['App']['RenameDatabase'](arg1);
|
return window['go']['main']['App']['RenameDatabase'](arg1);
|
||||||
}
|
}
|
||||||
@@ -1674,6 +1766,14 @@ export function ResetDatabaseToDefault() {
|
|||||||
return window['go']['main']['App']['ResetDatabaseToDefault']();
|
return window['go']['main']['App']['ResetDatabaseToDefault']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function ResetRotorPresets() {
|
||||||
|
return window['go']['main']['App']['ResetRotorPresets']();
|
||||||
|
}
|
||||||
|
|
||||||
|
export function ResetSpotColors() {
|
||||||
|
return window['go']['main']['App']['ResetSpotColors']();
|
||||||
|
}
|
||||||
|
|
||||||
export function RestartApp() {
|
export function RestartApp() {
|
||||||
return window['go']['main']['App']['RestartApp']();
|
return window['go']['main']['App']['RestartApp']();
|
||||||
}
|
}
|
||||||
@@ -1798,6 +1898,18 @@ export function SaveFlexBandPower(arg1) {
|
|||||||
return window['go']['main']['App']['SaveFlexBandPower'](arg1);
|
return window['go']['main']['App']['SaveFlexBandPower'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function SaveFlexZoom(arg1) {
|
||||||
|
return window['go']['main']['App']['SaveFlexZoom'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SaveFolderSync(arg1) {
|
||||||
|
return window['go']['main']['App']['SaveFolderSync'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SaveGridScopeSettings(arg1) {
|
||||||
|
return window['go']['main']['App']['SaveGridScopeSettings'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function SaveListsSettings(arg1) {
|
export function SaveListsSettings(arg1) {
|
||||||
return window['go']['main']['App']['SaveListsSettings'](arg1);
|
return window['go']['main']['App']['SaveListsSettings'](arg1);
|
||||||
}
|
}
|
||||||
@@ -1806,6 +1918,10 @@ export function SaveLookupSettings(arg1) {
|
|||||||
return window['go']['main']['App']['SaveLookupSettings'](arg1);
|
return window['go']['main']['App']['SaveLookupSettings'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function SaveMatrixColors(arg1) {
|
||||||
|
return window['go']['main']['App']['SaveMatrixColors'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function SaveMySQLSettings(arg1) {
|
export function SaveMySQLSettings(arg1) {
|
||||||
return window['go']['main']['App']['SaveMySQLSettings'](arg1);
|
return window['go']['main']['App']['SaveMySQLSettings'](arg1);
|
||||||
}
|
}
|
||||||
@@ -1826,6 +1942,10 @@ export function SavePOTAToken(arg1) {
|
|||||||
return window['go']['main']['App']['SavePOTAToken'](arg1);
|
return window['go']['main']['App']['SavePOTAToken'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function SavePSUSettings(arg1) {
|
||||||
|
return window['go']['main']['App']['SavePSUSettings'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function SaveProfile(arg1) {
|
export function SaveProfile(arg1) {
|
||||||
return window['go']['main']['App']['SaveProfile'](arg1);
|
return window['go']['main']['App']['SaveProfile'](arg1);
|
||||||
}
|
}
|
||||||
@@ -1842,6 +1962,10 @@ export function SaveRotators(arg1) {
|
|||||||
return window['go']['main']['App']['SaveRotators'](arg1);
|
return window['go']['main']['App']['SaveRotators'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function SaveRotorPresets(arg1) {
|
||||||
|
return window['go']['main']['App']['SaveRotorPresets'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function SaveRowColors(arg1) {
|
export function SaveRowColors(arg1) {
|
||||||
return window['go']['main']['App']['SaveRowColors'](arg1);
|
return window['go']['main']['App']['SaveRowColors'](arg1);
|
||||||
}
|
}
|
||||||
@@ -1850,6 +1974,10 @@ export function SaveSelfSpotSettings(arg1) {
|
|||||||
return window['go']['main']['App']['SaveSelfSpotSettings'](arg1);
|
return window['go']['main']['App']['SaveSelfSpotSettings'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function SaveSpotColors(arg1) {
|
||||||
|
return window['go']['main']['App']['SaveSpotColors'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function SaveStationDevices(arg1) {
|
export function SaveStationDevices(arg1) {
|
||||||
return window['go']['main']['App']['SaveStationDevices'](arg1);
|
return window['go']['main']['App']['SaveStationDevices'](arg1);
|
||||||
}
|
}
|
||||||
@@ -1902,6 +2030,10 @@ export function SendClusterSpot(arg1, arg2, arg3) {
|
|||||||
return window['go']['main']['App']['SendClusterSpot'](arg1, arg2, arg3);
|
return window['go']['main']['App']['SendClusterSpot'](arg1, arg2, arg3);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function SendDecodeFreeText(arg1, arg2, arg3) {
|
||||||
|
return window['go']['main']['App']['SendDecodeFreeText'](arg1, arg2, arg3);
|
||||||
|
}
|
||||||
|
|
||||||
export function SendEQSL(arg1, arg2, arg3) {
|
export function SendEQSL(arg1, arg2, arg3) {
|
||||||
return window['go']['main']['App']['SendEQSL'](arg1, arg2, arg3);
|
return window['go']['main']['App']['SendEQSL'](arg1, arg2, arg3);
|
||||||
}
|
}
|
||||||
@@ -1986,6 +2118,10 @@ export function SetOpsLogQSLReceived(arg1, arg2) {
|
|||||||
return window['go']['main']['App']['SetOpsLogQSLReceived'](arg1, arg2);
|
return window['go']['main']['App']['SetOpsLogQSLReceived'](arg1, arg2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function SetPSUOutput(arg1) {
|
||||||
|
return window['go']['main']['App']['SetPSUOutput'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function SetPassphrase(arg1) {
|
export function SetPassphrase(arg1) {
|
||||||
return window['go']['main']['App']['SetPassphrase'](arg1);
|
return window['go']['main']['App']['SetPassphrase'](arg1);
|
||||||
}
|
}
|
||||||
@@ -2110,6 +2246,10 @@ export function SwitchCATRig(arg1) {
|
|||||||
return window['go']['main']['App']['SwitchCATRig'](arg1);
|
return window['go']['main']['App']['SwitchCATRig'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function SyncFolderNow() {
|
||||||
|
return window['go']['main']['App']['SyncFolderNow']();
|
||||||
|
}
|
||||||
|
|
||||||
export function SyncPOTAHunterLog(arg1, arg2) {
|
export function SyncPOTAHunterLog(arg1, arg2) {
|
||||||
return window['go']['main']['App']['SyncPOTAHunterLog'](arg1, arg2);
|
return window['go']['main']['App']['SyncPOTAHunterLog'](arg1, arg2);
|
||||||
}
|
}
|
||||||
@@ -2218,6 +2358,10 @@ export function UpdateQSO(arg1) {
|
|||||||
return window['go']['main']['App']['UpdateQSO'](arg1);
|
return window['go']['main']['App']['UpdateQSO'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function UpdateQSOsCountyFromULS(arg1) {
|
||||||
|
return window['go']['main']['App']['UpdateQSOsCountyFromULS'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function UpdateQSOsFromClublog(arg1) {
|
export function UpdateQSOsFromClublog(arg1) {
|
||||||
return window['go']['main']['App']['UpdateQSOsFromClublog'](arg1);
|
return window['go']['main']['App']['UpdateQSOsFromClublog'](arg1);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1444,6 +1444,8 @@ export namespace lookup {
|
|||||||
email?: string;
|
email?: string;
|
||||||
qsl_via?: string;
|
qsl_via?: string;
|
||||||
web?: string;
|
web?: string;
|
||||||
|
iota?: string;
|
||||||
|
rda?: string;
|
||||||
zip?: string;
|
zip?: string;
|
||||||
image_url?: string;
|
image_url?: string;
|
||||||
source: string;
|
source: string;
|
||||||
@@ -1473,6 +1475,8 @@ export namespace lookup {
|
|||||||
this.email = source["email"];
|
this.email = source["email"];
|
||||||
this.qsl_via = source["qsl_via"];
|
this.qsl_via = source["qsl_via"];
|
||||||
this.web = source["web"];
|
this.web = source["web"];
|
||||||
|
this.iota = source["iota"];
|
||||||
|
this.rda = source["rda"];
|
||||||
this.zip = source["zip"];
|
this.zip = source["zip"];
|
||||||
this.image_url = source["image_url"];
|
this.image_url = source["image_url"];
|
||||||
this.source = source["source"];
|
this.source = source["source"];
|
||||||
@@ -1732,6 +1736,7 @@ export namespace main {
|
|||||||
path: string;
|
path: string;
|
||||||
args: string;
|
args: string;
|
||||||
enabled: boolean;
|
enabled: boolean;
|
||||||
|
close_on_exit?: boolean;
|
||||||
|
|
||||||
static createFrom(source: any = {}) {
|
static createFrom(source: any = {}) {
|
||||||
return new AutostartProgram(source);
|
return new AutostartProgram(source);
|
||||||
@@ -1744,6 +1749,7 @@ export namespace main {
|
|||||||
this.path = source["path"];
|
this.path = source["path"];
|
||||||
this.args = source["args"];
|
this.args = source["args"];
|
||||||
this.enabled = source["enabled"];
|
this.enabled = source["enabled"];
|
||||||
|
this.close_on_exit = source["close_on_exit"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
export class AwardExplain {
|
export class AwardExplain {
|
||||||
@@ -1867,6 +1873,20 @@ export namespace main {
|
|||||||
this.can_update = source["can_update"];
|
this.can_update = source["can_update"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
export class AwardRefNewResult {
|
||||||
|
new: Record<string, boolean>;
|
||||||
|
pending: boolean;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new AwardRefNewResult(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.new = source["new"];
|
||||||
|
this.pending = source["pending"];
|
||||||
|
}
|
||||||
|
}
|
||||||
export class AwardStatRow {
|
export class AwardStatRow {
|
||||||
label: string;
|
label: string;
|
||||||
cells: number[];
|
cells: number[];
|
||||||
@@ -1953,6 +1973,26 @@ export namespace main {
|
|||||||
this.no_grid = source["no_grid"];
|
this.no_grid = source["no_grid"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
export class BackfillRDAResult {
|
||||||
|
scanned: number;
|
||||||
|
dated: number;
|
||||||
|
current: number;
|
||||||
|
unknown: number;
|
||||||
|
skipped: number;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new BackfillRDAResult(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.scanned = source["scanned"];
|
||||||
|
this.dated = source["dated"];
|
||||||
|
this.current = source["current"];
|
||||||
|
this.unknown = source["unknown"];
|
||||||
|
this.skipped = source["skipped"];
|
||||||
|
}
|
||||||
|
}
|
||||||
export class BackfillUSCountiesResult {
|
export class BackfillUSCountiesResult {
|
||||||
scanned: number;
|
scanned: number;
|
||||||
county: number;
|
county: number;
|
||||||
@@ -1999,6 +2039,7 @@ export namespace main {
|
|||||||
enabled: boolean;
|
enabled: boolean;
|
||||||
bands: string[];
|
bands: string[];
|
||||||
available: string[];
|
available: string[];
|
||||||
|
near_km: number;
|
||||||
|
|
||||||
static createFrom(source: any = {}) {
|
static createFrom(source: any = {}) {
|
||||||
return new BandOpenSettings(source);
|
return new BandOpenSettings(source);
|
||||||
@@ -2009,6 +2050,7 @@ export namespace main {
|
|||||||
this.enabled = source["enabled"];
|
this.enabled = source["enabled"];
|
||||||
this.bands = source["bands"];
|
this.bands = source["bands"];
|
||||||
this.available = source["available"];
|
this.available = source["available"];
|
||||||
|
this.near_km = source["near_km"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
export class CATSettings {
|
export class CATSettings {
|
||||||
@@ -2019,6 +2061,7 @@ export namespace main {
|
|||||||
flex_host: string;
|
flex_host: string;
|
||||||
flex_port: number;
|
flex_port: number;
|
||||||
flex_spots: boolean;
|
flex_spots: boolean;
|
||||||
|
flex_dvk_dax: boolean;
|
||||||
flex_decode_spots: boolean;
|
flex_decode_spots: boolean;
|
||||||
flex_decode_secs: number;
|
flex_decode_secs: number;
|
||||||
xiegu_port: string;
|
xiegu_port: string;
|
||||||
@@ -2045,9 +2088,13 @@ export namespace main {
|
|||||||
tci_spots: boolean;
|
tci_spots: boolean;
|
||||||
poll_ms: number;
|
poll_ms: number;
|
||||||
delay_ms: number;
|
delay_ms: number;
|
||||||
|
offset_on: boolean;
|
||||||
|
offset_hz: number;
|
||||||
digital_default: string;
|
digital_default: string;
|
||||||
share_enabled: boolean;
|
share_enabled: boolean;
|
||||||
share_port: number;
|
share_port: number;
|
||||||
|
share_proto: string;
|
||||||
|
share_tci_port: number;
|
||||||
ptt_hotkey_enabled: boolean;
|
ptt_hotkey_enabled: boolean;
|
||||||
ptt_hotkey: string;
|
ptt_hotkey: string;
|
||||||
ptt_hotkey_toggle: boolean;
|
ptt_hotkey_toggle: boolean;
|
||||||
@@ -2065,6 +2112,7 @@ export namespace main {
|
|||||||
this.flex_host = source["flex_host"];
|
this.flex_host = source["flex_host"];
|
||||||
this.flex_port = source["flex_port"];
|
this.flex_port = source["flex_port"];
|
||||||
this.flex_spots = source["flex_spots"];
|
this.flex_spots = source["flex_spots"];
|
||||||
|
this.flex_dvk_dax = source["flex_dvk_dax"];
|
||||||
this.flex_decode_spots = source["flex_decode_spots"];
|
this.flex_decode_spots = source["flex_decode_spots"];
|
||||||
this.flex_decode_secs = source["flex_decode_secs"];
|
this.flex_decode_secs = source["flex_decode_secs"];
|
||||||
this.xiegu_port = source["xiegu_port"];
|
this.xiegu_port = source["xiegu_port"];
|
||||||
@@ -2091,9 +2139,13 @@ export namespace main {
|
|||||||
this.tci_spots = source["tci_spots"];
|
this.tci_spots = source["tci_spots"];
|
||||||
this.poll_ms = source["poll_ms"];
|
this.poll_ms = source["poll_ms"];
|
||||||
this.delay_ms = source["delay_ms"];
|
this.delay_ms = source["delay_ms"];
|
||||||
|
this.offset_on = source["offset_on"];
|
||||||
|
this.offset_hz = source["offset_hz"];
|
||||||
this.digital_default = source["digital_default"];
|
this.digital_default = source["digital_default"];
|
||||||
this.share_enabled = source["share_enabled"];
|
this.share_enabled = source["share_enabled"];
|
||||||
this.share_port = source["share_port"];
|
this.share_port = source["share_port"];
|
||||||
|
this.share_proto = source["share_proto"];
|
||||||
|
this.share_tci_port = source["share_tci_port"];
|
||||||
this.ptt_hotkey_enabled = source["ptt_hotkey_enabled"];
|
this.ptt_hotkey_enabled = source["ptt_hotkey_enabled"];
|
||||||
this.ptt_hotkey = source["ptt_hotkey"];
|
this.ptt_hotkey = source["ptt_hotkey"];
|
||||||
this.ptt_hotkey_toggle = source["ptt_hotkey_toggle"];
|
this.ptt_hotkey_toggle = source["ptt_hotkey_toggle"];
|
||||||
@@ -2243,6 +2295,24 @@ export namespace main {
|
|||||||
this.count = source["count"];
|
this.count = source["count"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
export class CompactResult {
|
||||||
|
path: string;
|
||||||
|
backend: string;
|
||||||
|
before: number;
|
||||||
|
after: number;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new CompactResult(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.path = source["path"];
|
||||||
|
this.backend = source["backend"];
|
||||||
|
this.before = source["before"];
|
||||||
|
this.after = source["after"];
|
||||||
|
}
|
||||||
|
}
|
||||||
export class ContestBandRow {
|
export class ContestBandRow {
|
||||||
band: string;
|
band: string;
|
||||||
count: number;
|
count: number;
|
||||||
@@ -2463,6 +2533,102 @@ export namespace main {
|
|||||||
this.body = source["body"];
|
this.body = source["body"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
export class FlexZoomSettings {
|
||||||
|
enabled: boolean;
|
||||||
|
cw_khz: number;
|
||||||
|
ssb_khz: number;
|
||||||
|
digi_khz: number;
|
||||||
|
centre: boolean;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new FlexZoomSettings(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.enabled = source["enabled"];
|
||||||
|
this.cw_khz = source["cw_khz"];
|
||||||
|
this.ssb_khz = source["ssb_khz"];
|
||||||
|
this.digi_khz = source["digi_khz"];
|
||||||
|
this.centre = source["centre"];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
export class FolderSyncConfig {
|
||||||
|
enabled: boolean;
|
||||||
|
folder: string;
|
||||||
|
machine: string;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new FolderSyncConfig(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.enabled = source["enabled"];
|
||||||
|
this.folder = source["folder"];
|
||||||
|
this.machine = source["machine"];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
export class FolderSyncPeer {
|
||||||
|
machine: string;
|
||||||
|
last_change: string;
|
||||||
|
behind: number;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new FolderSyncPeer(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.machine = source["machine"];
|
||||||
|
this.last_change = source["last_change"];
|
||||||
|
this.behind = source["behind"];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
export class FolderSyncStatus {
|
||||||
|
enabled: boolean;
|
||||||
|
folder: string;
|
||||||
|
machine_id: string;
|
||||||
|
peers: FolderSyncPeer[];
|
||||||
|
last_sync: string;
|
||||||
|
sent: number;
|
||||||
|
received: number;
|
||||||
|
error: string;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new FolderSyncStatus(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.enabled = source["enabled"];
|
||||||
|
this.folder = source["folder"];
|
||||||
|
this.machine_id = source["machine_id"];
|
||||||
|
this.peers = this.convertValues(source["peers"], FolderSyncPeer);
|
||||||
|
this.last_sync = source["last_sync"];
|
||||||
|
this.sent = source["sent"];
|
||||||
|
this.received = source["received"];
|
||||||
|
this.error = source["error"];
|
||||||
|
}
|
||||||
|
|
||||||
|
convertValues(a: any, classs: any, asMap: boolean = false): any {
|
||||||
|
if (!a) {
|
||||||
|
return a;
|
||||||
|
}
|
||||||
|
if (a.slice && a.map) {
|
||||||
|
return (a as any[]).map(elem => this.convertValues(elem, classs));
|
||||||
|
} else if ("object" === typeof a) {
|
||||||
|
if (asMap) {
|
||||||
|
for (const key of Object.keys(a)) {
|
||||||
|
a[key] = new classs(a[key]);
|
||||||
|
}
|
||||||
|
return a;
|
||||||
|
}
|
||||||
|
return new classs(a);
|
||||||
|
}
|
||||||
|
return a;
|
||||||
|
}
|
||||||
|
}
|
||||||
export class GridCacheStatus {
|
export class GridCacheStatus {
|
||||||
enabled: boolean;
|
enabled: boolean;
|
||||||
known: number;
|
known: number;
|
||||||
@@ -2479,6 +2645,56 @@ export namespace main {
|
|||||||
this.pending = source["pending"];
|
this.pending = source["pending"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
export class gridScope {
|
||||||
|
key: string;
|
||||||
|
band: boolean;
|
||||||
|
mode: string;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new gridScope(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.key = source["key"];
|
||||||
|
this.band = source["band"];
|
||||||
|
this.mode = source["mode"];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
export class GridScopeSettings {
|
||||||
|
scope: string;
|
||||||
|
hunt: string;
|
||||||
|
scopes: gridScope[];
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new GridScopeSettings(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.scope = source["scope"];
|
||||||
|
this.hunt = source["hunt"];
|
||||||
|
this.scopes = this.convertValues(source["scopes"], gridScope);
|
||||||
|
}
|
||||||
|
|
||||||
|
convertValues(a: any, classs: any, asMap: boolean = false): any {
|
||||||
|
if (!a) {
|
||||||
|
return a;
|
||||||
|
}
|
||||||
|
if (a.slice && a.map) {
|
||||||
|
return (a as any[]).map(elem => this.convertValues(elem, classs));
|
||||||
|
} else if ("object" === typeof a) {
|
||||||
|
if (asMap) {
|
||||||
|
for (const key of Object.keys(a)) {
|
||||||
|
a[key] = new classs(a[key]);
|
||||||
|
}
|
||||||
|
return a;
|
||||||
|
}
|
||||||
|
return new classs(a);
|
||||||
|
}
|
||||||
|
return a;
|
||||||
|
}
|
||||||
|
}
|
||||||
export class ModePreset {
|
export class ModePreset {
|
||||||
name: string;
|
name: string;
|
||||||
default_rst_sent?: string;
|
default_rst_sent?: string;
|
||||||
@@ -2601,6 +2817,30 @@ export namespace main {
|
|||||||
this.cache_ttl_days = source["cache_ttl_days"];
|
this.cache_ttl_days = source["cache_ttl_days"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
export class MatrixColors {
|
||||||
|
enabled: boolean;
|
||||||
|
call_confirmed: string;
|
||||||
|
call_worked: string;
|
||||||
|
entity_confirmed: string;
|
||||||
|
entity_worked: string;
|
||||||
|
not_worked: string;
|
||||||
|
current_entry: string;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new MatrixColors(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.enabled = source["enabled"];
|
||||||
|
this.call_confirmed = source["call_confirmed"];
|
||||||
|
this.call_worked = source["call_worked"];
|
||||||
|
this.entity_confirmed = source["entity_confirmed"];
|
||||||
|
this.entity_worked = source["entity_worked"];
|
||||||
|
this.not_worked = source["not_worked"];
|
||||||
|
this.current_entry = source["current_entry"];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
export class MySQLSettings {
|
export class MySQLSettings {
|
||||||
enabled: boolean;
|
enabled: boolean;
|
||||||
@@ -2733,6 +2973,24 @@ export namespace main {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export class PSUSettings {
|
||||||
|
enabled: boolean;
|
||||||
|
com_port: string;
|
||||||
|
baud: number;
|
||||||
|
address: number;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new PSUSettings(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.enabled = source["enabled"];
|
||||||
|
this.com_port = source["com_port"];
|
||||||
|
this.baud = source["baud"];
|
||||||
|
this.address = source["address"];
|
||||||
|
}
|
||||||
|
}
|
||||||
export class QSLBulkUpdate {
|
export class QSLBulkUpdate {
|
||||||
sent_status: string;
|
sent_status: string;
|
||||||
rcvd_status: string;
|
rcvd_status: string;
|
||||||
@@ -3082,6 +3340,20 @@ export namespace main {
|
|||||||
this.motorized = source["motorized"];
|
this.motorized = source["motorized"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
export class RotorPreset {
|
||||||
|
label: string;
|
||||||
|
azimuth: number;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new RotorPreset(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.label = source["label"];
|
||||||
|
this.azimuth = source["azimuth"];
|
||||||
|
}
|
||||||
|
}
|
||||||
export class RowColorRule {
|
export class RowColorRule {
|
||||||
id: string;
|
id: string;
|
||||||
color: string;
|
color: string;
|
||||||
@@ -3105,6 +3377,8 @@ export namespace main {
|
|||||||
style: string;
|
style: string;
|
||||||
intensity: number;
|
intensity: number;
|
||||||
bandmap_lotw: boolean;
|
bandmap_lotw: boolean;
|
||||||
|
recent_zebra?: string;
|
||||||
|
recent_zebra_color?: string;
|
||||||
configured: boolean;
|
configured: boolean;
|
||||||
rules: RowColorRule[];
|
rules: RowColorRule[];
|
||||||
|
|
||||||
@@ -3118,6 +3392,8 @@ export namespace main {
|
|||||||
this.style = source["style"];
|
this.style = source["style"];
|
||||||
this.intensity = source["intensity"];
|
this.intensity = source["intensity"];
|
||||||
this.bandmap_lotw = source["bandmap_lotw"];
|
this.bandmap_lotw = source["bandmap_lotw"];
|
||||||
|
this.recent_zebra = source["recent_zebra"];
|
||||||
|
this.recent_zebra_color = source["recent_zebra_color"];
|
||||||
this.configured = source["configured"];
|
this.configured = source["configured"];
|
||||||
this.rules = this.convertValues(source["rules"], RowColorRule);
|
this.rules = this.convertValues(source["rules"], RowColorRule);
|
||||||
}
|
}
|
||||||
@@ -3184,6 +3460,54 @@ export namespace main {
|
|||||||
this.minutes = source["minutes"];
|
this.minutes = source["minutes"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
export class SpotColor {
|
||||||
|
text: string;
|
||||||
|
bg?: string;
|
||||||
|
hide?: boolean;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new SpotColor(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.text = source["text"];
|
||||||
|
this.bg = source["bg"];
|
||||||
|
this.hide = source["hide"];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
export class SpotColors {
|
||||||
|
enabled: boolean;
|
||||||
|
colors: Record<string, SpotColor>;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new SpotColors(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.enabled = source["enabled"];
|
||||||
|
this.colors = this.convertValues(source["colors"], SpotColor, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
convertValues(a: any, classs: any, asMap: boolean = false): any {
|
||||||
|
if (!a) {
|
||||||
|
return a;
|
||||||
|
}
|
||||||
|
if (a.slice && a.map) {
|
||||||
|
return (a as any[]).map(elem => this.convertValues(elem, classs));
|
||||||
|
} else if ("object" === typeof a) {
|
||||||
|
if (asMap) {
|
||||||
|
for (const key of Object.keys(a)) {
|
||||||
|
a[key] = new classs(a[key]);
|
||||||
|
}
|
||||||
|
return a;
|
||||||
|
}
|
||||||
|
return new classs(a);
|
||||||
|
}
|
||||||
|
return a;
|
||||||
|
}
|
||||||
|
}
|
||||||
export class SpotQuery {
|
export class SpotQuery {
|
||||||
call: string;
|
call: string;
|
||||||
band: string;
|
band: string;
|
||||||
@@ -3218,6 +3542,7 @@ export namespace main {
|
|||||||
new_pota: boolean;
|
new_pota: boolean;
|
||||||
grid?: string;
|
grid?: string;
|
||||||
new_grid: boolean;
|
new_grid: boolean;
|
||||||
|
grid_state?: string;
|
||||||
spotter_continent?: string;
|
spotter_continent?: string;
|
||||||
lotw: boolean;
|
lotw: boolean;
|
||||||
new_pfx: boolean;
|
new_pfx: boolean;
|
||||||
@@ -3243,6 +3568,7 @@ export namespace main {
|
|||||||
this.new_pota = source["new_pota"];
|
this.new_pota = source["new_pota"];
|
||||||
this.grid = source["grid"];
|
this.grid = source["grid"];
|
||||||
this.new_grid = source["new_grid"];
|
this.new_grid = source["new_grid"];
|
||||||
|
this.grid_state = source["grid_state"];
|
||||||
this.spotter_continent = source["spotter_continent"];
|
this.spotter_continent = source["spotter_continent"];
|
||||||
this.lotw = source["lotw"];
|
this.lotw = source["lotw"];
|
||||||
this.new_pfx = source["new_pfx"];
|
this.new_pfx = source["new_pfx"];
|
||||||
@@ -3279,6 +3605,7 @@ export namespace main {
|
|||||||
off_urls?: string[];
|
off_urls?: string[];
|
||||||
on_pattern?: string;
|
on_pattern?: string;
|
||||||
off_pattern?: string;
|
off_pattern?: string;
|
||||||
|
insecure_tls?: boolean;
|
||||||
|
|
||||||
static createFrom(source: any = {}) {
|
static createFrom(source: any = {}) {
|
||||||
return new StationDevice(source);
|
return new StationDevice(source);
|
||||||
@@ -3298,6 +3625,7 @@ export namespace main {
|
|||||||
this.off_urls = source["off_urls"];
|
this.off_urls = source["off_urls"];
|
||||||
this.on_pattern = source["on_pattern"];
|
this.on_pattern = source["on_pattern"];
|
||||||
this.off_pattern = source["off_pattern"];
|
this.off_pattern = source["off_pattern"];
|
||||||
|
this.insecure_tls = source["insecure_tls"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
export class StationRelay {
|
export class StationRelay {
|
||||||
@@ -4063,6 +4391,39 @@ export namespace pskr {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export namespace psu {
|
||||||
|
|
||||||
|
export class Status {
|
||||||
|
connected: boolean;
|
||||||
|
on: boolean;
|
||||||
|
volts: number;
|
||||||
|
amps: number;
|
||||||
|
watts: number;
|
||||||
|
set_volts: number;
|
||||||
|
set_amps: number;
|
||||||
|
protected: number;
|
||||||
|
error?: string;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new Status(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.connected = source["connected"];
|
||||||
|
this.on = source["on"];
|
||||||
|
this.volts = source["volts"];
|
||||||
|
this.amps = source["amps"];
|
||||||
|
this.watts = source["watts"];
|
||||||
|
this.set_volts = source["set_volts"];
|
||||||
|
this.set_amps = source["set_amps"];
|
||||||
|
this.protected = source["protected"];
|
||||||
|
this.error = source["error"];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
export namespace qslcard {
|
export namespace qslcard {
|
||||||
|
|
||||||
export class Bevel {
|
export class Bevel {
|
||||||
@@ -4340,6 +4701,26 @@ export namespace qso {
|
|||||||
this.minutes = source["minutes"];
|
this.minutes = source["minutes"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
export class GridSquare {
|
||||||
|
grid: string;
|
||||||
|
count: number;
|
||||||
|
confirmed: boolean;
|
||||||
|
band?: string;
|
||||||
|
mode?: string;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new GridSquare(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.grid = source["grid"];
|
||||||
|
this.count = source["count"];
|
||||||
|
this.confirmed = source["confirmed"];
|
||||||
|
this.band = source["band"];
|
||||||
|
this.mode = source["mode"];
|
||||||
|
}
|
||||||
|
}
|
||||||
export class ListFilter {
|
export class ListFilter {
|
||||||
callsign?: string;
|
callsign?: string;
|
||||||
band?: string;
|
band?: string;
|
||||||
@@ -4495,6 +4876,7 @@ export namespace qso {
|
|||||||
my_vucc_grids?: string;
|
my_vucc_grids?: string;
|
||||||
extras?: Record<string, string>;
|
extras?: Record<string, string>;
|
||||||
award_refs?: string;
|
award_refs?: string;
|
||||||
|
sync_uid?: string;
|
||||||
// Go type: time
|
// Go type: time
|
||||||
created_at: any;
|
created_at: any;
|
||||||
// Go type: time
|
// Go type: time
|
||||||
@@ -4636,6 +5018,7 @@ export namespace qso {
|
|||||||
this.my_vucc_grids = source["my_vucc_grids"];
|
this.my_vucc_grids = source["my_vucc_grids"];
|
||||||
this.extras = source["extras"];
|
this.extras = source["extras"];
|
||||||
this.award_refs = source["award_refs"];
|
this.award_refs = source["award_refs"];
|
||||||
|
this.sync_uid = source["sync_uid"];
|
||||||
this.created_at = this.convertValues(source["created_at"], null);
|
this.created_at = this.convertValues(source["created_at"], null);
|
||||||
this.updated_at = this.convertValues(source["updated_at"], null);
|
this.updated_at = this.convertValues(source["updated_at"], null);
|
||||||
}
|
}
|
||||||
@@ -4733,6 +5116,10 @@ export namespace qso {
|
|||||||
continents: number;
|
continents: number;
|
||||||
first_qso: string;
|
first_qso: string;
|
||||||
last_qso: string;
|
last_qso: string;
|
||||||
|
last_new_dxcc: string;
|
||||||
|
last_new_dxcc_num: number;
|
||||||
|
last_new_dxcc_call: string;
|
||||||
|
last_new_dxcc_date: string;
|
||||||
confirmed_lotw: number;
|
confirmed_lotw: number;
|
||||||
confirmed_eqsl: number;
|
confirmed_eqsl: number;
|
||||||
confirmed_qsl: number;
|
confirmed_qsl: number;
|
||||||
@@ -4783,6 +5170,10 @@ export namespace qso {
|
|||||||
this.continents = source["continents"];
|
this.continents = source["continents"];
|
||||||
this.first_qso = source["first_qso"];
|
this.first_qso = source["first_qso"];
|
||||||
this.last_qso = source["last_qso"];
|
this.last_qso = source["last_qso"];
|
||||||
|
this.last_new_dxcc = source["last_new_dxcc"];
|
||||||
|
this.last_new_dxcc_num = source["last_new_dxcc_num"];
|
||||||
|
this.last_new_dxcc_call = source["last_new_dxcc_call"];
|
||||||
|
this.last_new_dxcc_date = source["last_new_dxcc_date"];
|
||||||
this.confirmed_lotw = source["confirmed_lotw"];
|
this.confirmed_lotw = source["confirmed_lotw"];
|
||||||
this.confirmed_eqsl = source["confirmed_eqsl"];
|
this.confirmed_eqsl = source["confirmed_eqsl"];
|
||||||
this.confirmed_qsl = source["confirmed_qsl"];
|
this.confirmed_qsl = source["confirmed_qsl"];
|
||||||
|
|||||||
@@ -0,0 +1,64 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
// The build gate is only as good as the moments it runs at.
|
||||||
|
//
|
||||||
|
// It used to run at startup alone, on the profile active then — and a fresh
|
||||||
|
// install has NO callsign at that point. The operator typed theirs afterwards,
|
||||||
|
// so a denied call ran for the whole session and reached the telemetry, which
|
||||||
|
// reads the very same field. Every place that can make a denied callsign the
|
||||||
|
// ACTIVE one has to re-ask.
|
||||||
|
func TestCallGateRunsWhereverTheActiveCallsignChanges(t *testing.T) {
|
||||||
|
src, err := os.ReadFile("app.go")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
for _, fn := range []string{
|
||||||
|
"func (a *App) startup(ctx context.Context) {", // launch
|
||||||
|
"func (a *App) SaveStationSettings(s StationSettings) error {", // the call is entered here
|
||||||
|
"func (a *App) SaveProfile(p profile.Profile) (profile.Profile, error) {",
|
||||||
|
"func (a *App) ActivateProfile(id int64) error {",
|
||||||
|
} {
|
||||||
|
body := funcBody(t, string(src), fn)
|
||||||
|
if !strings.Contains(body, "enforceCallGate(") {
|
||||||
|
t.Errorf("%s can change the active callsign but never re-checks the gate", fn)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The hashes are the whole mechanism: a truncated or re-cased entry silently
|
||||||
|
// matches nothing, and nothing in the running program would ever say so.
|
||||||
|
func TestDeniedCallHashesAreWellFormed(t *testing.T) {
|
||||||
|
if len(deniedCallHashes) == 0 {
|
||||||
|
t.Fatal("the deny list is empty — the gate has stopped gating")
|
||||||
|
}
|
||||||
|
for h := range deniedCallHashes {
|
||||||
|
if len(h) != 64 {
|
||||||
|
t.Errorf("hash %q is %d chars, want 64", h, len(h))
|
||||||
|
}
|
||||||
|
if h != strings.ToLower(h) {
|
||||||
|
t.Errorf("hash %q is not lower-case, so it can never match", h)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A slashed call must reduce to the real one, or /P is a way round the gate.
|
||||||
|
func TestDenyBaseCall(t *testing.T) {
|
||||||
|
for in, want := range map[string]string{
|
||||||
|
"f4xyz": "F4XYZ",
|
||||||
|
" F4XYZ ": "F4XYZ",
|
||||||
|
"F4XYZ/P": "F4XYZ",
|
||||||
|
"TM/F4XYZ": "F4XYZ",
|
||||||
|
"F4XYZ/MM": "F4XYZ",
|
||||||
|
"": "",
|
||||||
|
} {
|
||||||
|
if got := denyBaseCall(in); got != want {
|
||||||
|
t.Errorf("denyBaseCall(%q) = %q, want %q", in, got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+187
@@ -0,0 +1,187 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"hamlog/internal/award"
|
||||||
|
"hamlog/internal/qso"
|
||||||
|
)
|
||||||
|
|
||||||
|
// New-grid scoping: WHICH prior contacts count as "I already have this square".
|
||||||
|
//
|
||||||
|
// The question has no single right answer, which is why it is a setting rather
|
||||||
|
// than a rule. A VUCC chaser counts a square per band; someone filling in a
|
||||||
|
// wall map counts it once. GridTracker offers the same six combinations, and an
|
||||||
|
// operator running both alongside each other needs them to agree — a square
|
||||||
|
// "wanted" in one and not the other is a bug report every time.
|
||||||
|
const (
|
||||||
|
keyGridScope = "grid.scope" // band+mode combination — see gridScopes
|
||||||
|
keyGridHunt = "grid.hunt" // "new" | "new_unconfirmed"
|
||||||
|
)
|
||||||
|
|
||||||
|
// gridScope is one band × mode combination.
|
||||||
|
type gridScope struct {
|
||||||
|
Key string `json:"key"`
|
||||||
|
// Band is true when the square has to have been worked on THIS band. False
|
||||||
|
// is GridTracker's "Mix Bands": any band counts.
|
||||||
|
Band bool `json:"band"`
|
||||||
|
// Mode is how much of the mode matters:
|
||||||
|
// "digi" — any digital mode at all
|
||||||
|
// "ftx" — any of the FT family (FT8/FT4/FT2)
|
||||||
|
// "mode" — this exact mode and no other
|
||||||
|
Mode string `json:"mode"`
|
||||||
|
}
|
||||||
|
|
||||||
|
var gridScopes = []gridScope{
|
||||||
|
{Key: "band_digi", Band: true, Mode: "digi"},
|
||||||
|
{Key: "band_mode", Band: true, Mode: "mode"},
|
||||||
|
{Key: "band_ftx", Band: true, Mode: "ftx"},
|
||||||
|
{Key: "mix_digi", Band: false, Mode: "digi"},
|
||||||
|
{Key: "mix_mode", Band: false, Mode: "mode"},
|
||||||
|
{Key: "mix_ftx", Band: false, Mode: "ftx"},
|
||||||
|
}
|
||||||
|
|
||||||
|
// defaultGridScope matches what the panel showed before the setting existed:
|
||||||
|
// any band, any digital mode. Changing an operator's badges on upgrade is worse
|
||||||
|
// than offering them a choice they have not made yet.
|
||||||
|
const defaultGridScope = "mix_digi"
|
||||||
|
|
||||||
|
func lookupGridScope(key string) gridScope {
|
||||||
|
for _, s := range gridScopes {
|
||||||
|
if s.Key == key {
|
||||||
|
return s
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for _, s := range gridScopes {
|
||||||
|
if s.Key == defaultGridScope {
|
||||||
|
return s
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return gridScopes[0]
|
||||||
|
}
|
||||||
|
|
||||||
|
// ftxModes is the FT family, which is a narrower thing than "digital": an
|
||||||
|
// operator chasing squares on FT8 does not count the RTTY contest contact, and
|
||||||
|
// GridTracker draws the same line.
|
||||||
|
var ftxModes = map[string]bool{"FT8": true, "FT4": true, "FT2": true}
|
||||||
|
|
||||||
|
// gridClassesOf lists every bucket one logged mode belongs to. A single FT8
|
||||||
|
// contact counts under its own name, under FTx and under digital — the scopes
|
||||||
|
// overlap by construction, so the index stores all three and the lookup picks.
|
||||||
|
func gridClassesOf(mode string) []string {
|
||||||
|
m := strings.ToUpper(strings.TrimSpace(mode))
|
||||||
|
if m == "" {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
out := []string{"m:" + m}
|
||||||
|
if ftxModes[m] {
|
||||||
|
out = append(out, "ftx")
|
||||||
|
}
|
||||||
|
if award.ModeClass(m) == "DIGI" {
|
||||||
|
out = append(out, "digi")
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
// gridClassFor turns the scope plus the mode being heard into the one class to
|
||||||
|
// look up. Empty means "this scope cannot judge this mode" — a phone contact
|
||||||
|
// under an FTx scope — and the caller then flags nothing rather than guessing.
|
||||||
|
func gridClassFor(s gridScope, mode string) string {
|
||||||
|
m := strings.ToUpper(strings.TrimSpace(mode))
|
||||||
|
if m == "" {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
switch s.Mode {
|
||||||
|
case "mode":
|
||||||
|
return "m:" + m
|
||||||
|
case "ftx":
|
||||||
|
if ftxModes[m] {
|
||||||
|
return "ftx"
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
default: // digi
|
||||||
|
if award.ModeClass(m) == "DIGI" {
|
||||||
|
return "digi"
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// GridScopeSettings is the panel's shape.
|
||||||
|
type GridScopeSettings struct {
|
||||||
|
Scope string `json:"scope"`
|
||||||
|
Hunt string `json:"hunt"`
|
||||||
|
// Scopes is the list the UI renders, so it cannot drift from the one the
|
||||||
|
// lookup honours.
|
||||||
|
Scopes []gridScope `json:"scopes"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *App) GetGridScopeSettings() GridScopeSettings {
|
||||||
|
return GridScopeSettings{
|
||||||
|
Scope: lookupGridScope(a.settingOr(keyGridScope, "")).Key,
|
||||||
|
Hunt: gridHunt(a.settingOr(keyGridHunt, "")),
|
||||||
|
Scopes: gridScopes,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// gridHunt normalises the hunting mode. "new" is never-worked; "new_unconfirmed"
|
||||||
|
// also chases a square worked but not yet confirmed — the same square is still
|
||||||
|
// missing from the award either way.
|
||||||
|
func gridHunt(v string) string {
|
||||||
|
if strings.TrimSpace(v) == "new_unconfirmed" {
|
||||||
|
return "new_unconfirmed"
|
||||||
|
}
|
||||||
|
return "new"
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *App) SaveGridScopeSettings(s GridScopeSettings) error {
|
||||||
|
a.setSetting(keyGridScope, lookupGridScope(s.Scope).Key)
|
||||||
|
a.setSetting(keyGridHunt, gridHunt(s.Hunt))
|
||||||
|
// The worked-grid index is built under these rules, so it is now stale.
|
||||||
|
a.clusterStatusMu.Lock()
|
||||||
|
a.clusterStatusIdx = nil
|
||||||
|
a.clusterStatusMu.Unlock()
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Grid states a heard square can be in, from the operator's point of view.
|
||||||
|
//
|
||||||
|
// "wanted" is not one state but two, and they call for different decisions: a
|
||||||
|
// square never worked is a QSO to make, one worked and not yet confirmed is a
|
||||||
|
// QSL to chase. Reporting both as plain NEW GRID — which is what this did when
|
||||||
|
// the unconfirmed hunt was added — leaves an operator staring at a badge on a
|
||||||
|
// station the log plainly says they worked an hour ago.
|
||||||
|
const (
|
||||||
|
gridStateNew = "new" // never worked under this scope
|
||||||
|
gridStateUnconf = "unconf" // worked under this scope, not yet confirmed
|
||||||
|
)
|
||||||
|
|
||||||
|
// gridStateFor classifies one heard square. "" means nothing to chase: already
|
||||||
|
// confirmed, or a mode this scope cannot judge.
|
||||||
|
//
|
||||||
|
// band is where it was heard and mode what it was heard in — the SCOPE decides
|
||||||
|
// whether either is allowed to matter.
|
||||||
|
func gridStateFor(idx map[string]bool, s gridScope, hunt, grid, band, mode string) string {
|
||||||
|
cls := gridClassFor(s, mode)
|
||||||
|
if cls == "" || len(grid) < 4 {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
key := qso.GridKey(strings.ToUpper(grid[:4]), "", cls)
|
||||||
|
if s.Band {
|
||||||
|
key = qso.GridKey(strings.ToUpper(grid[:4]), band, cls)
|
||||||
|
}
|
||||||
|
confirmed, worked := idx[key]
|
||||||
|
switch {
|
||||||
|
case !worked:
|
||||||
|
return gridStateNew
|
||||||
|
case !confirmed && hunt == "new_unconfirmed":
|
||||||
|
return gridStateUnconf
|
||||||
|
default:
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// gridIsWanted is gridStateFor reduced to the yes/no the filters need.
|
||||||
|
func gridIsWanted(idx map[string]bool, s gridScope, hunt, grid, band, mode string) bool {
|
||||||
|
return gridStateFor(idx, s, hunt, grid, band, mode) != ""
|
||||||
|
}
|
||||||
@@ -0,0 +1,126 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"hamlog/internal/qso"
|
||||||
|
)
|
||||||
|
|
||||||
|
// idx builds a worked-grid index the way GridWorkedIndex does, so the test
|
||||||
|
// exercises the real key shape rather than a convenient one.
|
||||||
|
func idx(entries ...struct {
|
||||||
|
grid, band, mode string
|
||||||
|
confirmed bool
|
||||||
|
}) map[string]bool {
|
||||||
|
m := map[string]bool{}
|
||||||
|
for _, e := range entries {
|
||||||
|
for _, cls := range gridClassesOf(e.mode) {
|
||||||
|
for _, k := range []string{qso.GridKey(e.grid, e.band, cls), qso.GridKey(e.grid, "", cls)} {
|
||||||
|
m[k] = m[k] || e.confirmed
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return m
|
||||||
|
}
|
||||||
|
|
||||||
|
type entry = struct {
|
||||||
|
grid, band, mode string
|
||||||
|
confirmed bool
|
||||||
|
}
|
||||||
|
|
||||||
|
// The six scopes are six different questions, and the whole point of offering
|
||||||
|
// them is that the same square answers differently.
|
||||||
|
func TestGridScopes(t *testing.T) {
|
||||||
|
// JN36 worked once: 20 m, FT8, not confirmed.
|
||||||
|
i := idx(entry{"JN36", "20m", "FT8", false})
|
||||||
|
|
||||||
|
for _, tc := range []struct {
|
||||||
|
scope string
|
||||||
|
band string
|
||||||
|
mode string
|
||||||
|
want bool
|
||||||
|
why string
|
||||||
|
}{
|
||||||
|
{"band_ftx", "20m", "FT8", false, "same band, same family — already mine"},
|
||||||
|
{"band_ftx", "15m", "FT8", true, "another band, and the scope counts bands"},
|
||||||
|
{"mix_ftx", "15m", "FT8", false, "another band, but this scope does not care"},
|
||||||
|
{"band_mode", "20m", "FT4", true, "same band, but FT4 is not FT8 under an exact-mode scope"},
|
||||||
|
{"band_ftx", "20m", "FT4", false, "same band, and FT4 is in the same FT family"},
|
||||||
|
{"band_digi", "20m", "RTTY", false, "digital counts every digital mode"},
|
||||||
|
{"band_ftx", "20m", "RTTY", false, "RTTY is outside an FTx scope — it is not evidence either way, so nothing is flagged"},
|
||||||
|
{"mix_digi", "15m", "FT4", false, "the widest scope: worked anywhere, any digital"},
|
||||||
|
} {
|
||||||
|
got := gridIsWanted(i, lookupGridScope(tc.scope), "new", "JN36", tc.band, tc.mode)
|
||||||
|
if got != tc.want {
|
||||||
|
t.Errorf("scope %s, %s %s → wanted=%v, want %v — %s", tc.scope, tc.band, tc.mode, got, tc.want, tc.why)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// "New + unconfirmed" chases a square that is worked but not yet confirmed: it
|
||||||
|
// is still missing from the award, which is the only sense in which it is done.
|
||||||
|
func TestGridHuntUnconfirmed(t *testing.T) {
|
||||||
|
unconf := idx(entry{"JN36", "20m", "FT8", false})
|
||||||
|
conf := idx(entry{"IO91", "20m", "FT8", true})
|
||||||
|
|
||||||
|
if gridIsWanted(unconf, lookupGridScope("band_ftx"), "new", "JN36", "20m", "FT8") {
|
||||||
|
t.Error("worked-but-unconfirmed must NOT be wanted when hunting only what is new")
|
||||||
|
}
|
||||||
|
if !gridIsWanted(unconf, lookupGridScope("band_ftx"), "new_unconfirmed", "JN36", "20m", "FT8") {
|
||||||
|
t.Error("worked-but-unconfirmed must BE wanted when hunting unconfirmed too")
|
||||||
|
}
|
||||||
|
if gridIsWanted(conf, lookupGridScope("band_ftx"), "new_unconfirmed", "IO91", "20m", "FT8") {
|
||||||
|
t.Error("a confirmed square is finished under either hunt")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A mode the scope cannot judge flags nothing rather than guessing: a phone
|
||||||
|
// contact under an FTx scope is not evidence either way.
|
||||||
|
func TestGridScopeIgnoresModesItCannotJudge(t *testing.T) {
|
||||||
|
i := idx(entry{"JN36", "20m", "FT8", false})
|
||||||
|
for _, mode := range []string{"SSB", "CW", ""} {
|
||||||
|
if gridIsWanted(i, lookupGridScope("band_ftx"), "new", "KO01", "20m", mode) {
|
||||||
|
t.Errorf("mode %q is outside an FTx scope — nothing should be flagged", mode)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// An unknown or unset scope falls back rather than answering "wanted" for
|
||||||
|
// everything, which is what an empty class would have done.
|
||||||
|
func TestGridScopeFallsBack(t *testing.T) {
|
||||||
|
if got := lookupGridScope("").Key; got != defaultGridScope {
|
||||||
|
t.Errorf("unset scope = %q, want the default %q", got, defaultGridScope)
|
||||||
|
}
|
||||||
|
if got := lookupGridScope("nonsense").Key; got != defaultGridScope {
|
||||||
|
t.Errorf("unknown scope = %q, want the default %q", got, defaultGridScope)
|
||||||
|
}
|
||||||
|
if got := gridHunt("nonsense"); got != "new" {
|
||||||
|
t.Errorf("unknown hunt = %q, want new", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The two wanted states must be told apart, not merged. A square worked an hour
|
||||||
|
// ago and awaiting a QSL is a different job from one never worked, and reporting
|
||||||
|
// both as plain NEW GRID is what made a station the log plainly shows as worked
|
||||||
|
// still wear the badge.
|
||||||
|
func TestGridStateSeparatesNewFromUnconfirmed(t *testing.T) {
|
||||||
|
i := idx(
|
||||||
|
entry{"JN74", "20m", "FT8", false}, // worked, no confirmation yet
|
||||||
|
entry{"IO91", "20m", "FT8", true}, // worked and confirmed
|
||||||
|
)
|
||||||
|
s := lookupGridScope("band_ftx")
|
||||||
|
|
||||||
|
if got := gridStateFor(i, s, "new_unconfirmed", "KO99", "20m", "FT8"); got != gridStateNew {
|
||||||
|
t.Errorf("never worked → %q, want %q", got, gridStateNew)
|
||||||
|
}
|
||||||
|
if got := gridStateFor(i, s, "new_unconfirmed", "JN74", "20m", "FT8"); got != gridStateUnconf {
|
||||||
|
t.Errorf("worked but unconfirmed → %q, want %q", got, gridStateUnconf)
|
||||||
|
}
|
||||||
|
if got := gridStateFor(i, s, "new_unconfirmed", "IO91", "20m", "FT8"); got != "" {
|
||||||
|
t.Errorf("confirmed → %q, want nothing to chase", got)
|
||||||
|
}
|
||||||
|
// Under the plain "new" hunt an unconfirmed square is finished business.
|
||||||
|
if got := gridStateFor(i, s, "new", "JN74", "20m", "FT8"); got != "" {
|
||||||
|
t.Errorf("unconfirmed under the new-only hunt → %q, want nothing", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,59 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os"
|
||||||
|
"regexp"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Every user-visible string ships in BOTH languages. That is a project rule,
|
||||||
|
// and until now it was only a rule: seventeen keys had drifted into English
|
||||||
|
// only, among them the whole update panel and two DX-cluster settings, found by
|
||||||
|
// a French operator photographing his own screen.
|
||||||
|
//
|
||||||
|
// A key present in one dictionary and not the other falls back to the key
|
||||||
|
// itself, so the interface shows "clu.spotTtl" where a label belongs — or, as
|
||||||
|
// here, the English text, which reads as deliberate and is not.
|
||||||
|
func TestEveryStringIsInBothLanguages(t *testing.T) {
|
||||||
|
src, err := os.ReadFile("frontend/src/lib/i18n.tsx")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("read i18n.tsx: %v", err)
|
||||||
|
}
|
||||||
|
en := dictKeys(t, string(src), "const en: Dict = {")
|
||||||
|
fr := dictKeys(t, string(src), "const fr: Dict = {")
|
||||||
|
|
||||||
|
if len(en) == 0 || len(fr) == 0 {
|
||||||
|
t.Fatal("one of the dictionaries came back empty — this test has stopped checking anything")
|
||||||
|
}
|
||||||
|
for k := range en {
|
||||||
|
if !fr[k] {
|
||||||
|
t.Errorf("%q has no French — a French operator sees the English string, or the key itself", k)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for k := range fr {
|
||||||
|
if !en[k] {
|
||||||
|
t.Errorf("%q exists only in French — an English operator sees the key", k)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// dictKeys collects the keys of one dictionary literal: from its opening line
|
||||||
|
// to the closing brace in column 0.
|
||||||
|
func dictKeys(t *testing.T, src, opening string) map[string]bool {
|
||||||
|
t.Helper()
|
||||||
|
i := strings.Index(src, opening)
|
||||||
|
if i < 0 {
|
||||||
|
t.Fatalf("%q not found — the dictionaries have been renamed and this test needs updating", opening)
|
||||||
|
}
|
||||||
|
body := src[i+len(opening):]
|
||||||
|
if j := strings.Index(body, "\n};"); j >= 0 {
|
||||||
|
body = body[:j]
|
||||||
|
}
|
||||||
|
keyRe := regexp.MustCompile(`'([a-zA-Z0-9_.]+)'\s*:`)
|
||||||
|
out := map[string]bool{}
|
||||||
|
for _, m := range keyRe.FindAllStringSubmatch(body, -1) {
|
||||||
|
out[m[1]] = true
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
@@ -0,0 +1,41 @@
|
|||||||
|
package adif
|
||||||
|
|
||||||
|
import (
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
// An import must never INVENT a routing method. The two "via" fields carry what
|
||||||
|
// the file carries, and nothing at all when it carries nothing.
|
||||||
|
//
|
||||||
|
// This is worth pinning because the opposite is easy to reach for: a card that
|
||||||
|
// was confirmed electronically is the common case, and defaulting to E would
|
||||||
|
// quietly rewrite the operator's own record of how their cards actually
|
||||||
|
// travelled. Where an E does show up after an import, it came from the source
|
||||||
|
// file — Log4OM writes QSL_SENT_VIA:1>E on every record whether or not a card
|
||||||
|
// was ever sent, which is pinned by TestQSLSentViaDoesNotBecomeManager.
|
||||||
|
func TestImportInventsNoQSLRouting(t *testing.T) {
|
||||||
|
for name, rec := range map[string]string{
|
||||||
|
"absent": "<CALL:5>OE6CLD<QSO_DATE:8>20260606<TIME_ON:4>1200<BAND:3>20m<MODE:2>CW<EOR>\n",
|
||||||
|
"empty": "<CALL:5>OE6CLD<QSO_DATE:8>20260606<TIME_ON:4>1200<BAND:3>20m<MODE:2>CW<QSL_SENT_VIA:0><QSL_RCVD_VIA:0><EOR>\n",
|
||||||
|
"whitespace": "<CALL:5>OE6CLD<QSO_DATE:8>20260606<TIME_ON:4>1200<BAND:3>20m<MODE:2>CW<QSL_SENT_VIA:1> <QSL_RCVD_VIA:1> <EOR>\n",
|
||||||
|
// Not in the enumeration: dropped rather than passed through, or the
|
||||||
|
// export would write a value no other logger can read.
|
||||||
|
"unknown": "<CALL:5>OE6CLD<QSO_DATE:8>20260606<TIME_ON:4>1200<BAND:3>20m<MODE:2>CW<QSL_SENT_VIA:3>ZZZ<EOR>\n",
|
||||||
|
} {
|
||||||
|
var got Record
|
||||||
|
if err := Parse(strings.NewReader("<EOH>\n"+rec), func(r Record) error { got = r; return nil }); err != nil {
|
||||||
|
t.Fatalf("%s: parse: %v", name, err)
|
||||||
|
}
|
||||||
|
q, ok := recordToQSO(got)
|
||||||
|
if !ok {
|
||||||
|
t.Fatalf("%s: recordToQSO returned !ok", name)
|
||||||
|
}
|
||||||
|
if q.QSLSentVia != "" {
|
||||||
|
t.Errorf("%s: QSL_SENT_VIA = %q, want empty — the import made up a routing method", name, q.QSLSentVia)
|
||||||
|
}
|
||||||
|
if q.QSLRcvdVia != "" {
|
||||||
|
t.Errorf("%s: QSL_RCVD_VIA = %q, want empty — the import made up a routing method", name, q.QSLRcvdVia)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -20,9 +20,15 @@ var (
|
|||||||
mu sync.Mutex
|
mu sync.Mutex
|
||||||
file *os.File
|
file *os.File
|
||||||
path string
|
path string
|
||||||
|
written int64 // bytes in the CURRENT file, for the size check in Printf
|
||||||
crashFile *os.File // kept open so the runtime can write a crash traceback to it
|
crashFile *os.File // kept open so the runtime can write a crash traceback to it
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// maxLogBytes is where the file rolls over, at startup AND while running.
|
||||||
|
// A variable, not a constant, so the rotation can be exercised in a test without
|
||||||
|
// writing ten megabytes to do it.
|
||||||
|
var maxLogBytes int64 = 10 * 1024 * 1024
|
||||||
|
|
||||||
// Init opens (creates) the log file in dataDir. On rotation we truncate
|
// Init opens (creates) the log file in dataDir. On rotation we truncate
|
||||||
// at startup if the file is too big; for now it's a single file, no
|
// at startup if the file is too big; for now it's a single file, no
|
||||||
// rolling — the volume is low (a few KB per session).
|
// rolling — the volume is low (a few KB per session).
|
||||||
@@ -47,12 +53,12 @@ func Init(dataDir string) (string, error) {
|
|||||||
_ = os.Rename(oldLog, logPath)
|
_ = os.Rename(oldLog, logPath)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Rotate (don't delete) once the file grows past ~10MB: rename it to
|
// Rotate (don't delete) once the file grows past maxLogBytes: rename it to
|
||||||
// opslog.log.1 so the PREVIOUS session's log survives. Deleting it outright used
|
// opslog.log.1 so the PREVIOUS session's log survives. Deleting it outright used
|
||||||
// to erase exactly the diagnostics we needed when a user reported an issue from
|
// to erase exactly the diagnostics we needed when a user reported an issue from
|
||||||
// the session that just ended. One generation kept — enough, without unbounded growth.
|
// the session that just ended. One generation kept — enough, without unbounded growth.
|
||||||
if fi, err := os.Stat(logPath); err == nil && fi.Size() > 10*1024*1024 {
|
if fi, err := os.Stat(logPath); err == nil && fi.Size() > maxLogBytes {
|
||||||
_ = os.Remove(logPath + ".1") // drop the older generation
|
_ = os.Remove(logPath + ".1") // drop the older generation
|
||||||
if err := os.Rename(logPath, logPath+".1"); err != nil {
|
if err := os.Rename(logPath, logPath+".1"); err != nil {
|
||||||
_ = os.Remove(logPath) // rename failed (locked?) → fall back to the old behaviour
|
_ = os.Remove(logPath) // rename failed (locked?) → fall back to the old behaviour
|
||||||
}
|
}
|
||||||
@@ -96,13 +102,57 @@ func Printf(format string, args ...any) {
|
|||||||
msg = msg[:len(msg)-1]
|
msg = msg[:len(msg)-1]
|
||||||
}
|
}
|
||||||
if file != nil {
|
if file != nil {
|
||||||
fmt.Fprintf(file, "%s %s\n", stamp, msg)
|
n, _ := fmt.Fprintf(file, "%s %s\n", stamp, msg)
|
||||||
|
written += int64(n)
|
||||||
|
rotateIfBigLocked()
|
||||||
}
|
}
|
||||||
// Also dump to stderr in case the binary was launched with a console
|
// Also dump to stderr in case the binary was launched with a console
|
||||||
// attached (wails dev, custom build).
|
// attached (wails dev, custom build).
|
||||||
fmt.Fprintf(os.Stderr, "%s %s\n", stamp, msg)
|
fmt.Fprintf(os.Stderr, "%s %s\n", stamp, msg)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// rotateIfBigLocked rolls the file over mid-session once it passes maxLogBytes.
|
||||||
|
//
|
||||||
|
// The check used to happen at STARTUP only, on the reasonable belief that a
|
||||||
|
// session writes a few kilobytes. The CI-V wire trace disproved it: left on for
|
||||||
|
// a day it wrote 416 MB, and nothing would have stopped it before the disk did.
|
||||||
|
// A log that has to be rotated by quitting the program is not a bound.
|
||||||
|
//
|
||||||
|
// Same one-generation scheme as the startup rotation, so the previous stretch
|
||||||
|
// survives — which is the half an operator usually needs, the part just before
|
||||||
|
// the thing they are reporting.
|
||||||
|
//
|
||||||
|
// Caller holds mu.
|
||||||
|
func rotateIfBigLocked() {
|
||||||
|
if written < maxLogBytes || file == nil || path == "" {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
fmt.Fprintf(file, "%s ── log reached %d MB, rotating to %s.1 ──\n",
|
||||||
|
time.Now().Format("15:04:05.000"), maxLogBytes/(1024*1024), filepath.Base(path))
|
||||||
|
_ = file.Close()
|
||||||
|
file = nil
|
||||||
|
_ = os.Remove(path + ".1")
|
||||||
|
if err := os.Rename(path, path+".1"); err != nil {
|
||||||
|
// Rename refused (the file is held open elsewhere, a virus scanner): keep
|
||||||
|
// writing to the old handle rather than losing the log entirely, and try
|
||||||
|
// again in another maxLogBytes rather than on every single line.
|
||||||
|
f, oerr := os.OpenFile(path, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0o644)
|
||||||
|
if oerr == nil {
|
||||||
|
file = f
|
||||||
|
}
|
||||||
|
written = 0
|
||||||
|
return
|
||||||
|
}
|
||||||
|
f, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0o644)
|
||||||
|
if err != nil {
|
||||||
|
return // nothing more to be done; the next Printf simply writes nowhere
|
||||||
|
}
|
||||||
|
file = f
|
||||||
|
written = 0
|
||||||
|
fmt.Fprintf(file, "%s ── continued from %s.1 ──\n",
|
||||||
|
time.Now().Format("15:04:05.000"), filepath.Base(path))
|
||||||
|
}
|
||||||
|
|
||||||
// Path returns where the file is so the UI can surface it.
|
// Path returns where the file is so the UI can surface it.
|
||||||
func Path() string {
|
func Path() string {
|
||||||
mu.Lock()
|
mu.Lock()
|
||||||
@@ -118,4 +168,19 @@ func Close() {
|
|||||||
_ = file.Close()
|
_ = file.Close()
|
||||||
file = nil
|
file = nil
|
||||||
}
|
}
|
||||||
|
// The crash file is held open for the whole run so the runtime can dump a
|
||||||
|
// traceback into it without allocating; on the way out it has to be released
|
||||||
|
// like any other handle, or the data directory cannot be moved or removed.
|
||||||
|
if crashFile != nil {
|
||||||
|
// The RUNTIME holds its own duplicate of this handle (SetCrashOutput), so
|
||||||
|
// closing ours releases nothing on Windows — the data directory stays
|
||||||
|
// locked. Hand the runtime a nil first. Anything fatal in the last moments
|
||||||
|
// of shutdown is no longer captured, which is the right trade at a point
|
||||||
|
// where the databases are already closed.
|
||||||
|
_ = debug.SetCrashOutput(nil, debug.CrashOptions{})
|
||||||
|
_ = crashFile.Close()
|
||||||
|
crashFile = nil
|
||||||
|
}
|
||||||
|
path = ""
|
||||||
|
written = 0
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,49 @@
|
|||||||
|
package applog
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
// The log has to be bounded WHILE RUNNING, not only at startup. The CI-V wire
|
||||||
|
// trace left on for a day wrote 416 MB, and nothing would have stopped it
|
||||||
|
// before the disk did.
|
||||||
|
func TestRotatesMidSession(t *testing.T) {
|
||||||
|
orig := maxLogBytes
|
||||||
|
maxLogBytes = 8 * 1024 // small, so the test costs milliseconds
|
||||||
|
defer func() { maxLogBytes = orig }()
|
||||||
|
|
||||||
|
dir := t.TempDir()
|
||||||
|
p, err := Init(dir)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
defer Close()
|
||||||
|
|
||||||
|
line := strings.Repeat("x", 256)
|
||||||
|
for i := 0; i < 100; i++ { // ~25 KB: several times the limit
|
||||||
|
Printf("%s", line)
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := os.Stat(p + ".1"); err != nil {
|
||||||
|
t.Fatalf("no previous generation kept: %v", err)
|
||||||
|
}
|
||||||
|
fi, err := os.Stat(p)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if fi.Size() > maxLogBytes {
|
||||||
|
t.Fatalf("current log is %d bytes, over the %d limit — it did not roll over", fi.Size(), maxLogBytes)
|
||||||
|
}
|
||||||
|
// The new file says where the rest went: a log that starts mid-sentence with
|
||||||
|
// no explanation is how an operator concludes the app lost its history.
|
||||||
|
b, err := os.ReadFile(p)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if !strings.Contains(string(b), "continued from "+filepath.Base(p)+".1") {
|
||||||
|
t.Error("the new file does not point at the one it continues")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -684,3 +684,26 @@ func TestCatalogForcesBuiltin(t *testing.T) {
|
|||||||
t.Fatal("empty catalog")
|
t.Fatal("empty catalog")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// An award with NO QSO field at all counts only what the operator assigned by
|
||||||
|
// hand. WWBOTA is the case: bunker references have no ADIF field anywhere, so
|
||||||
|
// the definition names no field and the matcher must scan nothing rather than
|
||||||
|
// fall back on some default. The manual override still applies — it is the only
|
||||||
|
// thing that can feed such an award.
|
||||||
|
func TestComputeNoFieldManualOnly(t *testing.T) {
|
||||||
|
def := Def{Code: "WWBOTA", Type: TypeReference, Field: "", Dynamic: true, Valid: true}
|
||||||
|
qsos := []qso.QSO{
|
||||||
|
// Assigned by hand → counts.
|
||||||
|
{Callsign: "F4ABC", Band: "40m", Extras: map[string]string{ManualRefsKey: "WWBOTA@B/F-0123"}},
|
||||||
|
// Nothing assigned. The other fields are deliberately full: none of them
|
||||||
|
// may be scanned just because no field was named.
|
||||||
|
{Callsign: "F4DEF", Band: "20m", POTARef: "FF-0001", QTH: "B/F-0999", Comment: "B/F-0888"},
|
||||||
|
}
|
||||||
|
r := Compute([]Def{def}, qsos, nil, nil)[0]
|
||||||
|
if r.Worked != 1 {
|
||||||
|
t.Errorf("WWBOTA worked = %d, want 1 (%v)", r.Worked, refCodes(r))
|
||||||
|
}
|
||||||
|
if got := refCodes(r); len(got) != 1 || got[0] != "B/F-0123" {
|
||||||
|
t.Errorf("WWBOTA refs = %v, want [B/F-0123]", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
+144
-143
@@ -46,11 +46,12 @@
|
|||||||
"qsl"
|
"qsl"
|
||||||
],
|
],
|
||||||
"total": 0,
|
"total": 0,
|
||||||
"builtin": true
|
"builtin": true,
|
||||||
|
"version": 2
|
||||||
},
|
},
|
||||||
"references": [
|
"references": [
|
||||||
{
|
{
|
||||||
"code": "1",
|
"code": "01",
|
||||||
"name": "Hokkaido",
|
"name": "Hokkaido",
|
||||||
"dxcc": 0,
|
"dxcc": 0,
|
||||||
"group": "",
|
"group": "",
|
||||||
@@ -58,16 +59,81 @@
|
|||||||
"valid": true
|
"valid": true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"code": "10",
|
"code": "02",
|
||||||
"name": "Gunma",
|
"name": "Aomori",
|
||||||
"dxcc": 0,
|
"dxcc": 0,
|
||||||
"group": "",
|
"group": "",
|
||||||
"subgrp": "",
|
"subgrp": "",
|
||||||
"valid": true
|
"valid": true
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"code": "03",
|
||||||
|
"name": "Iwate",
|
||||||
|
"dxcc": 0,
|
||||||
|
"group": "",
|
||||||
|
"subgrp": "",
|
||||||
|
"valid": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"code": "04",
|
||||||
|
"name": "Akita",
|
||||||
|
"dxcc": 0,
|
||||||
|
"group": "",
|
||||||
|
"subgrp": "",
|
||||||
|
"valid": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"code": "05",
|
||||||
|
"name": "Yamagata",
|
||||||
|
"dxcc": 0,
|
||||||
|
"group": "",
|
||||||
|
"subgrp": "",
|
||||||
|
"valid": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"code": "06",
|
||||||
|
"name": "Miyagi",
|
||||||
|
"dxcc": 0,
|
||||||
|
"group": "",
|
||||||
|
"subgrp": "",
|
||||||
|
"valid": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"code": "07",
|
||||||
|
"name": "Fukushima",
|
||||||
|
"dxcc": 0,
|
||||||
|
"group": "",
|
||||||
|
"subgrp": "",
|
||||||
|
"valid": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"code": "08",
|
||||||
|
"name": "Niigata",
|
||||||
|
"dxcc": 0,
|
||||||
|
"group": "",
|
||||||
|
"subgrp": "",
|
||||||
|
"valid": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"code": "09",
|
||||||
|
"name": "Nagano",
|
||||||
|
"dxcc": 0,
|
||||||
|
"group": "",
|
||||||
|
"subgrp": "",
|
||||||
|
"valid": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"code": "10",
|
||||||
|
"name": "Tokyo",
|
||||||
|
"dxcc": 0,
|
||||||
|
"group": "",
|
||||||
|
"subgrp": "",
|
||||||
|
"pattern": "\\bTok[iy]o\\b",
|
||||||
|
"valid": true
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"code": "11",
|
"code": "11",
|
||||||
"name": "Saitama",
|
"name": "Kanagawa",
|
||||||
"dxcc": 0,
|
"dxcc": 0,
|
||||||
"group": "",
|
"group": "",
|
||||||
"subgrp": "",
|
"subgrp": "",
|
||||||
@@ -83,16 +149,15 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"code": "13",
|
"code": "13",
|
||||||
"name": "Tokyo",
|
"name": "Saitama",
|
||||||
"dxcc": 0,
|
"dxcc": 0,
|
||||||
"group": "",
|
"group": "",
|
||||||
"subgrp": "",
|
"subgrp": "",
|
||||||
"pattern": "\\bTok[iy]o\\b",
|
|
||||||
"valid": true
|
"valid": true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"code": "14",
|
"code": "14",
|
||||||
"name": "Kanagawa",
|
"name": "Ibaraki",
|
||||||
"dxcc": 0,
|
"dxcc": 0,
|
||||||
"group": "",
|
"group": "",
|
||||||
"subgrp": "",
|
"subgrp": "",
|
||||||
@@ -100,7 +165,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"code": "15",
|
"code": "15",
|
||||||
"name": "Niigata",
|
"name": "Tochigi",
|
||||||
"dxcc": 0,
|
"dxcc": 0,
|
||||||
"group": "",
|
"group": "",
|
||||||
"subgrp": "",
|
"subgrp": "",
|
||||||
@@ -108,7 +173,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"code": "16",
|
"code": "16",
|
||||||
"name": "Toyama",
|
"name": "Gunma",
|
||||||
"dxcc": 0,
|
"dxcc": 0,
|
||||||
"group": "",
|
"group": "",
|
||||||
"subgrp": "",
|
"subgrp": "",
|
||||||
@@ -116,22 +181,6 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"code": "17",
|
"code": "17",
|
||||||
"name": "Ishikawa",
|
|
||||||
"dxcc": 0,
|
|
||||||
"group": "",
|
|
||||||
"subgrp": "",
|
|
||||||
"valid": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"code": "18",
|
|
||||||
"name": "Fukui",
|
|
||||||
"dxcc": 0,
|
|
||||||
"group": "",
|
|
||||||
"subgrp": "",
|
|
||||||
"valid": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"code": "19",
|
|
||||||
"name": "Yamanashi",
|
"name": "Yamanashi",
|
||||||
"dxcc": 0,
|
"dxcc": 0,
|
||||||
"group": "",
|
"group": "",
|
||||||
@@ -139,31 +188,7 @@
|
|||||||
"valid": true
|
"valid": true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"code": "2",
|
"code": "18",
|
||||||
"name": "Aomori",
|
|
||||||
"dxcc": 0,
|
|
||||||
"group": "",
|
|
||||||
"subgrp": "",
|
|
||||||
"valid": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"code": "20",
|
|
||||||
"name": "Nagano",
|
|
||||||
"dxcc": 0,
|
|
||||||
"group": "",
|
|
||||||
"subgrp": "",
|
|
||||||
"valid": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"code": "21",
|
|
||||||
"name": "Gifu",
|
|
||||||
"dxcc": 0,
|
|
||||||
"group": "",
|
|
||||||
"subgrp": "",
|
|
||||||
"valid": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"code": "22",
|
|
||||||
"name": "Shizuoka",
|
"name": "Shizuoka",
|
||||||
"dxcc": 0,
|
"dxcc": 0,
|
||||||
"group": "",
|
"group": "",
|
||||||
@@ -171,7 +196,15 @@
|
|||||||
"valid": true
|
"valid": true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"code": "23",
|
"code": "19",
|
||||||
|
"name": "Gifu",
|
||||||
|
"dxcc": 0,
|
||||||
|
"group": "",
|
||||||
|
"subgrp": "",
|
||||||
|
"valid": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"code": "20",
|
||||||
"name": "Aichi",
|
"name": "Aichi",
|
||||||
"dxcc": 0,
|
"dxcc": 0,
|
||||||
"group": "",
|
"group": "",
|
||||||
@@ -179,7 +212,7 @@
|
|||||||
"valid": true
|
"valid": true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"code": "24",
|
"code": "21",
|
||||||
"name": "Mie",
|
"name": "Mie",
|
||||||
"dxcc": 0,
|
"dxcc": 0,
|
||||||
"group": "",
|
"group": "",
|
||||||
@@ -187,15 +220,7 @@
|
|||||||
"valid": true
|
"valid": true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"code": "25",
|
"code": "22",
|
||||||
"name": "Shiga",
|
|
||||||
"dxcc": 0,
|
|
||||||
"group": "",
|
|
||||||
"subgrp": "",
|
|
||||||
"valid": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"code": "26",
|
|
||||||
"name": "Kyoto",
|
"name": "Kyoto",
|
||||||
"dxcc": 0,
|
"dxcc": 0,
|
||||||
"group": "",
|
"group": "",
|
||||||
@@ -203,23 +228,15 @@
|
|||||||
"valid": true
|
"valid": true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"code": "27",
|
"code": "23",
|
||||||
"name": "Osaka",
|
"name": "Shiga",
|
||||||
"dxcc": 0,
|
"dxcc": 0,
|
||||||
"group": "",
|
"group": "",
|
||||||
"subgrp": "",
|
"subgrp": "",
|
||||||
"valid": true
|
"valid": true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"code": "28",
|
"code": "24",
|
||||||
"name": "Hyogo",
|
|
||||||
"dxcc": 0,
|
|
||||||
"group": "",
|
|
||||||
"subgrp": "",
|
|
||||||
"valid": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"code": "29",
|
|
||||||
"name": "Nara",
|
"name": "Nara",
|
||||||
"dxcc": 0,
|
"dxcc": 0,
|
||||||
"group": "",
|
"group": "",
|
||||||
@@ -227,24 +244,56 @@
|
|||||||
"valid": true
|
"valid": true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"code": "3",
|
"code": "25",
|
||||||
"name": "Iwate",
|
"name": "Osaka",
|
||||||
"dxcc": 0,
|
"dxcc": 0,
|
||||||
"group": "",
|
"group": "",
|
||||||
"subgrp": "",
|
"subgrp": "",
|
||||||
"valid": true
|
"valid": true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"code": "30",
|
"code": "26",
|
||||||
"name": "Wakayama",
|
"name": "Wakayama",
|
||||||
"dxcc": 0,
|
"dxcc": 0,
|
||||||
"group": "",
|
"group": "",
|
||||||
"subgrp": "",
|
"subgrp": "",
|
||||||
"valid": true
|
"valid": true
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"code": "27",
|
||||||
|
"name": "Hyogo",
|
||||||
|
"dxcc": 0,
|
||||||
|
"group": "",
|
||||||
|
"subgrp": "",
|
||||||
|
"valid": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"code": "28",
|
||||||
|
"name": "Toyama",
|
||||||
|
"dxcc": 0,
|
||||||
|
"group": "",
|
||||||
|
"subgrp": "",
|
||||||
|
"valid": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"code": "29",
|
||||||
|
"name": "Fukui",
|
||||||
|
"dxcc": 0,
|
||||||
|
"group": "",
|
||||||
|
"subgrp": "",
|
||||||
|
"valid": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"code": "30",
|
||||||
|
"name": "Ishikawa",
|
||||||
|
"dxcc": 0,
|
||||||
|
"group": "",
|
||||||
|
"subgrp": "",
|
||||||
|
"valid": true
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"code": "31",
|
"code": "31",
|
||||||
"name": "Tottori",
|
"name": "Okayama",
|
||||||
"dxcc": 0,
|
"dxcc": 0,
|
||||||
"group": "",
|
"group": "",
|
||||||
"subgrp": "",
|
"subgrp": "",
|
||||||
@@ -260,31 +309,31 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"code": "33",
|
"code": "33",
|
||||||
"name": "Okayama",
|
|
||||||
"dxcc": 0,
|
|
||||||
"group": "",
|
|
||||||
"subgrp": "",
|
|
||||||
"valid": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"code": "34",
|
|
||||||
"name": "Hiroshima",
|
|
||||||
"dxcc": 0,
|
|
||||||
"group": "",
|
|
||||||
"subgrp": "",
|
|
||||||
"valid": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"code": "35",
|
|
||||||
"name": "Yamaguchi",
|
"name": "Yamaguchi",
|
||||||
"dxcc": 0,
|
"dxcc": 0,
|
||||||
"group": "",
|
"group": "",
|
||||||
"subgrp": "",
|
"subgrp": "",
|
||||||
"valid": true
|
"valid": true
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"code": "34",
|
||||||
|
"name": "Tottori",
|
||||||
|
"dxcc": 0,
|
||||||
|
"group": "",
|
||||||
|
"subgrp": "",
|
||||||
|
"valid": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"code": "35",
|
||||||
|
"name": "Hiroshima",
|
||||||
|
"dxcc": 0,
|
||||||
|
"group": "",
|
||||||
|
"subgrp": "",
|
||||||
|
"valid": true
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"code": "36",
|
"code": "36",
|
||||||
"name": "Tokushima",
|
"name": "Kagawa",
|
||||||
"dxcc": 0,
|
"dxcc": 0,
|
||||||
"group": "",
|
"group": "",
|
||||||
"subgrp": "",
|
"subgrp": "",
|
||||||
@@ -292,7 +341,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"code": "37",
|
"code": "37",
|
||||||
"name": "Kagawa",
|
"name": "Tokushima",
|
||||||
"dxcc": 0,
|
"dxcc": 0,
|
||||||
"group": "",
|
"group": "",
|
||||||
"subgrp": "",
|
"subgrp": "",
|
||||||
@@ -314,14 +363,6 @@
|
|||||||
"subgrp": "",
|
"subgrp": "",
|
||||||
"valid": true
|
"valid": true
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"code": "4",
|
|
||||||
"name": "Miyagi",
|
|
||||||
"dxcc": 0,
|
|
||||||
"group": "",
|
|
||||||
"subgrp": "",
|
|
||||||
"valid": true
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"code": "40",
|
"code": "40",
|
||||||
"name": "Fukuoka",
|
"name": "Fukuoka",
|
||||||
@@ -385,46 +426,6 @@
|
|||||||
"group": "",
|
"group": "",
|
||||||
"subgrp": "",
|
"subgrp": "",
|
||||||
"valid": true
|
"valid": true
|
||||||
},
|
|
||||||
{
|
|
||||||
"code": "5",
|
|
||||||
"name": "Akita",
|
|
||||||
"dxcc": 0,
|
|
||||||
"group": "",
|
|
||||||
"subgrp": "",
|
|
||||||
"valid": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"code": "6",
|
|
||||||
"name": "Yamagata",
|
|
||||||
"dxcc": 0,
|
|
||||||
"group": "",
|
|
||||||
"subgrp": "",
|
|
||||||
"valid": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"code": "7",
|
|
||||||
"name": "Fukushima",
|
|
||||||
"dxcc": 0,
|
|
||||||
"group": "",
|
|
||||||
"subgrp": "",
|
|
||||||
"valid": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"code": "8",
|
|
||||||
"name": "Ibaraki",
|
|
||||||
"dxcc": 0,
|
|
||||||
"group": "",
|
|
||||||
"subgrp": "",
|
|
||||||
"valid": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"code": "9",
|
|
||||||
"name": "Tochigi",
|
|
||||||
"dxcc": 0,
|
|
||||||
"group": "",
|
|
||||||
"subgrp": "",
|
|
||||||
"valid": true
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,101 @@
|
|||||||
|
package award
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
// WAJA is numbered by the JARL, and the numbering is NOT Japan's ordinary
|
||||||
|
// prefecture code.
|
||||||
|
//
|
||||||
|
// The catalog shipped with the government's JIS numbering instead — 01
|
||||||
|
// Hokkaido, 02 Aomori, 03 Iwate, 04 Miyagi… — which agrees with the JARL's for
|
||||||
|
// the first three prefectures and then diverges for thirty-five of the
|
||||||
|
// remaining forty-four. The names were right throughout, so the award still
|
||||||
|
// counted the right contacts; every reference simply carried the wrong number,
|
||||||
|
// which is what an operator sends to the JARL when they claim it.
|
||||||
|
//
|
||||||
|
// The two schemes agree often enough to look correct at a glance, so this pins
|
||||||
|
// the places they differ rather than a count. Each pair below is one the old
|
||||||
|
// list got wrong, and the comment is what the old list said.
|
||||||
|
func TestCatalogWAJAUsesTheJARLNumbering(t *testing.T) {
|
||||||
|
raw, ok := CatalogRefs("WAJA")
|
||||||
|
if !ok {
|
||||||
|
t.Fatal("WAJA has no reference list in the embedded catalog")
|
||||||
|
}
|
||||||
|
var refs []struct {
|
||||||
|
Code string `json:"code"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
Pattern string `json:"pattern"`
|
||||||
|
}
|
||||||
|
if err := json.Unmarshal(raw, &refs); err != nil {
|
||||||
|
t.Fatalf("WAJA references: %v", err)
|
||||||
|
}
|
||||||
|
if len(refs) != 47 {
|
||||||
|
t.Fatalf("WAJA has %d prefectures, want exactly 47", len(refs))
|
||||||
|
}
|
||||||
|
|
||||||
|
byName := map[string]string{}
|
||||||
|
byCode := map[string]string{}
|
||||||
|
for _, r := range refs {
|
||||||
|
byName[r.Name] = r.Code
|
||||||
|
if prev, dup := byCode[r.Code]; dup {
|
||||||
|
t.Errorf("number %s is on both %s and %s", r.Code, prev, r.Name)
|
||||||
|
}
|
||||||
|
byCode[r.Code] = r.Name
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, c := range []struct{ name, code string }{
|
||||||
|
{"Hokkaido", "01"}, // the one both schemes agree on, and the anchor
|
||||||
|
{"Miyagi", "06"}, // was 04
|
||||||
|
{"Akita", "04"}, // was 05
|
||||||
|
{"Niigata", "08"}, // was 15 — the JIS number
|
||||||
|
{"Nagano", "09"}, // was 20
|
||||||
|
{"Tokyo", "10"}, // was 13, the JIS number everyone recognises
|
||||||
|
{"Kanagawa", "11"}, // was 14
|
||||||
|
{"Saitama", "13"}, // was 11
|
||||||
|
{"Ibaraki", "14"}, // was 8
|
||||||
|
{"Gunma", "16"}, // was 10
|
||||||
|
{"Yamanashi", "17"}, // was 19
|
||||||
|
{"Kyoto", "22"}, // was 26
|
||||||
|
{"Osaka", "25"}, // was 27
|
||||||
|
{"Toyama", "28"}, // was 16
|
||||||
|
{"Ishikawa", "30"}, // was 17
|
||||||
|
{"Okayama", "31"}, // was 33
|
||||||
|
{"Tottori", "34"}, // was 31
|
||||||
|
{"Kagawa", "36"}, // was 37
|
||||||
|
{"Tokushima", "37"}, // was 36
|
||||||
|
{"Okinawa", "47"}, // unchanged: the far end of the list was already right
|
||||||
|
} {
|
||||||
|
if got := byName[c.name]; got != c.code {
|
||||||
|
t.Errorf("%s is numbered %q, want %q on the JARL list", c.name, got, c.code)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Two digits throughout, as the JARL prints them. Not cosmetic: the codes
|
||||||
|
// are strings, so "1" sorts between "09" and "10" and the panel showed the
|
||||||
|
// prefectures in an order no list anywhere uses.
|
||||||
|
for _, r := range refs {
|
||||||
|
if len(r.Code) != 2 {
|
||||||
|
t.Errorf("%s is numbered %q — the JARL list is two digits throughout", r.Name, r.Code)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The Tokyo spelling rule has to sit on Tokyo, and Tokyo moved. Left behind
|
||||||
|
// on the old number it would be matching QTHs for Saitama.
|
||||||
|
for _, r := range refs {
|
||||||
|
if r.Pattern == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if r.Name != "Tokyo" {
|
||||||
|
t.Errorf("%s (%s) carries the pattern %q, which belongs to Tokyo", r.Name, r.Code, r.Pattern)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if byName["Tokyo"] != "" {
|
||||||
|
for _, r := range refs {
|
||||||
|
if r.Name == "Tokyo" && r.Pattern == "" {
|
||||||
|
t.Error("Tokyo lost its spelling pattern in the renumbering — Tokio would stop counting")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -266,6 +266,48 @@ func (r *Repo) Upsert(ctx context.Context, awardCode string, ref Ref) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Rename changes a reference's CODE, keeping everything else about it.
|
||||||
|
//
|
||||||
|
// Wanted because a shipped list can simply be wrong: WAJA went out numbered by
|
||||||
|
// the Japanese state instead of by the JARL, and the only way to correct it was
|
||||||
|
// to delete all 47 references and import a new list — losing anything the
|
||||||
|
// operator had adjusted. The number is the one field an editor could not touch.
|
||||||
|
//
|
||||||
|
// A rename, not a delete plus an insert: everything the reference carries — its
|
||||||
|
// pattern, its DXCC list, its validity window — travels with it, which is the
|
||||||
|
// whole point of correcting a number rather than replacing an entry.
|
||||||
|
func (r *Repo) Rename(ctx context.Context, awardCode, oldCode, newCode string) error {
|
||||||
|
ac := strings.ToUpper(strings.TrimSpace(awardCode))
|
||||||
|
from := strings.ToUpper(strings.TrimSpace(oldCode))
|
||||||
|
to := strings.ToUpper(strings.TrimSpace(newCode))
|
||||||
|
if ac == "" || from == "" || to == "" {
|
||||||
|
return fmt.Errorf("empty award or reference code")
|
||||||
|
}
|
||||||
|
if from == to {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
// A collision would REPLACE the other reference and take its name, pattern
|
||||||
|
// and dates with it — one silently swallowing another, discovered much later
|
||||||
|
// as a reference that has quietly gone missing.
|
||||||
|
var n int
|
||||||
|
if err := r.db.QueryRowContext(ctx,
|
||||||
|
`SELECT COUNT(*) FROM award_references WHERE award_code = ? AND ref_code = ?`, ac, to).Scan(&n); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if n > 0 {
|
||||||
|
return fmt.Errorf("%s already has a reference %s", ac, to)
|
||||||
|
}
|
||||||
|
res, err := r.db.ExecContext(ctx,
|
||||||
|
`UPDATE award_references SET ref_code = ? WHERE award_code = ? AND ref_code = ?`, to, ac, from)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if rows, _ := res.RowsAffected(); rows == 0 {
|
||||||
|
return fmt.Errorf("%s has no reference %s", ac, from)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
// Delete removes one reference from an award.
|
// Delete removes one reference from an award.
|
||||||
func (r *Repo) Delete(ctx context.Context, awardCode, refCode string) error {
|
func (r *Repo) Delete(ctx context.Context, awardCode, refCode string) error {
|
||||||
_, err := r.db.ExecContext(ctx,
|
_, err := r.db.ExecContext(ctx,
|
||||||
|
|||||||
@@ -0,0 +1,129 @@
|
|||||||
|
package awardref
|
||||||
|
|
||||||
|
// One-IOTA DXCC entities: a table of the entities that ARE a single IOTA group.
|
||||||
|
//
|
||||||
|
// WHY IT EXISTS. QRZ.com carries <iota> for an operator who fills it in, and
|
||||||
|
// most do not. But for a great many entities the island reference follows from
|
||||||
|
// the entity alone — a station in Ascension Island is on AF-003, there is
|
||||||
|
// nothing else it could be — and the entity is known for every callsign, from
|
||||||
|
// cty.dat, without any callbook at all. So the reference can be filled for an
|
||||||
|
// operator with no QRZ subscription, on a station that has never touched a
|
||||||
|
// callbook, before the contact is logged.
|
||||||
|
//
|
||||||
|
// Only entities that map to EXACTLY ONE reference are here. France is not: a
|
||||||
|
// French station is usually on the mainland and on no island at all, and
|
||||||
|
// guessing would put a reference on hundreds of contacts that earn none.
|
||||||
|
//
|
||||||
|
// SOURCE: dxcc_matches_one_iota.json from the IOTA programme
|
||||||
|
// (www.iota-world.org/islands-on-the-air/downloads/), fetched 2026-08-17,
|
||||||
|
// 99 entities. It changes only when an entity appears or IOTA re-maps one, so
|
||||||
|
// it is a table here rather than a download: it then works offline, which is
|
||||||
|
// where a portable station usually is. To refresh, fetch that file again and
|
||||||
|
// re-emit this map, sorted by entity number.
|
||||||
|
//
|
||||||
|
// Entity names are comments only, joined from internal/dxcc for readability.
|
||||||
|
var iotaByDXCC = map[int]string{
|
||||||
|
5: "EU-002", // Aland Islands
|
||||||
|
10: "AF-002", // Amsterdam & St. Paul Is.
|
||||||
|
12: "NA-022", // Anguilla
|
||||||
|
17: "NA-020", // Aves Island
|
||||||
|
20: "OC-089", // Baker & Howland Islands
|
||||||
|
21: "EU-004", // Balearic Islands
|
||||||
|
24: "AN-002", // Bouvet
|
||||||
|
29: "AF-004", // Canary Islands
|
||||||
|
34: "OC-038", // Chatham Islands
|
||||||
|
35: "OC-002", // Christmas Island
|
||||||
|
36: "NA-011", // Clipperton Island
|
||||||
|
37: "NA-012", // Cocos Island
|
||||||
|
38: "OC-003", // Cocos (Keeling) Islands
|
||||||
|
41: "AF-008", // Crozet Island
|
||||||
|
43: "NA-095", // Desecheo Island
|
||||||
|
45: "EU-001", // Dodecanese
|
||||||
|
62: "NA-021", // Barbados
|
||||||
|
64: "NA-005", // Bermuda
|
||||||
|
65: "NA-023", // British Virgin Islands
|
||||||
|
69: "NA-016", // Cayman Islands
|
||||||
|
71: "SA-004", // Galapagos Islands
|
||||||
|
82: "NA-097", // Jamaica
|
||||||
|
84: "NA-107", // Martinique
|
||||||
|
91: "SA-036", // Aruba
|
||||||
|
94: "NA-100", // Antigua & Barbuda
|
||||||
|
95: "NA-101", // Dominica
|
||||||
|
96: "NA-103", // Montserrat
|
||||||
|
97: "NA-108", // St. Lucia
|
||||||
|
99: "AF-011", // Glorioso Islands
|
||||||
|
103: "OC-026", // Guam
|
||||||
|
105: "NA-015", // Guantanamo Bay
|
||||||
|
106: "EU-114", // Guernsey
|
||||||
|
111: "AN-003", // Heard Island
|
||||||
|
114: "EU-116", // Isle Of Man
|
||||||
|
118: "EU-022", // Jan Mayen
|
||||||
|
123: "OC-023", // Johnston Island
|
||||||
|
131: "AF-048", // Kerguelen Islands
|
||||||
|
133: "OC-039", // Kermadec Islands
|
||||||
|
138: "OC-020", // Kure Island
|
||||||
|
141: "SA-002", // Falkland Islands
|
||||||
|
147: "OC-004", // Lord Howe Island
|
||||||
|
153: "AN-005", // Macquarie Island
|
||||||
|
157: "OC-031", // Nauru
|
||||||
|
159: "AS-013", // Maldives
|
||||||
|
161: "SA-007", // Malpelo Island
|
||||||
|
165: "AF-049", // Mauritius
|
||||||
|
166: "OC-086", // Mariana Islands
|
||||||
|
167: "EU-053", // Market Reef
|
||||||
|
169: "AF-027", // Mayotte
|
||||||
|
171: "OC-072", // Mellish Reef
|
||||||
|
174: "OC-030", // Midway Island
|
||||||
|
177: "OC-073", // Minami Torishima
|
||||||
|
182: "NA-098", // Navassa Island
|
||||||
|
188: "OC-040", // Niue
|
||||||
|
189: "OC-005", // Norfolk Island
|
||||||
|
190: "OC-097", // Samoa
|
||||||
|
195: "AF-039", // Annobon Island
|
||||||
|
199: "AN-004", // Peter 1 Island
|
||||||
|
201: "AF-021", // Pr. Edward & Marion Is.
|
||||||
|
205: "AF-003", // Ascension Island
|
||||||
|
207: "AF-017", // Rodriguez Island
|
||||||
|
211: "NA-063", // Sable Island
|
||||||
|
217: "SA-013", // San Felix & San Ambrosio
|
||||||
|
222: "EU-018", // Faroe Islands
|
||||||
|
238: "AN-008", // South Orkney Islands
|
||||||
|
240: "AN-009", // South Sandwich Islands
|
||||||
|
241: "AN-010", // South Shetland Islands
|
||||||
|
247: "AS-051", // Spratly Islands
|
||||||
|
249: "NA-104", // St. Kitts & Nevis
|
||||||
|
250: "AF-022", // St. Helena
|
||||||
|
252: "NA-094", // St. Paul Island
|
||||||
|
253: "SA-014", // St. Peter & St. Paul
|
||||||
|
257: "EU-023", // Malta
|
||||||
|
270: "OC-048", // Tokelau Islands
|
||||||
|
273: "SA-010", // Trindade & Martim Vaz
|
||||||
|
276: "AF-031", // Tromelin Island
|
||||||
|
277: "NA-032", // St. Pierre & Miquelon
|
||||||
|
282: "OC-015", // Tuvalu
|
||||||
|
283: "AS-004", // Uk Base Areas On Cyprus
|
||||||
|
285: "NA-106", // Us Virgin Islands
|
||||||
|
297: "OC-053", // Wake Island
|
||||||
|
301: "OC-017", // Western Kiribati
|
||||||
|
303: "OC-007", // Willis Island
|
||||||
|
381: "AS-019", // Singapore
|
||||||
|
411: "AF-007", // Comoros
|
||||||
|
453: "AF-016", // Reunion Island
|
||||||
|
460: "OC-060", // Rotuma Island
|
||||||
|
489: "OC-112", // Conway Reef
|
||||||
|
490: "OC-018", // Banaba Island
|
||||||
|
505: "AS-110", // Pratas Island
|
||||||
|
506: "AS-116", // Scarborough Reef
|
||||||
|
509: "OC-027", // Marquesas Islands
|
||||||
|
512: "OC-176", // Chesterfield Islands
|
||||||
|
513: "OC-182", // Ducie Island
|
||||||
|
515: "OC-200", // Swains Island
|
||||||
|
516: "NA-146", // St. Barthelemy
|
||||||
|
517: "SA-099", // Curacao
|
||||||
|
519: "NA-145", // Saba & St. Eustatius
|
||||||
|
520: "SA-006", // Bonaire
|
||||||
|
}
|
||||||
|
|
||||||
|
// IOTAForDXCC returns the island reference of a DXCC entity that is a single
|
||||||
|
// IOTA group, or "" for an entity that holds several islands or none.
|
||||||
|
func IOTAForDXCC(dxcc int) string { return iotaByDXCC[dxcc] }
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
package awardref
|
||||||
|
|
||||||
|
import (
|
||||||
|
"regexp"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
// The entities an operator meets: an island group that is its own DXCC, and a
|
||||||
|
// mainland country that is not.
|
||||||
|
func TestIOTAForDXCC(t *testing.T) {
|
||||||
|
cases := []struct {
|
||||||
|
dxcc int
|
||||||
|
want string
|
||||||
|
why string
|
||||||
|
}{
|
||||||
|
{205, "AF-003", "Ascension Island is one island and one reference"},
|
||||||
|
{5, "EU-002", "Aland Islands"},
|
||||||
|
{12, "NA-022", "Anguilla"},
|
||||||
|
{24, "AN-002", "Bouvet — the entity whose entry is checked most often and worked least"},
|
||||||
|
// France holds hundreds of islands and, far more to the point, a
|
||||||
|
// mainland. Filling a reference here would earn nothing and would put
|
||||||
|
// one on nearly every European contact in the log.
|
||||||
|
{227, "", "France is not one IOTA"},
|
||||||
|
{291, "", "the United States is not one IOTA"},
|
||||||
|
{0, "", "no entity resolved"},
|
||||||
|
{99999, "", "not an entity at all"},
|
||||||
|
}
|
||||||
|
for _, c := range cases {
|
||||||
|
if got := IOTAForDXCC(c.dxcc); got != c.want {
|
||||||
|
t.Errorf("IOTAForDXCC(%d) = %q, want %q — %s", c.dxcc, got, c.want, c.why)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Every reference in the table must be a well-formed IOTA reference, because
|
||||||
|
// one that is not would be written onto a contact's award references and count
|
||||||
|
// for nothing — and would then have to be found by hand, one QSO at a time.
|
||||||
|
func TestEveryOneIOTAEntryIsWellFormed(t *testing.T) {
|
||||||
|
ref := regexp.MustCompile(`^(AF|AN|AS|EU|NA|OC|SA)-\d{3}$`)
|
||||||
|
if len(iotaByDXCC) < 50 {
|
||||||
|
t.Fatalf("the table holds %d entities — it has been truncated", len(iotaByDXCC))
|
||||||
|
}
|
||||||
|
for dxcc, r := range iotaByDXCC {
|
||||||
|
if dxcc <= 0 {
|
||||||
|
t.Errorf("entity number %d is not a DXCC entity", dxcc)
|
||||||
|
}
|
||||||
|
if !ref.MatchString(r) {
|
||||||
|
t.Errorf("entity %d maps to %q, which is not an IOTA reference", dxcc, r)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,112 @@
|
|||||||
|
package awardref
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"path/filepath"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"hamlog/internal/db"
|
||||||
|
)
|
||||||
|
|
||||||
|
func renameRepo(t *testing.T) *Repo {
|
||||||
|
t.Helper()
|
||||||
|
conn, err := db.Open(filepath.Join(t.TempDir(), "a.db"))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("open: %v", err)
|
||||||
|
}
|
||||||
|
t.Cleanup(func() { conn.Close() })
|
||||||
|
return NewRepo(conn)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Correcting a reference's number must keep the reference.
|
||||||
|
//
|
||||||
|
// WAJA shipped numbered by the Japanese state instead of by the JARL, and until
|
||||||
|
// now the only way to fix that was to delete all 47 references and import a new
|
||||||
|
// list — losing anything the operator had adjusted. A rename keeps the pattern,
|
||||||
|
// the entity list and the validity window, because a wrong NUMBER is all that
|
||||||
|
// was wrong.
|
||||||
|
func TestRenameKeepsEverythingButTheCode(t *testing.T) {
|
||||||
|
r := renameRepo(t)
|
||||||
|
ctx := context.Background()
|
||||||
|
if err := r.Upsert(ctx, "WAJA", Ref{
|
||||||
|
Code: "13", Name: "Tokyo", Pattern: `\bTok[iy]o\b`, Valid: true,
|
||||||
|
DXCCList: []int{339}, ValidFrom: "1970-01-01",
|
||||||
|
}); err != nil {
|
||||||
|
t.Fatalf("seed: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := r.Rename(ctx, "WAJA", "13", "10"); err != nil {
|
||||||
|
t.Fatalf("rename: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
refs, err := r.List(ctx, "WAJA")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("list: %v", err)
|
||||||
|
}
|
||||||
|
if len(refs) != 1 {
|
||||||
|
t.Fatalf("WAJA holds %d references after a rename, want 1 — it was copied, not renamed", len(refs))
|
||||||
|
}
|
||||||
|
got := refs[0]
|
||||||
|
if got.Code != "10" {
|
||||||
|
t.Errorf("code = %q, want 10", got.Code)
|
||||||
|
}
|
||||||
|
if got.Name != "Tokyo" || got.Pattern != `\bTok[iy]o\b` {
|
||||||
|
t.Errorf("the reference lost what it carried: name=%q pattern=%q", got.Name, got.Pattern)
|
||||||
|
}
|
||||||
|
if len(got.DXCCList) != 1 || got.DXCCList[0] != 339 || got.ValidFrom != "1970-01-01" {
|
||||||
|
t.Errorf("the reference lost its entity list or dates: %+v", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A number already in use must be refused. Left to REPLACE, the rename would
|
||||||
|
// take the other reference's name, pattern and dates with it — one entry
|
||||||
|
// silently swallowing another, found much later as a prefecture that has
|
||||||
|
// quietly gone missing from the list.
|
||||||
|
func TestRenameRefusesANumberAlreadyTaken(t *testing.T) {
|
||||||
|
r := renameRepo(t)
|
||||||
|
ctx := context.Background()
|
||||||
|
if err := r.Upsert(ctx, "WAJA", Ref{Code: "10", Name: "Gunma", Valid: true}); err != nil {
|
||||||
|
t.Fatalf("seed: %v", err)
|
||||||
|
}
|
||||||
|
if err := r.Upsert(ctx, "WAJA", Ref{Code: "13", Name: "Tokyo", Valid: true}); err != nil {
|
||||||
|
t.Fatalf("seed: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := r.Rename(ctx, "WAJA", "13", "10"); err == nil {
|
||||||
|
t.Fatal("renaming onto an existing number was accepted — one reference would have eaten the other")
|
||||||
|
}
|
||||||
|
refs, _ := r.List(ctx, "WAJA")
|
||||||
|
if len(refs) != 2 {
|
||||||
|
t.Fatalf("WAJA holds %d references, want both still there", len(refs))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Renaming something that is not there is an error, not a silent no-op: it
|
||||||
|
// means the editor and the store disagree about what the award holds.
|
||||||
|
func TestRenameAnUnknownReferenceFails(t *testing.T) {
|
||||||
|
r := renameRepo(t)
|
||||||
|
if err := r.Rename(context.Background(), "WAJA", "99", "10"); err == nil {
|
||||||
|
t.Error("renaming a reference the award does not have was accepted")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Codes are stored upper-cased, so a rename must compare the same way — else
|
||||||
|
// "eu-048" onto "EU-048" looks like a move and is really the same reference,
|
||||||
|
// which the collision check has to catch.
|
||||||
|
func TestRenameIsCaseInsensitive(t *testing.T) {
|
||||||
|
r := renameRepo(t)
|
||||||
|
ctx := context.Background()
|
||||||
|
if err := r.Upsert(ctx, "IOTA", Ref{Code: "EU-048", Name: "Belle-Ile", Valid: true}); err != nil {
|
||||||
|
t.Fatalf("seed: %v", err)
|
||||||
|
}
|
||||||
|
if err := r.Rename(ctx, "iota", "eu-048", "eu-048"); err != nil {
|
||||||
|
t.Errorf("renaming a reference to itself in another case failed: %v", err)
|
||||||
|
}
|
||||||
|
if err := r.Rename(ctx, "IOTA", "eu-048", "eu-049"); err != nil {
|
||||||
|
t.Fatalf("rename: %v", err)
|
||||||
|
}
|
||||||
|
refs, _ := r.List(ctx, "IOTA")
|
||||||
|
if len(refs) != 1 || refs[0].Code != "EU-049" {
|
||||||
|
t.Errorf("references = %+v, want the one renamed to EU-049 and upper-cased", refs)
|
||||||
|
}
|
||||||
|
}
|
||||||
+93
-8
@@ -79,6 +79,9 @@ type Manager struct {
|
|||||||
|
|
||||||
pollEvery time.Duration
|
pollEvery time.Duration
|
||||||
cmdDelay time.Duration // pause after each command (some rigs need it)
|
cmdDelay time.Duration // pause after each command (some rigs need it)
|
||||||
|
// freqOffset is the transverter offset in Hz — see SetFreqOffset. Added to
|
||||||
|
// what the rig reports, taken off what it is told.
|
||||||
|
freqOffset int64
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewManager(emit func(RigState)) *Manager {
|
func NewManager(emit func(RigState)) *Manager {
|
||||||
@@ -181,12 +184,65 @@ func (m *Manager) stopLocked() {
|
|||||||
iv.Interrupt()
|
iv.Interrupt()
|
||||||
}
|
}
|
||||||
if done != nil {
|
if done != nil {
|
||||||
<-done
|
// Bounded, and loud when it expires.
|
||||||
|
//
|
||||||
|
// This used to be a bare <-done. A poll goroutine wedged in a serial read
|
||||||
|
// then held every caller for ever: each restart attempt blocked inside
|
||||||
|
// Start before it could even try to connect, so the rig stayed dead and
|
||||||
|
// NOTHING was written to the log — the operator saw a CAT link that would
|
||||||
|
// not come back and no reason anywhere. Shutdown blocked on the same wait.
|
||||||
|
//
|
||||||
|
// Ten seconds is far longer than any honest disconnect. Past that the old
|
||||||
|
// poller is not coming back, and carrying on without it — noisily — beats
|
||||||
|
// freezing the application around it. The abandoned goroutine still holds
|
||||||
|
// its port, which is exactly what the log line has to say, because the
|
||||||
|
// next connect will fail because of it.
|
||||||
|
select {
|
||||||
|
case <-done:
|
||||||
|
case <-time.After(10 * time.Second):
|
||||||
|
name := "cat"
|
||||||
|
if b != nil {
|
||||||
|
name = b.Name()
|
||||||
|
}
|
||||||
|
debugLog.Printf("%s: poll loop did not stop within 10s — abandoning it; "+
|
||||||
|
"its port stays open, so the next connect may fail until OpsLog is restarted", name)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// SetFreqOffset sets the transverter offset: the number of hertz between what
|
||||||
|
// the RIG is tuned to and where the station is actually on the air.
|
||||||
|
//
|
||||||
|
// A 28 MHz IF driving a 144 MHz transverter is an offset of +116 MHz. Everything
|
||||||
|
// above this layer — the entry form, the band, the log, the cluster, the shared
|
||||||
|
// CAT servers — then works in real frequencies, and the rig keeps seeing its own.
|
||||||
|
//
|
||||||
|
// Zero disables it, which is why it is a plain number and not a flag plus a
|
||||||
|
// number: "enabled with an offset of nothing" and "disabled" are the same thing
|
||||||
|
// to everyone downstream.
|
||||||
|
func (m *Manager) SetFreqOffset(hz int64) {
|
||||||
|
m.mu.Lock()
|
||||||
|
m.freqOffset = hz
|
||||||
|
m.mu.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
// freqOffsetHz reads the offset.
|
||||||
|
func (m *Manager) freqOffsetHz() int64 {
|
||||||
|
m.mu.RLock()
|
||||||
|
defer m.mu.RUnlock()
|
||||||
|
return m.freqOffset
|
||||||
|
}
|
||||||
|
|
||||||
// SetFrequency dispatches a SetFreq call to the CAT goroutine.
|
// SetFrequency dispatches a SetFreq call to the CAT goroutine.
|
||||||
|
//
|
||||||
|
// The caller speaks in REAL frequencies (a 2 m spot is 144.300), so the offset
|
||||||
|
// comes back off before the rig hears it. Without this the offset would be a
|
||||||
|
// display trick: the readout would say 144 and every spot click, band change and
|
||||||
|
// memory recall would send the rig somewhere 116 MHz away.
|
||||||
func (m *Manager) SetFrequency(hz int64) error {
|
func (m *Manager) SetFrequency(hz int64) error {
|
||||||
|
if off := m.freqOffsetHz(); off != 0 && hz > off {
|
||||||
|
hz -= off
|
||||||
|
}
|
||||||
return m.exec(func(b Backend) error { return b.SetFrequency(hz) })
|
return m.exec(func(b Backend) error { return b.SetFrequency(hz) })
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -215,6 +271,10 @@ type splitSetter interface {
|
|||||||
// band when it was transmitting on the DX's own frequency. A refusal WSJT-X can
|
// band when it was transmitting on the DX's own frequency. A refusal WSJT-X can
|
||||||
// report is worth far more than a success it cannot check.
|
// report is worth far more than a success it cannot check.
|
||||||
func (m *Manager) SetSplit(on bool, txHz int64) error {
|
func (m *Manager) SetSplit(on bool, txHz int64) error {
|
||||||
|
// Real frequency in, IF frequency out — same as SetFrequency.
|
||||||
|
if off := m.freqOffsetHz(); off != 0 && txHz > off {
|
||||||
|
txHz -= off
|
||||||
|
}
|
||||||
return m.exec(func(b Backend) error {
|
return m.exec(func(b Backend) error {
|
||||||
s, ok := b.(splitSetter)
|
s, ok := b.(splitSetter)
|
||||||
if !ok {
|
if !ok {
|
||||||
@@ -230,12 +290,20 @@ func (m *Manager) SetSplit(on bool, txHz int64) error {
|
|||||||
// the backend picks a default when it's empty. (Status-based colouring can be
|
// the backend picks a default when it's empty. (Status-based colouring can be
|
||||||
// driven later by setting Color per spot.)
|
// driven later by setting Color per spot.)
|
||||||
type SpotInfo struct {
|
type SpotInfo struct {
|
||||||
FreqHz int64
|
FreqHz int64
|
||||||
Callsign string
|
Callsign string
|
||||||
Mode string
|
Mode string
|
||||||
Color string
|
// Color is the TEXT colour of the callsign on the panadapter, BackgroundColor
|
||||||
Comment string
|
// the plate behind it. Both are #AARRGGBB — the alpha channel first, which is
|
||||||
LifetimeSec int // panadapter display seconds before auto-removal (0 = backend default)
|
// SmartSDR's order and not the web's.
|
||||||
|
//
|
||||||
|
// Two colours rather than one because that is what makes a spot readable at a
|
||||||
|
// glance on a busy waterfall: the fill carries the status and the text stays
|
||||||
|
// legible against it. An empty background leaves the radio's own default.
|
||||||
|
Color string
|
||||||
|
BackgroundColor string
|
||||||
|
Comment string
|
||||||
|
LifetimeSec int // panadapter display seconds before auto-removal (0 = backend default)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Spotter is an OPTIONAL backend capability: show cluster spots on the radio
|
// Spotter is an OPTIONAL backend capability: show cluster spots on the radio
|
||||||
@@ -415,7 +483,10 @@ type FlexController interface {
|
|||||||
SetRXAntenna(string) error
|
SetRXAntenna(string) error
|
||||||
SetTXAntenna(string) error
|
SetTXAntenna(string) error
|
||||||
SetActiveSlice(int) error // focus slice idx so commands target it
|
SetActiveSlice(int) error // focus slice idx so commands target it
|
||||||
SetTXSlice(int) error // make slice idx the transmitter (tx=1)
|
// ZoomPan sets the visible width (MHz) of the active slice's panadapter and
|
||||||
|
// keeps freqMHz inside it, re-centring when it must. See Flex.ZoomPan.
|
||||||
|
ZoomPan(bandwidthMHz, freqMHz float64, centre bool) error
|
||||||
|
SetTXSlice(int) error // make slice idx the transmitter (tx=1)
|
||||||
SetSplit(bool) error
|
SetSplit(bool) error
|
||||||
SetNB(bool) error
|
SetNB(bool) error
|
||||||
SetNBLevel(int) error
|
SetNBLevel(int) error
|
||||||
@@ -744,6 +815,20 @@ func (m *Manager) run(b Backend, stop, done chan struct{}, cmds chan func(), pol
|
|||||||
ns.Enabled = true
|
ns.Enabled = true
|
||||||
ns.Backend = b.Name()
|
ns.Backend = b.Name()
|
||||||
ns.UpdatedAt = time.Now()
|
ns.UpdatedAt = time.Now()
|
||||||
|
// Transverter offset: the rig reports its IF, the operator is on the
|
||||||
|
// real band. Applied BEFORE the band is worked out, or a 28 MHz IF
|
||||||
|
// behind a 2 m transverter would log every contact on 10 m — and the
|
||||||
|
// band the backend may already have filled in is the IF's, so it is
|
||||||
|
// recomputed rather than trusted.
|
||||||
|
if off := m.freqOffsetHz(); off != 0 {
|
||||||
|
if ns.FreqHz != 0 {
|
||||||
|
ns.FreqHz += off
|
||||||
|
ns.Band = ""
|
||||||
|
}
|
||||||
|
if ns.RxFreqHz != 0 {
|
||||||
|
ns.RxFreqHz += off
|
||||||
|
}
|
||||||
|
}
|
||||||
if ns.FreqHz != 0 && ns.Band == "" {
|
if ns.FreqHz != 0 && ns.Band == "" {
|
||||||
ns.Band = BandFromHz(ns.FreqHz)
|
ns.Band = BandFromHz(ns.FreqHz)
|
||||||
}
|
}
|
||||||
|
|||||||
+197
-7
@@ -66,18 +66,45 @@ type Flex struct {
|
|||||||
pendingSplit map[int]bool // seq → awaiting the new TX slice's index (split create)
|
pendingSplit map[int]bool // seq → awaiting the new TX slice's index (split create)
|
||||||
spotCall map[int]string // spot index → callsign (to fill the call on a panadapter click)
|
spotCall map[int]string // spot index → callsign (to fill the call on a panadapter click)
|
||||||
spotMode map[int]string // spot index → ADIF mode, so a click can also set the slice mode (SmartSDR tunes the spot's freq but not its mode)
|
spotMode map[int]string // spot index → ADIF mode, so a click can also set the slice mode (SmartSDR tunes the spot's freq but not its mode)
|
||||||
spotByCall map[string]int // callsign → live spot index, so re-spotting a call replaces its old spot (WSJT decodes re-fire every cycle)
|
spotFreq map[int]int64 // spot index → Hz, so a click can report where it was (the trigger message carries only the index)
|
||||||
sentCmds map[int]string // seq → command text, so an R<seq> error names the command
|
pendingSpotFreq map[int]int64 // seq → Hz, paired with pendingSpot
|
||||||
|
// panWindow is what each panadapter is currently showing, from its own status
|
||||||
|
// (centre and width, both MHz). Tracked because a zoom that only changes the
|
||||||
|
// WIDTH keeps the old centre, and the frequency the operator just clicked can
|
||||||
|
// end up outside the new window — see ZoomPan.
|
||||||
|
panWindow map[string]panView
|
||||||
|
|
||||||
|
// spotSig is what each live spot LOOKS like, and when it was drawn. A
|
||||||
|
// callsign spotted again with the same frequency, colour and comment does not
|
||||||
|
// need to be removed and re-added: the panadapter would not change by one
|
||||||
|
// pixel, and a busy RBN feed re-spots the same station every few seconds. One
|
||||||
|
// two-minute session sent 2 128 adds and 1 634 removes, 88 of them for a
|
||||||
|
// single callsign — see SendSpot.
|
||||||
|
spotSig map[string]string
|
||||||
|
spotSent map[string]time.Time
|
||||||
|
|
||||||
|
spotByCall map[string]int // callsign → live spot index, so re-spotting a call replaces its old spot (WSJT decodes re-fire every cycle)
|
||||||
|
sentCmds map[int]string // seq → command text, so an R<seq> error names the command
|
||||||
|
|
||||||
// OnSpotClick is called (off the reader goroutine's hot path) when the user
|
// OnSpotClick is called (off the reader goroutine's hot path) when the user
|
||||||
// clicks one of our spots on the panadapter, with the spot's callsign and
|
// clicks one of our spots on the panadapter, with the spot's callsign, its
|
||||||
// frequency. The host wires this to fill the entry form. Set before Connect.
|
// frequency and the mode it was spotted in — everything the host knows about
|
||||||
OnSpotClick func(callsign string, freqHz int64)
|
// the spot, since the radio's own notification carries only an index. The host
|
||||||
|
// wires this to fill the entry form and to size the panadapter. Set before Connect.
|
||||||
|
OnSpotClick func(callsign string, freqHz int64, mode string)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// panView is one panadapter's visible window, in MHz.
|
||||||
|
type panView struct{ centre, width float64 }
|
||||||
|
|
||||||
type flexSlice struct {
|
type flexSlice struct {
|
||||||
freqHz int64
|
freqHz int64
|
||||||
mode string // raw Flex mode (USB/LSB/CW/DIGU/…)
|
mode string // raw Flex mode (USB/LSB/CW/DIGU/…)
|
||||||
|
// pan is the panadapter this slice is displayed on ("0x40000000"), taken
|
||||||
|
// from the slice status. Kept PER SLICE rather than as one radio-wide id:
|
||||||
|
// with two slices on two bands there are two panadapters, and zooming the
|
||||||
|
// wrong one moves a display the operator is not looking at.
|
||||||
|
pan string
|
||||||
active bool
|
active bool
|
||||||
tx bool
|
tx bool
|
||||||
inUse bool
|
inUse bool
|
||||||
@@ -187,7 +214,7 @@ func NewFlex(host string, port int, spotsEnabled bool) *Flex {
|
|||||||
return &Flex{
|
return &Flex{
|
||||||
host: strings.TrimSpace(host), port: port,
|
host: strings.TrimSpace(host), port: port,
|
||||||
slices: map[int]*flexSlice{}, spotsEnabled: spotsEnabled,
|
slices: map[int]*flexSlice{}, spotsEnabled: spotsEnabled,
|
||||||
spotIdx: map[int]bool{}, pendingSpot: map[int]string{}, pendingSpotMode: map[int]string{}, spotCall: map[int]string{}, spotMode: map[int]string{}, spotByCall: map[string]int{}, pendingSplit: map[int]bool{},
|
spotIdx: map[int]bool{}, pendingSpot: map[int]string{}, pendingSpotMode: map[int]string{}, spotCall: map[int]string{}, spotMode: map[int]string{}, spotFreq: map[int]int64{}, pendingSpotFreq: map[int]int64{}, panWindow: map[string]panView{}, spotSig: map[string]string{}, spotSent: map[string]time.Time{}, spotByCall: map[string]int{}, pendingSplit: map[int]bool{},
|
||||||
meterMeta: map[int]meterInfo{}, meterVal: map[int]float64{}, meterSub: map[int]bool{},
|
meterMeta: map[int]meterInfo{}, meterVal: map[int]float64{}, meterSub: map[int]bool{},
|
||||||
sentCmds: map[int]string{}, txSetAt: map[string]time.Time{},
|
sentCmds: map[int]string{}, txSetAt: map[string]time.Time{},
|
||||||
pinnedSlice: -1,
|
pinnedSlice: -1,
|
||||||
@@ -248,6 +275,7 @@ func (f *Flex) Connect() error {
|
|||||||
f.send("sub cwx all") // CWX: the LIVE CW speed/pitch/break-in (transmit holds only a static default)
|
f.send("sub cwx all") // CWX: the LIVE CW speed/pitch/break-in (transmit holds only a static default)
|
||||||
f.send("sub profile all") // mic/global/tx profiles (for the mic-profile dropdown)
|
f.send("sub profile all") // mic/global/tx profiles (for the mic-profile dropdown)
|
||||||
f.send("profile mic info") // request the current mic profile list + selection
|
f.send("profile mic info") // request the current mic profile list + selection
|
||||||
|
f.send("sub pan all") // panadapter centre/bandwidth, so a zoom knows where the display already is
|
||||||
f.send("sub client all") // learn the GUI client (SmartSDR) so we can bind to it (below)
|
f.send("sub client all") // learn the GUI client (SmartSDR) so we can bind to it (below)
|
||||||
f.startMeters(conn) // open the UDP VITA-49 stream for live meters
|
f.startMeters(conn) // open the UDP VITA-49 stream for live meters
|
||||||
if f.spotsEnabled {
|
if f.spotsEnabled {
|
||||||
@@ -341,11 +369,12 @@ func (f *Flex) reader(conn net.Conn) {
|
|||||||
f.mu.Lock()
|
f.mu.Lock()
|
||||||
call := f.spotCall[idx]
|
call := f.spotCall[idx]
|
||||||
mode := f.spotMode[idx]
|
mode := f.spotMode[idx]
|
||||||
|
hz := f.spotFreq[idx]
|
||||||
handler := f.OnSpotClick
|
handler := f.OnSpotClick
|
||||||
f.mu.Unlock()
|
f.mu.Unlock()
|
||||||
if call != "" && handler != nil {
|
if call != "" && handler != nil {
|
||||||
debugLog.Printf("Flex: spot %d triggered → %s (mode %s)", idx, call, mode)
|
debugLog.Printf("Flex: spot %d triggered → %s (mode %s)", idx, call, mode)
|
||||||
go handler(call, 0)
|
go handler(call, hz, mode)
|
||||||
// SmartSDR tunes the spot's frequency on click but does NOT apply
|
// SmartSDR tunes the spot's frequency on click but does NOT apply
|
||||||
// its mode=, so set the slice mode ourselves from what we spotted.
|
// its mode=, so set the slice mode ourselves from what we spotted.
|
||||||
if mode != "" {
|
if mode != "" {
|
||||||
@@ -388,14 +417,17 @@ func (f *Flex) reader(conn net.Conn) {
|
|||||||
f.mu.Lock()
|
f.mu.Lock()
|
||||||
call, pending := f.pendingSpot[seq]
|
call, pending := f.pendingSpot[seq]
|
||||||
spotMode := f.pendingSpotMode[seq]
|
spotMode := f.pendingSpotMode[seq]
|
||||||
|
spotFreq := f.pendingSpotFreq[seq]
|
||||||
if pending {
|
if pending {
|
||||||
delete(f.pendingSpot, seq)
|
delete(f.pendingSpot, seq)
|
||||||
delete(f.pendingSpotMode, seq)
|
delete(f.pendingSpotMode, seq)
|
||||||
|
delete(f.pendingSpotFreq, seq)
|
||||||
}
|
}
|
||||||
if pending && ok && len(parts) >= 3 {
|
if pending && ok && len(parts) >= 3 {
|
||||||
if idx, e := strconv.Atoi(strings.TrimSpace(parts[2])); e == nil {
|
if idx, e := strconv.Atoi(strings.TrimSpace(parts[2])); e == nil {
|
||||||
f.spotCall[idx] = call
|
f.spotCall[idx] = call
|
||||||
f.spotMode[idx] = spotMode
|
f.spotMode[idx] = spotMode
|
||||||
|
f.spotFreq[idx] = spotFreq
|
||||||
f.spotIdx[idx] = true
|
f.spotIdx[idx] = true
|
||||||
f.spotByCall[strings.ToUpper(call)] = idx
|
f.spotByCall[strings.ToUpper(call)] = idx
|
||||||
}
|
}
|
||||||
@@ -692,6 +724,32 @@ func (f *Flex) handleStatus(payload string) {
|
|||||||
}
|
}
|
||||||
f.mu.Unlock()
|
f.mu.Unlock()
|
||||||
}
|
}
|
||||||
|
// Panadapter — "display pan 0x40000000 center=14.075 bandwidth=0.2 …".
|
||||||
|
// Only the window matters here; everything else about the display is
|
||||||
|
// SmartSDR's business.
|
||||||
|
if len(fields) >= 3 && fields[0] == "display" && fields[1] == "pan" {
|
||||||
|
id := fields[2]
|
||||||
|
f.mu.Lock()
|
||||||
|
w := f.panWindow[id]
|
||||||
|
for _, kv := range fields[3:] {
|
||||||
|
key, val, ok := splitKV(kv)
|
||||||
|
if !ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
switch key {
|
||||||
|
case "center":
|
||||||
|
if v, err := strconv.ParseFloat(val, 64); err == nil && v > 0 {
|
||||||
|
w.centre = v
|
||||||
|
}
|
||||||
|
case "bandwidth":
|
||||||
|
if v, err := strconv.ParseFloat(val, 64); err == nil && v > 0 {
|
||||||
|
w.width = v
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
f.panWindow[id] = w
|
||||||
|
f.mu.Unlock()
|
||||||
|
}
|
||||||
// Meter definitions — "meter <num>.src=… <num>.nam=… <num>.unit=… …".
|
// Meter definitions — "meter <num>.src=… <num>.nam=… <num>.unit=… …".
|
||||||
// The unit scales the UDP values, the name labels them; subscribe to each
|
// The unit scales the UDP values, the name labels them; subscribe to each
|
||||||
// new id so the radio streams it.
|
// new id so the radio streams it.
|
||||||
@@ -810,9 +868,17 @@ func (f *Flex) handleStatus(payload string) {
|
|||||||
}
|
}
|
||||||
f.mu.Lock()
|
f.mu.Lock()
|
||||||
if removed {
|
if removed {
|
||||||
|
// The radio expired or dropped this spot: forget what it looked
|
||||||
|
// like, or the next identical spot would be skipped as "already
|
||||||
|
// drawn" and the station would never come back.
|
||||||
|
if c, ok := f.spotCall[idx]; ok {
|
||||||
|
delete(f.spotSig, strings.ToUpper(c))
|
||||||
|
delete(f.spotSent, strings.ToUpper(c))
|
||||||
|
}
|
||||||
delete(f.spotIdx, idx)
|
delete(f.spotIdx, idx)
|
||||||
delete(f.spotCall, idx)
|
delete(f.spotCall, idx)
|
||||||
delete(f.spotMode, idx)
|
delete(f.spotMode, idx)
|
||||||
|
delete(f.spotFreq, idx)
|
||||||
} else {
|
} else {
|
||||||
f.spotIdx[idx] = true
|
f.spotIdx[idx] = true
|
||||||
}
|
}
|
||||||
@@ -847,6 +913,8 @@ func (f *Flex) handleStatus(payload string) {
|
|||||||
}
|
}
|
||||||
case "mode":
|
case "mode":
|
||||||
s.mode = val
|
s.mode = val
|
||||||
|
case "pan":
|
||||||
|
s.pan = val
|
||||||
case "active":
|
case "active":
|
||||||
s.active = val == "1"
|
s.active = val == "1"
|
||||||
case "tx":
|
case "tx":
|
||||||
@@ -1241,6 +1309,74 @@ func (f *Flex) SetMode(mode string) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ZoomPan sets the visible width of the ACTIVE slice's panadapter, and puts the
|
||||||
|
// frequency the operator clicked inside it.
|
||||||
|
//
|
||||||
|
// bandwidthMHz is the whole visible span, which is how SmartSDR expresses it —
|
||||||
|
// not a zoom factor.
|
||||||
|
//
|
||||||
|
// Re-centring is the subtle part. SmartSDR keeps the panadapter's CENTRE when
|
||||||
|
// only the width changes, so narrowing from 200 kHz to 25 for a CW spot — or
|
||||||
|
// jumping to a spot clicked in the band map — regularly left the very signal the
|
||||||
|
// operator asked for outside the new window: the radio had tuned to it, but the
|
||||||
|
// display was showing somewhere else. So the centre moves when it must:
|
||||||
|
//
|
||||||
|
// centre == true always re-centre (the operator asked for it)
|
||||||
|
// centre == false re-centre ONLY when freqMHz would fall outside the new
|
||||||
|
// window, leaving a settled display alone the rest of the time
|
||||||
|
//
|
||||||
|
// The test uses 40% of the width either side rather than the full half: a spot
|
||||||
|
// pinned to the last pixel of the panadapter is visible in the arithmetic and
|
||||||
|
// useless in practice.
|
||||||
|
//
|
||||||
|
// A no-op when the slice reports no panadapter, which is the case on a slice
|
||||||
|
// that exists but is not displayed. Silent, because that is not a fault.
|
||||||
|
// needRecentre decides whether the panadapter has to move for freqMHz to be
|
||||||
|
// comfortably visible in a window of bandwidthMHz. forced short-circuits it.
|
||||||
|
//
|
||||||
|
// An unknown current centre (no pan status seen yet) counts as "would fall
|
||||||
|
// outside": the display is more likely wrong than right, and re-centring on the
|
||||||
|
// spot the operator just clicked is never the surprising answer.
|
||||||
|
func needRecentre(cur panView, freqMHz, bandwidthMHz float64, forced bool) bool {
|
||||||
|
if freqMHz <= 0 {
|
||||||
|
return false // nothing to centre on
|
||||||
|
}
|
||||||
|
if forced {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return cur.centre <= 0 || math.Abs(freqMHz-cur.centre) > bandwidthMHz*0.4
|
||||||
|
}
|
||||||
|
|
||||||
|
func (f *Flex) ZoomPan(bandwidthMHz, freqMHz float64, centre bool) error {
|
||||||
|
f.mu.Lock()
|
||||||
|
pan := ""
|
||||||
|
// The operator's slice, by the same rule as everything else — see
|
||||||
|
// mainSliceLocked. Zooming any other panadapter would move a display the
|
||||||
|
// operator is not looking at.
|
||||||
|
if _, sl := f.mainSliceLocked(); sl != nil {
|
||||||
|
pan = sl.pan
|
||||||
|
}
|
||||||
|
cur := f.panWindow[pan]
|
||||||
|
connected := f.conn != nil && f.gotHandle
|
||||||
|
f.mu.Unlock()
|
||||||
|
if !connected {
|
||||||
|
return fmt.Errorf("flex: not connected")
|
||||||
|
}
|
||||||
|
if pan == "" || bandwidthMHz <= 0 {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
recentre := needRecentre(cur, freqMHz, bandwidthMHz, centre)
|
||||||
|
// Centre first, then width: SmartSDR clamps a window that would run past the
|
||||||
|
// end of the spectrum, and moving to the right place before widening leaves
|
||||||
|
// nothing to clamp.
|
||||||
|
if recentre {
|
||||||
|
f.send(fmt.Sprintf("display pan s %s center=%.6f", pan, freqMHz))
|
||||||
|
}
|
||||||
|
f.send(fmt.Sprintf("display pan s %s bandwidth=%.6f", pan, bandwidthMHz))
|
||||||
|
debugLog.Printf("Flex: zoom pan %s → %.4f MHz (centre=%v on %.6f, was %.6f)", pan, bandwidthMHz, recentre, freqMHz, cur.centre)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
// SendSpot renders a cluster spot on the panadapter via "spot add". Spots carry
|
// SendSpot renders a cluster spot on the panadapter via "spot add". Spots carry
|
||||||
// a lifetime so the radio expires them on its own (the API has no "spot clear").
|
// a lifetime so the radio expires them on its own (the API has no "spot clear").
|
||||||
// Per the SmartSDR API, spaces inside a field value are encoded as 0x7F.
|
// Per the SmartSDR API, spaces inside a field value are encoded as 0x7F.
|
||||||
@@ -1270,12 +1406,28 @@ func (f *Flex) SendSpot(s SpotInfo) error {
|
|||||||
// and Go mutexes aren't reentrant (calling send while locked deadlocks the
|
// and Go mutexes aren't reentrant (calling send while locked deadlocks the
|
||||||
// whole Flex goroutine → the radio drops OFFLINE).
|
// whole Flex goroutine → the radio drops OFFLINE).
|
||||||
upperCall := strings.ToUpper(s.Callsign)
|
upperCall := strings.ToUpper(s.Callsign)
|
||||||
|
// Unchanged and still fresh → leave it alone.
|
||||||
|
//
|
||||||
|
// Refreshed once past half its lifetime, so a long-lived spot still gets its
|
||||||
|
// timer wound on and never quietly expires off the panadapter; anything that
|
||||||
|
// actually differs (a new frequency, a status that has changed colour, a
|
||||||
|
// different comment) is redrawn at once.
|
||||||
|
sig := fmt.Sprintf("%d|%s|%s|%s|%s", s.FreqHz, s.Mode, s.Color, s.BackgroundColor, s.Comment)
|
||||||
f.mu.Lock()
|
f.mu.Lock()
|
||||||
|
if prev, ok := f.spotSig[upperCall]; ok && prev == sig {
|
||||||
|
if at, ok := f.spotSent[upperCall]; ok && time.Since(at) < time.Duration(life)*time.Second/2 {
|
||||||
|
f.mu.Unlock()
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
f.spotSig[upperCall] = sig
|
||||||
|
f.spotSent[upperCall] = time.Now()
|
||||||
old, hadOld := f.spotByCall[upperCall]
|
old, hadOld := f.spotByCall[upperCall]
|
||||||
if hadOld {
|
if hadOld {
|
||||||
delete(f.spotByCall, upperCall)
|
delete(f.spotByCall, upperCall)
|
||||||
delete(f.spotCall, old)
|
delete(f.spotCall, old)
|
||||||
delete(f.spotMode, old)
|
delete(f.spotMode, old)
|
||||||
|
delete(f.spotFreq, old)
|
||||||
delete(f.spotIdx, old)
|
delete(f.spotIdx, old)
|
||||||
}
|
}
|
||||||
f.mu.Unlock()
|
f.mu.Unlock()
|
||||||
@@ -1291,6 +1443,12 @@ func (f *Flex) SendSpot(s SpotInfo) error {
|
|||||||
if m := flexEncode(adifModeToFlex(s.Mode, s.FreqHz)); m != "" {
|
if m := flexEncode(adifModeToFlex(s.Mode, s.FreqHz)); m != "" {
|
||||||
cmd += " mode=" + m
|
cmd += " mode=" + m
|
||||||
}
|
}
|
||||||
|
// background_color is optional in the API and empty means "the radio's own".
|
||||||
|
// Sent only when set, so a spot with no configured background does not blank
|
||||||
|
// the default to nothing.
|
||||||
|
if bg := flexEncode(s.BackgroundColor); bg != "" {
|
||||||
|
cmd += " background_color=" + bg
|
||||||
|
}
|
||||||
if c := flexEncode(s.Comment); c != "" {
|
if c := flexEncode(s.Comment); c != "" {
|
||||||
cmd += " comment=" + c
|
cmd += " comment=" + c
|
||||||
}
|
}
|
||||||
@@ -1302,6 +1460,7 @@ func (f *Flex) SendSpot(s SpotInfo) error {
|
|||||||
f.mu.Lock()
|
f.mu.Lock()
|
||||||
f.pendingSpot[seq] = s.Callsign
|
f.pendingSpot[seq] = s.Callsign
|
||||||
f.pendingSpotMode[seq] = s.Mode
|
f.pendingSpotMode[seq] = s.Mode
|
||||||
|
f.pendingSpotFreq[seq] = s.FreqHz
|
||||||
f.mu.Unlock()
|
f.mu.Unlock()
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
@@ -1335,6 +1494,9 @@ func (f *Flex) ClearSpots() error {
|
|||||||
f.spotIdx = map[int]bool{}
|
f.spotIdx = map[int]bool{}
|
||||||
f.spotCall = map[int]string{}
|
f.spotCall = map[int]string{}
|
||||||
f.spotMode = map[int]string{}
|
f.spotMode = map[int]string{}
|
||||||
|
f.spotFreq = map[int]int64{}
|
||||||
|
f.spotSig = map[string]string{}
|
||||||
|
f.spotSent = map[string]time.Time{}
|
||||||
f.spotByCall = map[string]int{}
|
f.spotByCall = map[string]int{}
|
||||||
connected := f.conn != nil
|
connected := f.conn != nil
|
||||||
f.mu.Unlock()
|
f.mu.Unlock()
|
||||||
@@ -2163,6 +2325,34 @@ func (f *Flex) startMeters(conn net.Conn) {
|
|||||||
debugLog.Printf("Flex: meters UDP local=:%d punch→%s", port, raddr)
|
debugLog.Printf("Flex: meters UDP local=:%d punch→%s", port, raddr)
|
||||||
go f.udpReader(uc)
|
go f.udpReader(uc)
|
||||||
go f.udpKeepalive(uc, raddr)
|
go f.udpKeepalive(uc, raddr)
|
||||||
|
go f.udpWatchdog(uc)
|
||||||
|
}
|
||||||
|
|
||||||
|
// udpWatchdog says so when the meter stream never arrives.
|
||||||
|
//
|
||||||
|
// The meters come over VITA-49 on a UDP socket the radio sends TO US; the TCP
|
||||||
|
// side can be perfectly healthy — handshake, slices, spots, everything — while
|
||||||
|
// not one datagram gets through. On Windows that is almost always the firewall
|
||||||
|
// refusing inbound UDP for a program it has not been asked about, and the only
|
||||||
|
// symptom is meters that stay at zero. Nothing said so: an operator saw a
|
||||||
|
// connected radio with dead meters and no reason anywhere.
|
||||||
|
//
|
||||||
|
// Five seconds is far longer than the stream's own 40 frames a second needs.
|
||||||
|
func (f *Flex) udpWatchdog(uc *net.UDPConn) {
|
||||||
|
time.Sleep(5 * time.Second)
|
||||||
|
f.mu.Lock()
|
||||||
|
cur, seen := f.udpConn, f.vitaSeen
|
||||||
|
port := 0
|
||||||
|
if uc.LocalAddr() != nil {
|
||||||
|
port = uc.LocalAddr().(*net.UDPAddr).Port
|
||||||
|
}
|
||||||
|
f.mu.Unlock()
|
||||||
|
if cur != uc || seen > 0 {
|
||||||
|
return // reconnected in the meantime, or the stream is flowing
|
||||||
|
}
|
||||||
|
debugLog.Printf("Flex: NO meter data after 5s — the radio's VITA-49 stream is not reaching UDP port %d. "+
|
||||||
|
"The TCP link is fine, so this is almost always a firewall: allow OpsLog.exe inbound UDP "+
|
||||||
|
"(Windows Defender Firewall → Allow an app), or open port %d for %s", port, port, f.host)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (f *Flex) udpReader(uc *net.UDPConn) {
|
func (f *Flex) udpReader(uc *net.UDPConn) {
|
||||||
|
|||||||
@@ -0,0 +1,34 @@
|
|||||||
|
package cat
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
func TestNeedRecentre(t *testing.T) {
|
||||||
|
pan := panView{centre: 14.100, width: 0.200}
|
||||||
|
// A spot the display is already showing comfortably: leave the window alone,
|
||||||
|
// which is the whole point of the option being off.
|
||||||
|
if needRecentre(pan, 14.110, 0.200, false) {
|
||||||
|
t.Fatal("moved a display that was already on the spot")
|
||||||
|
}
|
||||||
|
// Narrowing for a CW spot 40 kHz away: 25 kHz around the old centre would not
|
||||||
|
// reach it, so the centre must follow.
|
||||||
|
if !needRecentre(pan, 14.060, 0.025, false) {
|
||||||
|
t.Fatal("spot would have been left outside the new window")
|
||||||
|
}
|
||||||
|
// Near the very edge of the new window — visible in the arithmetic, useless
|
||||||
|
// in practice.
|
||||||
|
if !needRecentre(pan, 14.199, 0.200, false) {
|
||||||
|
t.Fatal("spot pinned to the edge counts as outside")
|
||||||
|
}
|
||||||
|
// The operator asked for it.
|
||||||
|
if !needRecentre(pan, 14.110, 0.200, true) {
|
||||||
|
t.Fatal("forced centring ignored")
|
||||||
|
}
|
||||||
|
// No pan status yet: assume the display is elsewhere.
|
||||||
|
if !needRecentre(panView{}, 14.110, 0.200, false) {
|
||||||
|
t.Fatal("unknown centre must re-centre")
|
||||||
|
}
|
||||||
|
// Nothing to centre on.
|
||||||
|
if needRecentre(pan, 0, 0.200, true) {
|
||||||
|
t.Fatal("centred on nothing")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,43 @@
|
|||||||
|
package cat
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"hamlog/internal/cat/civ"
|
||||||
|
)
|
||||||
|
|
||||||
|
// A CI-V bus can carry a second controller, and the rig answers each of them on
|
||||||
|
// the same wire. A reply addressed to somebody else must not be taken for ours —
|
||||||
|
// on an IC-7850 one arrived between a PTT command and its acknowledgement, the
|
||||||
|
// acknowledgement was never matched, and the failure was handed to JTDX as a rig
|
||||||
|
// control error.
|
||||||
|
func TestForeignCIVRepliesAreIgnored(t *testing.T) {
|
||||||
|
const rig = 0x8E
|
||||||
|
frames, _ := civ.Scan([]byte{
|
||||||
|
0xFE, 0xFE, 0x01, rig, 0x1C, 0x00, 0x01, 0xFD, // to controller 01 — not ours
|
||||||
|
0xFE, 0xFE, civ.AddrController, rig, 0xFB, 0xFD, // to us: the acknowledgement
|
||||||
|
0xFE, 0xFE, 0x00, rig, 0x00, 0x00, 0x25, 0x09, 0x14, 0x00, 0xFD, // transceive broadcast
|
||||||
|
})
|
||||||
|
if len(frames) != 3 {
|
||||||
|
t.Fatalf("scanned %d frames, want 3", len(frames))
|
||||||
|
}
|
||||||
|
var kept []civ.Decoded
|
||||||
|
for _, f := range frames {
|
||||||
|
if f.From != rig {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if f.To != civ.AddrController && f.To != 0x00 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
kept = append(kept, f)
|
||||||
|
}
|
||||||
|
if len(kept) != 2 {
|
||||||
|
t.Fatalf("kept %d frames, want 2 (ours + the broadcast)", len(kept))
|
||||||
|
}
|
||||||
|
if kept[0].Cmd != 0xFB {
|
||||||
|
t.Errorf("the acknowledgement was not the first kept frame: % X", kept[0].Cmd)
|
||||||
|
}
|
||||||
|
if kept[1].To != 0x00 {
|
||||||
|
t.Errorf("the transceive broadcast was dropped")
|
||||||
|
}
|
||||||
|
}
|
||||||
+124
-10
@@ -1,6 +1,7 @@
|
|||||||
package cat
|
package cat
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"strings"
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
@@ -513,7 +514,21 @@ func (b *IcomSerial) SetFrequency(hz int64) error {
|
|||||||
return fmt.Errorf("invalid frequency")
|
return fmt.Errorf("invalid frequency")
|
||||||
}
|
}
|
||||||
b.lastSetFreq, b.lastSetFreqAt = hz, time.Now()
|
b.lastSetFreq, b.lastSetFreqAt = hz, time.Now()
|
||||||
return b.exec(append([]byte{civ.CmdSetFreq}, civ.FreqToBCD(hz)...)...)
|
err := b.execIdempotent(fmt.Sprintf("set frequency %d Hz", hz),
|
||||||
|
append([]byte{civ.CmdSetFreq}, civ.FreqToBCD(hz)...)...)
|
||||||
|
// Same reasoning as SetPTT: a lost acknowledgement is not a failed command,
|
||||||
|
// and WSJT-X or JTDX answer a failed set_freq by dropping the link — an
|
||||||
|
// IC-7850 log shows exactly that at 15:16:15, the disconnect four seconds
|
||||||
|
// later. The rig is asked what frequency it is on rather than being called a
|
||||||
|
// failure on the strength of a missing "FB".
|
||||||
|
if err == nil || !errors.Is(err, errIcomAckLost) {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if got, rerr := b.readFreq(); rerr == nil && got == hz {
|
||||||
|
applog.Printf("icom: frequency %d Hz not acknowledged, but the rig is on it — treating as done", hz)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (b *IcomSerial) SetMode(mode string) error {
|
func (b *IcomSerial) SetMode(mode string) error {
|
||||||
@@ -523,24 +538,96 @@ func (b *IcomSerial) SetMode(mode string) error {
|
|||||||
}
|
}
|
||||||
// Set the base mode (keeping the rig's current filter by sending only the
|
// Set the base mode (keeping the rig's current filter by sending only the
|
||||||
// mode byte), then set the data-mode flag for digital modes.
|
// mode byte), then set the data-mode flag for digital modes.
|
||||||
if err := b.exec(civ.CmdSetMode, code); err != nil {
|
if err := b.execIdempotent("set mode "+mode, civ.CmdSetMode, code); err != nil {
|
||||||
return err
|
// A lost acknowledgement is not a refused mode — see SetPTT. The mode is
|
||||||
|
// readable, so ask rather than report a failure that would cost the
|
||||||
|
// digital application its connection.
|
||||||
|
if !errors.Is(err, errIcomAckLost) {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if got, ok := b.readMode(); !ok || got != code {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
applog.Printf("icom: mode %s not acknowledged, but the rig reports it — treating as done", mode)
|
||||||
}
|
}
|
||||||
dataByte := byte(0)
|
dataByte := byte(0)
|
||||||
if data {
|
if data {
|
||||||
dataByte = 1
|
dataByte = 1
|
||||||
}
|
}
|
||||||
// Filter 0x01 (FIL1) is the conventional default for the data-mode set.
|
// Filter 0x01 (FIL1) is the conventional default for the data-mode set.
|
||||||
_ = b.exec(civ.CmdExtra, civ.SubDataMode, dataByte, 0x01)
|
_ = b.execIdempotent("set data mode", civ.CmdExtra, civ.SubDataMode, dataByte, 0x01)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// errIcomAckLost is "the reply never came" — as opposed to a reply that said no
|
||||||
|
// (NG) or a dead port. Only this one is worth repeating: the command may well
|
||||||
|
// have been carried out and only its acknowledgement lost. Sentinel rather than
|
||||||
|
// a formatted string so callers can tell the two apart.
|
||||||
|
var errIcomAckLost = errors.New("icom: timeout waiting for response")
|
||||||
|
|
||||||
|
// execIdempotent runs a SET command and sends it ONCE MORE if the
|
||||||
|
// acknowledgement is lost.
|
||||||
|
//
|
||||||
|
// A missing FB is not a missing command — the rig acts on the frame as soon as it
|
||||||
|
// decodes it, and what expires is our wait for the answer on a bus shared with
|
||||||
|
// the rig's own transceive updates. JTDX in "Split Operating: Fake It" moves the
|
||||||
|
// dial and the mode immediately before every key-down, so those acks queue behind
|
||||||
|
// each other, and losing one was fatal: rigctld answers RPRT -9, JTDX reads that
|
||||||
|
// as losing rig control and tears the connection down mid-over. An operator's log
|
||||||
|
// shows it happening on set_ptt, on set_freq and on set_mode alike, each failure
|
||||||
|
// followed within 300 ms by a fresh rigctld client — and shows this resend
|
||||||
|
// rescuing a PTT that would otherwise have ended the over.
|
||||||
|
//
|
||||||
|
// Only for commands that say "be in this state": re-sending one changes nothing
|
||||||
|
// if the first arrived. A relative or incremental command must not come through
|
||||||
|
// here, which is why this is opt-in per caller rather than folded into exec.
|
||||||
|
func (b *IcomSerial) execIdempotent(what string, payload ...byte) error {
|
||||||
|
err := b.exec(payload...)
|
||||||
|
if err == nil || !errors.Is(err, errIcomAckLost) {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
applog.Printf("icom: %s — no acknowledgement in %s, sending it once more", what, icomCmdTimeout)
|
||||||
|
return b.exec(payload...)
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetPTT keys or unkeys the transmitter (CI-V 0x1C 0x00).
|
||||||
|
// A lost acknowledgement is NOT proof the rig ignored us, and treating it as one
|
||||||
|
// is expensive: OpsLog fronts a Hamlib rigctl port, so the failure is handed
|
||||||
|
// straight to WSJT-X or JTDX, which answer a failed set_ptt with a Rig Control
|
||||||
|
// Error and drop the link mid-over. An IC-7850 log showed exactly that, three
|
||||||
|
// times in a session, on a CI-V bus with a second controller corrupting frames.
|
||||||
|
//
|
||||||
|
// So when the acknowledgement does not arrive, ASK the rig what it is doing. PTT
|
||||||
|
// is readable (0x1C 0x00), the answer is unambiguous, and a rig that is keyed
|
||||||
|
// received the command whatever became of its reply.
|
||||||
func (b *IcomSerial) SetPTT(on bool) error {
|
func (b *IcomSerial) SetPTT(on bool) error {
|
||||||
state := byte(0)
|
state := byte(0)
|
||||||
if on {
|
if on {
|
||||||
state = 1
|
state = 1
|
||||||
}
|
}
|
||||||
return b.exec(civ.CmdPTT, civ.SubPTT, state)
|
err := b.execIdempotent(fmt.Sprintf("PTT %v", on), civ.CmdPTT, civ.SubPTT, state)
|
||||||
|
if err == nil || !errors.Is(err, errIcomAckLost) {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
// A GENEROUS window for the verification, not the poll's 150 ms.
|
||||||
|
//
|
||||||
|
// The rig has just failed to answer twice in 800 ms, and the reason seen on a
|
||||||
|
// real IC-7850 is that it was retuning: JTDX moves the transmit frequency and
|
||||||
|
// keys in the same breath. Asking it again with the short probe timeout would
|
||||||
|
// fail for exactly the same reason and prove nothing.
|
||||||
|
keyed, ok := b.readTXWithin(icomPTTVerifyTimeout)
|
||||||
|
if ok && keyed == on {
|
||||||
|
applog.Printf("icom: PTT %v not acknowledged, but the rig reports it — treating as done", on)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
// Logged either way, because "the fix did not work" and "the rig really did
|
||||||
|
// not key" look identical from outside and need telling apart.
|
||||||
|
if ok {
|
||||||
|
applog.Printf("icom: PTT %v not acknowledged, and the rig reports %v — reporting the failure", on, keyed)
|
||||||
|
} else {
|
||||||
|
applog.Printf("icom: PTT %v not acknowledged, and the rig did not answer the check either", on)
|
||||||
|
}
|
||||||
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
// SetPower turns the transceiver on or off (CI-V 0x18). Power-ON is prefixed with
|
// SetPower turns the transceiver on or off (CI-V 0x18). Power-ON is prefixed with
|
||||||
@@ -619,7 +706,7 @@ func (b *IcomSerial) recv(timeout time.Duration, match func(civ.Decoded) bool) (
|
|||||||
case <-cancel:
|
case <-cancel:
|
||||||
return civ.Decoded{}, fmt.Errorf("icom: interrupted")
|
return civ.Decoded{}, fmt.Errorf("icom: interrupted")
|
||||||
case <-deadline:
|
case <-deadline:
|
||||||
return civ.Decoded{}, fmt.Errorf("icom: timeout waiting for response")
|
return civ.Decoded{}, errIcomAckLost
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -652,6 +739,19 @@ func (b *IcomSerial) reader(port civTransport, done chan struct{}) {
|
|||||||
if f.From != b.rigAddr {
|
if f.From != b.rigAddr {
|
||||||
continue // echo of our own command
|
continue // echo of our own command
|
||||||
}
|
}
|
||||||
|
// Addressed to US, or broadcast.
|
||||||
|
//
|
||||||
|
// A CI-V bus can carry a second controller — RS-BA1, wfview, another
|
||||||
|
// logger — and the rig answers each of them in turn on the same wire.
|
||||||
|
// Those replies come FROM the rig, so the check above lets them through,
|
||||||
|
// and one can be taken for the answer to our own command: an IC-7850 log
|
||||||
|
// showed "FE FE 01 8E …" (to controller 01) arriving between our PTT
|
||||||
|
// command and its acknowledgement, with bus collisions around it.
|
||||||
|
// Transceive broadcasts (to 0x00) stay welcome — that is how the rig
|
||||||
|
// announces a knob turn.
|
||||||
|
if f.To != civ.AddrController && f.To != 0x00 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
if f.Cmd == civ.CmdScope {
|
if f.Cmd == civ.CmdScope {
|
||||||
b.route(b.specCh, f)
|
b.route(b.specCh, f)
|
||||||
continue
|
continue
|
||||||
@@ -1239,16 +1339,30 @@ func (b *IcomSerial) readTXFreq() (int64, bool) {
|
|||||||
|
|
||||||
// readTX reads the transmit state (CI-V 0x1C 0x00): non-zero data = keyed.
|
// readTX reads the transmit state (CI-V 0x1C 0x00): non-zero data = keyed.
|
||||||
func (b *IcomSerial) readTX() bool {
|
func (b *IcomSerial) readTX() bool {
|
||||||
|
on, _ := b.readTXWithin(icomDSPTimeout)
|
||||||
|
return on
|
||||||
|
}
|
||||||
|
|
||||||
|
// icomPTTVerifyTimeout is how long the PTT check waits. Long, deliberately: it
|
||||||
|
// runs only after a command was already given up on, so it costs nothing in the
|
||||||
|
// normal case and everything depends on it in the abnormal one.
|
||||||
|
const icomPTTVerifyTimeout = 700 * time.Millisecond
|
||||||
|
|
||||||
|
// readTXWithin reads the transmit state, reporting whether the rig ANSWERED.
|
||||||
|
//
|
||||||
|
// The two are different questions and the caller usually needs both: "not
|
||||||
|
// transmitting" and "did not say" are the same bool but not the same fact.
|
||||||
|
func (b *IcomSerial) readTXWithin(timeout time.Duration) (on bool, answered bool) {
|
||||||
if err := b.write(civ.CmdPTT, civ.SubPTT); err != nil {
|
if err := b.write(civ.CmdPTT, civ.SubPTT); err != nil {
|
||||||
return false
|
return false, false
|
||||||
}
|
}
|
||||||
f, err := b.recv(icomDSPTimeout, func(d civ.Decoded) bool {
|
f, err := b.recv(timeout, func(d civ.Decoded) bool {
|
||||||
return d.Cmd == civ.CmdPTT && len(d.Data) >= 2 && d.Data[0] == civ.SubPTT
|
return d.Cmd == civ.CmdPTT && len(d.Data) >= 2 && d.Data[0] == civ.SubPTT
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return false
|
return false, false
|
||||||
}
|
}
|
||||||
return f.Data[1] != 0
|
return f.Data[1] != 0, true
|
||||||
}
|
}
|
||||||
|
|
||||||
// readMeter reads a meter (CI-V 0x15) and returns it scaled to 0-100.
|
// readMeter reads a meter (CI-V 0x15) and returns it scaled to 0-100.
|
||||||
|
|||||||
+116
-2
@@ -46,8 +46,33 @@ type TCI struct {
|
|||||||
mode string
|
mode string
|
||||||
split bool
|
split bool
|
||||||
tx bool
|
tx bool
|
||||||
|
// txAllowed is what the radio last said about TRANSMIT PERMISSION.
|
||||||
|
//
|
||||||
|
// TX_ENABLE is sent by ExpertSDR when a client connects and again whenever
|
||||||
|
// the band changes, "in case transmitter permission was changed" (§4.3). When
|
||||||
|
// it is false the radio silently ignores TRX — which is exactly what an
|
||||||
|
// operator sees as "PTT does nothing", with no error anywhere to explain it.
|
||||||
|
//
|
||||||
|
// txAllowedKnown keeps an OLDER ExpertSDR, or a TCI-compatible program that
|
||||||
|
// never sends TX_ENABLE at all, from being treated as refusing: without a
|
||||||
|
// word from the radio we key and let it decide.
|
||||||
|
txAllowed bool
|
||||||
|
txAllowedKnown bool
|
||||||
|
|
||||||
lastSig string // last logged state signature (log only on change)
|
lastSig string // last logged state signature (log only on change)
|
||||||
|
|
||||||
|
// spotFreq is the frequency of the marker currently on the panorama for each
|
||||||
|
// callsign — the panadapter's own state, which TCI never reports back. It is
|
||||||
|
// what makes one spot per call possible: without it there is no way to know
|
||||||
|
// there is an older marker to delete.
|
||||||
|
spotFreq map[string]int64
|
||||||
|
}
|
||||||
|
|
||||||
|
func absInt64(v int64) int64 {
|
||||||
|
if v < 0 {
|
||||||
|
return -v
|
||||||
|
}
|
||||||
|
return v
|
||||||
}
|
}
|
||||||
|
|
||||||
const tciDefaultPort = 40001
|
const tciDefaultPort = 40001
|
||||||
@@ -96,18 +121,73 @@ func (t *TCI) Connect() error {
|
|||||||
t.mu.Lock()
|
t.mu.Lock()
|
||||||
t.conn = conn
|
t.conn = conn
|
||||||
t.ready = false
|
t.ready = false
|
||||||
|
// Forget the previous session's transmit permission: the radio announces it
|
||||||
|
// again on connect, and a refusal remembered from a band we have since left
|
||||||
|
// would block PTT until it did.
|
||||||
|
t.txAllowed, t.txAllowedKnown = false, false
|
||||||
t.mu.Unlock()
|
t.mu.Unlock()
|
||||||
debugLog.Printf("TCI: connected to %s", url)
|
debugLog.Printf("TCI: connected to %s", url)
|
||||||
go t.reader(conn)
|
go t.reader(conn)
|
||||||
if t.spotsEnabled {
|
if t.spotsEnabled {
|
||||||
|
// Forget what we thought was on the panorama at the same moment the radio
|
||||||
|
// is told to drop it. Kept, the memory would suppress the next spot for
|
||||||
|
// each of those calls as "already drawn" onto a panorama now empty.
|
||||||
|
t.mu.Lock()
|
||||||
|
t.spotFreq = map[string]int64{}
|
||||||
|
t.mu.Unlock()
|
||||||
_ = t.send("spot_clear;") // drop any leftover spots from a previous session
|
_ = t.send("spot_clear;") // drop any leftover spots from a previous session
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// spotFreqTolHz is how far a re-spot of the same callsign may sit from the one
|
||||||
|
// already on the panorama before it is treated as a move rather than the same
|
||||||
|
// spot said again.
|
||||||
|
//
|
||||||
|
// Two spotters hearing the same CW station rarely agree to better than a couple
|
||||||
|
// of hundred hertz, and every one of them produces a cluster line. Below this
|
||||||
|
// they are the same spot and nothing is sent at all; above it the marker is
|
||||||
|
// deleted and redrawn where the station now is.
|
||||||
|
const spotFreqTolHz = 500
|
||||||
|
|
||||||
|
// noteSpot records what the panorama is about to hold for a callsign and says
|
||||||
|
// what has to be sent: whether to draw at all, and whether an older marker for
|
||||||
|
// the same call must be deleted first.
|
||||||
|
//
|
||||||
|
// Separate from SendSpot so the rule can be tested without a radio — and
|
||||||
|
// because the lock must be released before anything is sent: t.send takes t.mu
|
||||||
|
// itself, Go mutexes are not reentrant, and sending while holding it would
|
||||||
|
// deadlock the backend and take the rig offline.
|
||||||
|
func (t *TCI) noteSpot(call string, freqHz int64) (draw, deletePrev bool) {
|
||||||
|
key := strings.ToUpper(strings.TrimSpace(call))
|
||||||
|
t.mu.Lock()
|
||||||
|
defer t.mu.Unlock()
|
||||||
|
prev, had := t.spotFreq[key]
|
||||||
|
if had && absInt64(prev-freqHz) <= spotFreqTolHz {
|
||||||
|
return false, false
|
||||||
|
}
|
||||||
|
if t.spotFreq == nil {
|
||||||
|
t.spotFreq = map[string]int64{}
|
||||||
|
}
|
||||||
|
if len(t.spotFreq) > 4000 {
|
||||||
|
t.spotFreq = map[string]int64{} // bound memory on a long session
|
||||||
|
had = false // forgotten: nothing left to delete by name
|
||||||
|
}
|
||||||
|
t.spotFreq[key] = freqHz
|
||||||
|
return true, had
|
||||||
|
}
|
||||||
|
|
||||||
// SendSpot mirrors a cluster spot onto the TCI panorama (implements Spotter).
|
// SendSpot mirrors a cluster spot onto the TCI panorama (implements Spotter).
|
||||||
// The radio replaces a spot that has the same callsign, so re-spotting updates
|
// No-op when spot mirroring is disabled.
|
||||||
// it in place. No-op when spot mirroring is disabled.
|
//
|
||||||
|
// ONE MARKER PER CALLSIGN. This code assumed the radio replaced a spot carrying
|
||||||
|
// a callsign it already had; it does not. ExpertSDR keys a spot on its
|
||||||
|
// frequency too, so a DX station spotted by three operators — 14025.00,
|
||||||
|
// 14025.12, 14024.90, which is an ordinary minute on a cluster — was drawn
|
||||||
|
// three times, a few pixels apart, and stayed that way.
|
||||||
|
//
|
||||||
|
// So the previous spot for the call is deleted before the new one is sent,
|
||||||
|
// which is what the FlexRadio backend has always done (spot remove / spot add).
|
||||||
func (t *TCI) SendSpot(s SpotInfo) error {
|
func (t *TCI) SendSpot(s SpotInfo) error {
|
||||||
if !t.spotsEnabled {
|
if !t.spotsEnabled {
|
||||||
return nil
|
return nil
|
||||||
@@ -116,6 +196,17 @@ func (t *TCI) SendSpot(s SpotInfo) error {
|
|||||||
if call == "" || s.FreqHz <= 0 {
|
if call == "" || s.FreqHz <= 0 {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
draw, deletePrev := t.noteSpot(call, s.FreqHz)
|
||||||
|
if !draw {
|
||||||
|
return nil // the same station said again by another spotter
|
||||||
|
}
|
||||||
|
if deletePrev {
|
||||||
|
// SPOT_DELETE takes the callsign alone. Not in the protocol PDF this
|
||||||
|
// backend was written from; confirmed against ars-ka0s/eesdr-tci, which
|
||||||
|
// lists SPOT (5 arguments), SPOT_DELETE (1) and SPOT_CLEAR (0) — the
|
||||||
|
// other two matching what already works here.
|
||||||
|
_ = t.send(fmt.Sprintf("spot_delete:%s;", call))
|
||||||
|
}
|
||||||
// TCI's SPOT command wants the colour as a signed 32-bit DECIMAL integer in
|
// TCI's SPOT command wants the colour as a signed 32-bit DECIMAL integer in
|
||||||
// 0xAARRGGBB order — NOT a "0x…" hex string (e.g. "spot:UN7GK,cw,14025000,
|
// 0xAARRGGBB order — NOT a "0x…" hex string (e.g. "spot:UN7GK,cw,14025000,
|
||||||
// -16776961,test;"). ExpertSDR silently drops a spot whose colour field it
|
// -16776961,test;"). ExpertSDR silently drops a spot whose colour field it
|
||||||
@@ -223,7 +314,22 @@ func (t *TCI) SetMode(mode string) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// SetPTT keys or unkeys the transmitter (VFO 0).
|
// SetPTT keys or unkeys the transmitter (VFO 0).
|
||||||
|
//
|
||||||
|
// A refusal by the radio is reported rather than swallowed. ExpertSDR announces
|
||||||
|
// transmit permission with TX_ENABLE and then simply IGNORES trx when it is
|
||||||
|
// false — out-of-band frequency, TX disabled in the program, no PA. The command
|
||||||
|
// went out, nothing happened, and nothing anywhere said why. Now the operator
|
||||||
|
// is told, and the message names the place to look.
|
||||||
func (t *TCI) SetPTT(on bool) error {
|
func (t *TCI) SetPTT(on bool) error {
|
||||||
|
if on {
|
||||||
|
t.mu.Lock()
|
||||||
|
known, allowed := t.txAllowedKnown, t.txAllowed
|
||||||
|
t.mu.Unlock()
|
||||||
|
if known && !allowed {
|
||||||
|
return fmt.Errorf("the radio is refusing to transmit (TCI reports TX disabled) — " +
|
||||||
|
"check the frequency is inside a transmit band and that TX is enabled in ExpertSDR")
|
||||||
|
}
|
||||||
|
}
|
||||||
return t.send(fmt.Sprintf("trx:0,%t;", on))
|
return t.send(fmt.Sprintf("trx:0,%t;", on))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -317,6 +423,14 @@ func (t *TCI) handle(msg string) {
|
|||||||
if get(0) == "0" {
|
if get(0) == "0" {
|
||||||
t.tx = get(1) == "true"
|
t.tx = get(1) == "true"
|
||||||
}
|
}
|
||||||
|
case "tx_enable":
|
||||||
|
if get(0) == "0" {
|
||||||
|
allowed := get(1) == "true"
|
||||||
|
if !t.txAllowedKnown || t.txAllowed != allowed {
|
||||||
|
debugLog.Printf("TCI: the radio %s transmitting", map[bool]string{true: "allows", false: "REFUSES"}[allowed])
|
||||||
|
}
|
||||||
|
t.txAllowed, t.txAllowedKnown = allowed, true
|
||||||
|
}
|
||||||
default:
|
default:
|
||||||
lname := strings.ToLower(name)
|
lname := strings.ToLower(name)
|
||||||
// A click on one of our panorama spots comes back as
|
// A click on one of our panorama spots comes back as
|
||||||
|
|||||||
@@ -0,0 +1,80 @@
|
|||||||
|
//go:build windows
|
||||||
|
|
||||||
|
package cat
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
// feed pushes messages at the backend the way the radio would.
|
||||||
|
func feed(t *TCI, msgs ...string) {
|
||||||
|
for _, m := range msgs {
|
||||||
|
t.handle(m)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// "PTT via CAT does nothing on TCI."
|
||||||
|
//
|
||||||
|
// ExpertSDR announces transmit permission with TX_ENABLE — on connect, and
|
||||||
|
// again whenever the band changes "in case transmitter permission was changed"
|
||||||
|
// (§4.3 of the protocol document). When it is false the radio simply IGNORES
|
||||||
|
// trx. OpsLog sent the documented command, the radio discarded it, and nothing
|
||||||
|
// anywhere said why: the operator pressed a dead key.
|
||||||
|
func TestPTTIsRefusedOutLoudWhenTheRadioForbidsTransmitting(t *testing.T) {
|
||||||
|
tci := NewTCI("localhost", 40001, "FT8", false)
|
||||||
|
feed(tci, "tx_enable:0,false")
|
||||||
|
|
||||||
|
err := tci.SetPTT(true)
|
||||||
|
if err == nil {
|
||||||
|
t.Fatal("keying was accepted while the radio forbids transmitting — the operator gets no reason at all")
|
||||||
|
}
|
||||||
|
// The message has to name where to look; "PTT failed" sends nobody anywhere.
|
||||||
|
for _, want := range []string{"transmit", "ExpertSDR"} {
|
||||||
|
if !contains(err.Error(), want) {
|
||||||
|
t.Errorf("the refusal reads %q, which does not mention %q", err.Error(), want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Unkeying is never blocked. Whatever the radio thinks about permission, a
|
||||||
|
// request to STOP transmitting must always reach it.
|
||||||
|
if err := tci.SetPTT(false); err != nil && contains(err.Error(), "refusing") {
|
||||||
|
t.Errorf("unkeying was refused: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Permission comes back when the operator returns to a band they may use, and
|
||||||
|
// PTT has to come back with it — not stay blocked until OpsLog is restarted.
|
||||||
|
func TestPermissionGrantedAgainRestoresPTT(t *testing.T) {
|
||||||
|
tci := NewTCI("localhost", 40001, "FT8", false)
|
||||||
|
feed(tci, "tx_enable:0,false")
|
||||||
|
if err := tci.SetPTT(true); err == nil {
|
||||||
|
t.Fatal("keying was accepted while forbidden")
|
||||||
|
}
|
||||||
|
feed(tci, "tx_enable:0,true")
|
||||||
|
// No connection here, so the send fails — but it must fail as a TRANSPORT
|
||||||
|
// error, never as a refusal.
|
||||||
|
if err := tci.SetPTT(true); err != nil && contains(err.Error(), "refusing") {
|
||||||
|
t.Errorf("still refusing after permission was granted: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A radio that never mentions TX_ENABLE — an older ExpertSDR, or one of the
|
||||||
|
// other programs that speak TCI — must not be treated as refusing. Silence is
|
||||||
|
// not a "no": we key, and let the radio decide.
|
||||||
|
func TestSilenceAboutPermissionIsNotARefusal(t *testing.T) {
|
||||||
|
tci := NewTCI("localhost", 40001, "FT8", false)
|
||||||
|
if err := tci.SetPTT(true); err != nil && contains(err.Error(), "refusing") {
|
||||||
|
t.Errorf("a radio that never sent TX_ENABLE was treated as forbidding transmit: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func contains(s, sub string) bool {
|
||||||
|
return len(sub) == 0 || (len(s) >= len(sub) && indexOf(s, sub) >= 0)
|
||||||
|
}
|
||||||
|
|
||||||
|
func indexOf(s, sub string) int {
|
||||||
|
for i := 0; i+len(sub) <= len(s); i++ {
|
||||||
|
if s[i:i+len(sub)] == sub {
|
||||||
|
return i
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return -1
|
||||||
|
}
|
||||||
@@ -0,0 +1,87 @@
|
|||||||
|
//go:build windows
|
||||||
|
|
||||||
|
package cat
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
// The reported symptom: with spot mirroring on, the same station appeared two
|
||||||
|
// or three times on the panorama.
|
||||||
|
//
|
||||||
|
// Its cause is not in OpsLog's spot pipeline — one cluster line produces one
|
||||||
|
// SendSpot. It is that a popular DX station IS spotted two or three times, by
|
||||||
|
// different operators within the same minute, and no two of them agree on the
|
||||||
|
// frequency to better than a few tens of hertz. The backend assumed ExpertSDR
|
||||||
|
// replaced a spot bearing a callsign it already had; it keys on the frequency
|
||||||
|
// too, so each of those became its own marker.
|
||||||
|
func TestSameStationSpottedBySeveralOperatorsIsDrawnOnce(t *testing.T) {
|
||||||
|
tci := &TCI{spotsEnabled: true}
|
||||||
|
|
||||||
|
draw, del := tci.noteSpot("UN7GK", 14025000)
|
||||||
|
if !draw || del {
|
||||||
|
t.Fatalf("first spot: draw=%v delete=%v, want draw and nothing to delete", draw, del)
|
||||||
|
}
|
||||||
|
// The same station, two more spotters, a few tens of hertz apart.
|
||||||
|
for _, hz := range []int64{14025120, 14024900} {
|
||||||
|
if draw, del := tci.noteSpot("UN7GK", hz); draw || del {
|
||||||
|
t.Errorf("re-spot at %d Hz: draw=%v delete=%v, want nothing sent — this is the duplicate marker", hz, draw, del)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A station that really moves must still move on the panorama, and the marker
|
||||||
|
// left where it was must go. Deleting first is the whole difference between
|
||||||
|
// "the spot follows the station" and "the station collects markers".
|
||||||
|
func TestAStationThatMovesReplacesItsMarker(t *testing.T) {
|
||||||
|
tci := &TCI{spotsEnabled: true}
|
||||||
|
tci.noteSpot("UN7GK", 14025000)
|
||||||
|
|
||||||
|
draw, del := tci.noteSpot("UN7GK", 14032000) // 7 kHz up: a real QSY
|
||||||
|
if !draw || !del {
|
||||||
|
t.Fatalf("after a QSY: draw=%v delete=%v, want the old marker deleted and a new one drawn", draw, del)
|
||||||
|
}
|
||||||
|
// And the new position becomes the reference, so spotters agreeing with it
|
||||||
|
// are quiet again.
|
||||||
|
if draw, _ := tci.noteSpot("UN7GK", 14032100); draw {
|
||||||
|
t.Error("a spot at the station's new frequency was drawn again")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Case matters nowhere in ham radio, and the cluster is not consistent about it.
|
||||||
|
func TestSpotMemoryIgnoresCase(t *testing.T) {
|
||||||
|
tci := &TCI{spotsEnabled: true}
|
||||||
|
tci.noteSpot("un7gk", 14025000)
|
||||||
|
if draw, _ := tci.noteSpot("UN7GK", 14025000); draw {
|
||||||
|
t.Error("the same call in another case was treated as a different station")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Two different stations are two markers — the whole point of the panorama.
|
||||||
|
func TestDifferentStationsEachGetAMarker(t *testing.T) {
|
||||||
|
tci := &TCI{spotsEnabled: true}
|
||||||
|
tci.noteSpot("UN7GK", 14025000)
|
||||||
|
draw, del := tci.noteSpot("ZD7BG", 14025050) // 50 Hz away, a different operator
|
||||||
|
if !draw {
|
||||||
|
t.Error("a second station near the first was swallowed as a duplicate")
|
||||||
|
}
|
||||||
|
if del {
|
||||||
|
t.Error("deleting by callsign would have removed a spot this station never had")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The connection drops and comes back: Connect sends spot_clear, so the
|
||||||
|
// panorama is empty. If the memory survived that, the next spot for each of
|
||||||
|
// those calls would be suppressed as "already drawn" onto an empty panorama —
|
||||||
|
// the operator's spots would simply stop appearing until they changed
|
||||||
|
// frequency.
|
||||||
|
func TestReconnectingForgetsWhatWasDrawn(t *testing.T) {
|
||||||
|
tci := &TCI{spotsEnabled: true}
|
||||||
|
tci.noteSpot("UN7GK", 14025000)
|
||||||
|
|
||||||
|
tci.mu.Lock()
|
||||||
|
tci.spotFreq = map[string]int64{} // what Connect does alongside spot_clear
|
||||||
|
tci.mu.Unlock()
|
||||||
|
|
||||||
|
if draw, del := tci.noteSpot("UN7GK", 14025000); !draw || del {
|
||||||
|
t.Errorf("after a reconnect: draw=%v delete=%v, want it drawn again and nothing deleted", draw, del)
|
||||||
|
}
|
||||||
|
}
|
||||||
+168
-24
@@ -18,6 +18,7 @@ import (
|
|||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
|
"sync/atomic"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"hamlog/internal/applog"
|
"hamlog/internal/applog"
|
||||||
@@ -46,7 +47,12 @@ type Spot struct {
|
|||||||
SourceID int64 `json:"source_id"` // ID of the cluster server this came from
|
SourceID int64 `json:"source_id"` // ID of the cluster server this came from
|
||||||
SourceName string `json:"source_name"` // display name (handy in the UI when multiple servers)
|
SourceName string `json:"source_name"` // display name (handy in the UI when multiple servers)
|
||||||
Spotter string `json:"spotter"` // DE field
|
Spotter string `json:"spotter"` // DE field
|
||||||
DXCall string `json:"dx_call"` // the DX station heard
|
// SpotterContinent belongs to the SPOT, not to the DX station: one call is
|
||||||
|
// spotted by dozens of skimmers on every continent within a minute. It is
|
||||||
|
// resolved per spot at ingest for exactly that reason — see the note on the
|
||||||
|
// spotter-continent filter in App.tsx.
|
||||||
|
SpotterContinent string `json:"spotter_continent,omitempty"`
|
||||||
|
DXCall string `json:"dx_call"` // the DX station heard
|
||||||
FreqKHz float64 `json:"freq_khz"`
|
FreqKHz float64 `json:"freq_khz"`
|
||||||
FreqHz int64 `json:"freq_hz"`
|
FreqHz int64 `json:"freq_hz"`
|
||||||
Band string `json:"band,omitempty"`
|
Band string `json:"band,omitempty"`
|
||||||
@@ -355,6 +361,18 @@ func (s *session) run() {
|
|||||||
// that gets skipped.
|
// that gets skipped.
|
||||||
var idleTick = 30 * time.Second
|
var idleTick = 30 * time.Second
|
||||||
|
|
||||||
|
// promptTick is the read deadline used until the login handshake is finished.
|
||||||
|
// Short, because a node's "login:" / "password:" carries no newline and is only
|
||||||
|
// visible when the read times out — see the read loop. It costs a few wake-ups
|
||||||
|
// during the first seconds of a connection and nothing afterwards.
|
||||||
|
const promptTick = 700 * time.Millisecond
|
||||||
|
|
||||||
|
// handshakeWindow bounds how long the fast promptTick applies. A node that has
|
||||||
|
// a password configured but never asks for one would otherwise keep the loop
|
||||||
|
// waking every 700 ms for the life of the connection, for a prompt that is never
|
||||||
|
// coming. Any real login exchange is over in a second or two.
|
||||||
|
const handshakeWindow = 20 * time.Second
|
||||||
|
|
||||||
// quietNotice is the silence after which the log says so, once.
|
// quietNotice is the silence after which the log says so, once.
|
||||||
const quietNotice = 10 * time.Minute
|
const quietNotice = 10 * time.Minute
|
||||||
|
|
||||||
@@ -369,10 +387,21 @@ func (s *session) runOnce() (time.Time, error) {
|
|||||||
// failure surfaces as an error on Read — which is the only thing that ends
|
// failure surfaces as an error on Read — which is the only thing that ends
|
||||||
// a session below.
|
// a session below.
|
||||||
d := net.Dialer{Timeout: 10 * time.Second, KeepAlive: 30 * time.Second}
|
d := net.Dialer{Timeout: 10 * time.Second, KeepAlive: 30 * time.Second}
|
||||||
|
// TIMED, and reported. An operator sees "connected" and no spots for a
|
||||||
|
// minute on the first launch, then an instant connection when the program is
|
||||||
|
// restarted — which is the signature of a slow name resolution rather than a
|
||||||
|
// slow cluster (the OS caches the answer, so the second run skips it). The
|
||||||
|
// only way to tell that from a node that simply had nothing to say is to
|
||||||
|
// know how long the dial itself took.
|
||||||
|
dialStart := time.Now()
|
||||||
conn, err := d.Dial("tcp", addr)
|
conn, err := d.Dial("tcp", addr)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
applog.Printf("cluster[%s] dial %s failed after %s: %v", s.cfg.Name, addr, time.Since(dialStart).Round(time.Millisecond), err)
|
||||||
return time.Time{}, fmt.Errorf("dial %s: %w", addr, err)
|
return time.Time{}, fmt.Errorf("dial %s: %w", addr, err)
|
||||||
}
|
}
|
||||||
|
applog.Printf("cluster[%s] connected to %s in %s", s.cfg.Name, addr, time.Since(dialStart).Round(time.Millisecond))
|
||||||
|
linkUpAt := time.Now()
|
||||||
|
firstSpotLogged := false
|
||||||
s.mu.Lock()
|
s.mu.Lock()
|
||||||
s.conn = conn
|
s.conn = conn
|
||||||
s.mu.Unlock()
|
s.mu.Unlock()
|
||||||
@@ -387,16 +416,37 @@ func (s *session) runOnce() (time.Time, error) {
|
|||||||
|
|
||||||
// Login: send on first prompt OR blindly after 1.5s. Many DXSpider
|
// Login: send on first prompt OR blindly after 1.5s. Many DXSpider
|
||||||
// nodes accept the callsign without re-prompting.
|
// nodes accept the callsign without re-prompting.
|
||||||
loginSent := false
|
//
|
||||||
|
// Atomic because the blind-login timer below and the read loop both touch
|
||||||
|
// these. loginSent used to be a plain bool that the timer NEVER SET: the
|
||||||
|
// callsign went out and nothing recorded it, so the password branch — gated on
|
||||||
|
// loginSent — was dead code, and the session could only reach "connected" by
|
||||||
|
// recognising a welcome banner. On a node whose entire greeting is a bare
|
||||||
|
// "login:" and which then demands a password (f5mzn.org:9000), that left the
|
||||||
|
// server stuck at "connecting" for ever while telnet logged in by hand fine.
|
||||||
|
var loginSent, pwdSent atomic.Bool
|
||||||
|
// CompareAndSwap, not a plain store: the timer and the loop can reach these at
|
||||||
|
// the same moment, and the callsign must be written exactly once.
|
||||||
|
sendLogin := func() {
|
||||||
|
if s.login != "" && loginSent.CompareAndSwap(false, true) {
|
||||||
|
_, _ = conn.Write([]byte(s.login + "\r\n"))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Sent ONCE per connection. A node that re-prompts is refusing the password,
|
||||||
|
// and answering with the same one again only loops — better to let the
|
||||||
|
// refusal show in the console than to hide it behind a retry.
|
||||||
|
sendPassword := func() {
|
||||||
|
if s.cfg.Password != "" && loginSent.Load() && pwdSent.CompareAndSwap(false, true) {
|
||||||
|
_, _ = conn.Write([]byte(s.cfg.Password + "\r\n"))
|
||||||
|
}
|
||||||
|
}
|
||||||
if s.login != "" {
|
if s.login != "" {
|
||||||
go func() {
|
go func() {
|
||||||
select {
|
select {
|
||||||
case <-s.stopCh:
|
case <-s.stopCh:
|
||||||
return
|
return
|
||||||
case <-time.After(1500 * time.Millisecond):
|
case <-time.After(1500 * time.Millisecond):
|
||||||
if !loginSent {
|
sendLogin()
|
||||||
_, _ = conn.Write([]byte(s.login + "\r\n"))
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
}
|
}
|
||||||
@@ -442,7 +492,21 @@ func (s *session) runOnce() (time.Time, error) {
|
|||||||
|
|
||||||
var connectedAt time.Time
|
var connectedAt time.Time
|
||||||
var quiet time.Duration // how long the node has said nothing
|
var quiet time.Duration // how long the node has said nothing
|
||||||
|
var quietNoticed bool // the long-silence line is said once
|
||||||
var pending string // a line cut in half by a read deadline
|
var pending string // a line cut in half by a read deadline
|
||||||
|
markConnected := func() {
|
||||||
|
if s.snapshot().State == StateConnected {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
connectedAt = time.Now()
|
||||||
|
s.mu.Lock()
|
||||||
|
s.status.State = StateConnected
|
||||||
|
s.status.ConnectedAt = connectedAt
|
||||||
|
s.status.Error = ""
|
||||||
|
s.mu.Unlock()
|
||||||
|
s.emitStatus()
|
||||||
|
fireInitCommands()
|
||||||
|
}
|
||||||
rd := bufio.NewReader(conn)
|
rd := bufio.NewReader(conn)
|
||||||
for {
|
for {
|
||||||
select {
|
select {
|
||||||
@@ -460,7 +524,21 @@ func (s *session) runOnce() (time.Time, error) {
|
|||||||
// Only a REAL error ends the session. A dead peer still gets caught:
|
// Only a REAL error ends the session. A dead peer still gets caught:
|
||||||
// TCP keepalive probes an idle connection and its failure arrives here
|
// TCP keepalive probes an idle connection and its failure arrives here
|
||||||
// as an error, not as a timeout.
|
// as an error, not as a timeout.
|
||||||
_ = conn.SetReadDeadline(time.Now().Add(idleTick))
|
// SHORT deadline until the handshake is done, the long idle tick after.
|
||||||
|
//
|
||||||
|
// A cluster writes its prompts WITHOUT a trailing newline, and ReadString
|
||||||
|
// only returns on one — so a prompt is never a "line" at all, it is whatever
|
||||||
|
// is sitting in the buffer when the read deadline expires. At the ordinary
|
||||||
|
// 30 s tick that made a bare "login:" invisible for half a minute and a
|
||||||
|
// following "password:" invisible for another, which is long enough for the
|
||||||
|
// node to give up on us. Only the handshake needs the fast tick; once logged
|
||||||
|
// in, a long deadline is exactly what we want (see idleTick).
|
||||||
|
tick := idleTick
|
||||||
|
if time.Since(linkUpAt) < handshakeWindow &&
|
||||||
|
(!loginSent.Load() || (s.cfg.Password != "" && !pwdSent.Load())) {
|
||||||
|
tick = promptTick
|
||||||
|
}
|
||||||
|
_ = conn.SetReadDeadline(time.Now().Add(tick))
|
||||||
chunk, err := rd.ReadString('\n')
|
chunk, err := rd.ReadString('\n')
|
||||||
if err != nil {
|
if err != nil {
|
||||||
var ne net.Error
|
var ne net.Error
|
||||||
@@ -469,16 +547,48 @@ func (s *session) runOnce() (time.Time, error) {
|
|||||||
// Keep it: a spot line straddling the deadline would otherwise lose
|
// Keep it: a spot line straddling the deadline would otherwise lose
|
||||||
// its first half and arrive as nonsense, or vanish entirely.
|
// its first half and arrive as nonsense, or vanish entirely.
|
||||||
pending += chunk
|
pending += chunk
|
||||||
quiet += idleTick
|
// …but a newline-less PROMPT is not half a line, it is a question,
|
||||||
|
// and this is the only place it can ever be seen. Answer it, show it
|
||||||
|
// in the console (an operator watching a stuck server has a right to
|
||||||
|
// see what the node actually asked), and drop it so it is not glued
|
||||||
|
// onto the front of the next real line.
|
||||||
|
if p := strings.TrimSpace(pending); p != "" {
|
||||||
|
switch {
|
||||||
|
case !loginSent.Load() && s.login != "" && isLoginPrompt(p):
|
||||||
|
s.emitLine(p, false)
|
||||||
|
pending = ""
|
||||||
|
sendLogin()
|
||||||
|
if s.cfg.Password == "" {
|
||||||
|
markConnected()
|
||||||
|
}
|
||||||
|
continue
|
||||||
|
case !pwdSent.Load() && isPasswordPrompt(p):
|
||||||
|
s.emitLine(p, false)
|
||||||
|
pending = ""
|
||||||
|
if s.cfg.Password == "" {
|
||||||
|
// Nothing to answer with. Shown in the console rather than
|
||||||
|
// swallowed: an unanswered "password:" sitting there IS the
|
||||||
|
// explanation for a server that never finishes connecting,
|
||||||
|
// and it is something the operator can act on.
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
sendPassword()
|
||||||
|
markConnected()
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
quiet += tick
|
||||||
// Said once at the first long silence, so a genuinely mute node is
|
// Said once at the first long silence, so a genuinely mute node is
|
||||||
// visible without a line every tick.
|
// visible without a line every tick.
|
||||||
if quiet == quietNotice {
|
if !quietNoticed && quiet >= quietNotice {
|
||||||
|
quietNoticed = true
|
||||||
applog.Printf("cluster[%s] no traffic for %s — still connected", s.cfg.Name, quiet)
|
applog.Printf("cluster[%s] no traffic for %s — still connected", s.cfg.Name, quiet)
|
||||||
}
|
}
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
return connectedAt, fmt.Errorf("read: %w", err)
|
return connectedAt, fmt.Errorf("read: %w", err)
|
||||||
}
|
}
|
||||||
|
quietNoticed = false
|
||||||
quiet = 0
|
quiet = 0
|
||||||
line := pending + chunk
|
line := pending + chunk
|
||||||
pending = ""
|
pending = ""
|
||||||
@@ -508,28 +618,23 @@ func (s *session) runOnce() (time.Time, error) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Login on explicit prompt.
|
// Login on explicit prompt — the case where the node DID terminate it with
|
||||||
if !loginSent && s.login != "" && isLoginPrompt(line) {
|
// a newline. The newline-less form is handled on the timeout path above.
|
||||||
_, _ = conn.Write([]byte(s.login + "\r\n"))
|
if !loginSent.Load() && s.login != "" && isLoginPrompt(line) {
|
||||||
loginSent = true
|
s.emitLine(line, false)
|
||||||
|
sendLogin()
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
// Password on prompt (rare).
|
// Password on prompt.
|
||||||
if loginSent && s.cfg.Password != "" && isPasswordPrompt(line) {
|
if !pwdSent.Load() && isPasswordPrompt(line) {
|
||||||
_, _ = conn.Write([]byte(s.cfg.Password + "\r\n"))
|
s.emitLine(line, false)
|
||||||
|
sendPassword()
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
// Mark connected once we've sent login OR seen a welcome banner.
|
// Mark connected once we've sent login OR seen a welcome banner.
|
||||||
if s.snapshot().State != StateConnected && (loginSent || isWelcome(line)) {
|
if loginSent.Load() || isWelcome(line) {
|
||||||
connectedAt = time.Now()
|
markConnected()
|
||||||
s.mu.Lock()
|
|
||||||
s.status.State = StateConnected
|
|
||||||
s.status.ConnectedAt = connectedAt
|
|
||||||
s.status.Error = ""
|
|
||||||
s.mu.Unlock()
|
|
||||||
s.emitStatus()
|
|
||||||
fireInitCommands()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// EVERY line goes to the console — spot or not. This is the whole point:
|
// EVERY line goes to the console — spot or not. This is the whole point:
|
||||||
@@ -556,6 +661,13 @@ func (s *session) runOnce() (time.Time, error) {
|
|||||||
}
|
}
|
||||||
s.mu.Unlock()
|
s.mu.Unlock()
|
||||||
if s.onSpot != nil {
|
if s.onSpot != nil {
|
||||||
|
if !firstSpotLogged {
|
||||||
|
firstSpotLogged = true
|
||||||
|
// The gap between the socket opening and the first spot is the
|
||||||
|
// other half of the answer: a long dial is the network, a quick
|
||||||
|
// dial and a long silence is the node (or the login) instead.
|
||||||
|
applog.Printf("cluster[%s] first spot %s after connecting", s.cfg.Name, time.Since(linkUpAt).Round(time.Millisecond))
|
||||||
|
}
|
||||||
s.onSpot(spot)
|
s.onSpot(spot)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -683,6 +795,38 @@ func parseSpot(line string) (Spot, bool) {
|
|||||||
}, true
|
}, true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// NewLocalSpot builds the Spot for a DX announcement WE just sent, so it lands
|
||||||
|
// in the operator's own list at once.
|
||||||
|
//
|
||||||
|
// A node does not necessarily broadcast a spot back to the station that sent it:
|
||||||
|
// DXSpider suppresses the echo to the originator, and a node-side filter can eat
|
||||||
|
// it too. So an operator spotted a station, watched their own spot list stay
|
||||||
|
// empty, and concluded the spot had never gone out — when it had. This is the
|
||||||
|
// spot the echo would have carried, built from what we sent, deliberately the
|
||||||
|
// same shape so the UI's call+band de-dupe folds the two into one row on the
|
||||||
|
// nodes that DO echo.
|
||||||
|
func NewLocalSpot(srv ServerConfig, spotter, dxCall string, freqKHz float64, comment string) Spot {
|
||||||
|
freqHz := int64(freqKHz*1000 + 0.5)
|
||||||
|
now := time.Now()
|
||||||
|
sp := Spot{
|
||||||
|
SourceID: srv.ID,
|
||||||
|
SourceName: srv.Name,
|
||||||
|
Spotter: strings.ToUpper(strings.TrimSpace(spotter)),
|
||||||
|
DXCall: strings.ToUpper(strings.TrimSpace(dxCall)),
|
||||||
|
FreqKHz: freqKHz,
|
||||||
|
FreqHz: freqHz,
|
||||||
|
Band: bandFromHz(freqHz),
|
||||||
|
Comment: strings.TrimSpace(comment),
|
||||||
|
TimeUTC: now.UTC().Format("1504") + "Z",
|
||||||
|
ReceivedAt: now,
|
||||||
|
}
|
||||||
|
// Raw reads like the node's own broadcast — it is what anything showing the
|
||||||
|
// source line expects, and it keeps a local spot legible in the log.
|
||||||
|
sp.Raw = fmt.Sprintf("DX de %s: %9.1f %-12s %-30s %s",
|
||||||
|
sp.Spotter, sp.FreqKHz, sp.DXCall, sp.Comment, sp.TimeUTC)
|
||||||
|
return sp
|
||||||
|
}
|
||||||
|
|
||||||
func isLoginPrompt(s string) bool {
|
func isLoginPrompt(s string) bool {
|
||||||
low := strings.ToLower(s)
|
low := strings.ToLower(s)
|
||||||
return strings.Contains(low, "login:") ||
|
return strings.Contains(low, "login:") ||
|
||||||
|
|||||||
@@ -0,0 +1,105 @@
|
|||||||
|
package cluster
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bufio"
|
||||||
|
"net"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// A node whose whole greeting is a bare "login:" — no newline, no banner — and
|
||||||
|
// which then demands a password must still log in.
|
||||||
|
//
|
||||||
|
// Reported on f5mzn.org:9000: telnet by hand worked, OpsLog sat at "connecting"
|
||||||
|
// for ever. Two faults met there. The prompts carry no newline, and the read
|
||||||
|
// loop only ever looked at complete LINES, so neither prompt was seen at all;
|
||||||
|
// and the blind 1.5 s login never recorded that it had sent the callsign, which
|
||||||
|
// left the password branch — gated on that flag — permanently switched off.
|
||||||
|
//
|
||||||
|
// The test speaks the node's side literally: "login:" with no newline, then
|
||||||
|
// "password:" with no newline, then a spot. It asserts both answers arrive and
|
||||||
|
// that the session reaches Connected without any welcome banner to lean on.
|
||||||
|
func TestBareLoginAndPasswordPromptsWithoutNewlines(t *testing.T) {
|
||||||
|
ln, err := net.Listen("tcp", "127.0.0.1:0")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
defer ln.Close()
|
||||||
|
|
||||||
|
host, portStr, _ := net.SplitHostPort(ln.Addr().String())
|
||||||
|
port, err := strconv.Atoi(portStr)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
type answers struct{ login, pwd string }
|
||||||
|
got := make(chan answers, 1)
|
||||||
|
go func() {
|
||||||
|
c, err := ln.Accept()
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer c.Close()
|
||||||
|
rd := bufio.NewReader(c)
|
||||||
|
// No newline, exactly as the node sends it.
|
||||||
|
if _, err := c.Write([]byte("login: ")); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
call, err := rd.ReadString('\n')
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if _, err := c.Write([]byte("password: ")); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
pwd, err := rd.ReadString('\n')
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
got <- answers{strings.TrimSpace(call), strings.TrimSpace(pwd)}
|
||||||
|
// Something to prove the link is live and parsing again afterwards.
|
||||||
|
_, _ = c.Write([]byte("DX de F4BPO: 14074.0 OY1CT FT8 1234Z\r\n"))
|
||||||
|
time.Sleep(time.Second)
|
||||||
|
}()
|
||||||
|
|
||||||
|
spots := make(chan Spot, 4)
|
||||||
|
s := &session{
|
||||||
|
cfg: ServerConfig{Name: "pwd node", Host: host, Port: port, Password: "s3cret"},
|
||||||
|
login: "F4BPO",
|
||||||
|
onSpot: func(sp Spot) { spots <- sp },
|
||||||
|
onLine: func(Line) {},
|
||||||
|
onStatus: func() {},
|
||||||
|
stopCh: make(chan struct{}),
|
||||||
|
}
|
||||||
|
done := make(chan error, 1)
|
||||||
|
go func() { _, err := s.runOnce(); done <- err }()
|
||||||
|
defer func() { close(s.stopCh); <-done }()
|
||||||
|
|
||||||
|
select {
|
||||||
|
case a := <-got:
|
||||||
|
if a.login != "F4BPO" {
|
||||||
|
t.Errorf("callsign sent = %q, want F4BPO", a.login)
|
||||||
|
}
|
||||||
|
if a.pwd != "s3cret" {
|
||||||
|
t.Errorf("password sent = %q, want s3cret — the prompt carried no newline", a.pwd)
|
||||||
|
}
|
||||||
|
case <-time.After(10 * time.Second):
|
||||||
|
t.Fatal("the node's newline-less prompts were never answered")
|
||||||
|
}
|
||||||
|
|
||||||
|
select {
|
||||||
|
case sp := <-spots:
|
||||||
|
if sp.DXCall != "OY1CT" {
|
||||||
|
t.Errorf("spot from the wrong station: %+v", sp)
|
||||||
|
}
|
||||||
|
case <-time.After(5 * time.Second):
|
||||||
|
t.Fatal("no spot after the login — the stream is not being parsed")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Connected without a welcome banner: the handshake alone must be enough.
|
||||||
|
if st := s.snapshot().State; st != StateConnected {
|
||||||
|
t.Errorf("state = %q, want %q — the server would still show as connecting", st, StateConnected)
|
||||||
|
}
|
||||||
|
}
|
||||||
+27
-6
@@ -147,7 +147,17 @@ func NowISO() string { return time.Now().UTC().Format("2006-01-02T15:04:05.000Z"
|
|||||||
|
|
||||||
// Open opens (and creates if needed) the SQLite database at the given path,
|
// Open opens (and creates if needed) the SQLite database at the given path,
|
||||||
// enables performance PRAGMAs, and applies embedded migrations.
|
// enables performance PRAGMAs, and applies embedded migrations.
|
||||||
func Open(path string) (*sql.DB, error) {
|
//
|
||||||
|
// This is the SETTINGS database, which gets the full schema — see roles.go for
|
||||||
|
// why. Use OpenLogbook for a database that holds contacts only.
|
||||||
|
func Open(path string) (*sql.DB, error) { return open(path, RoleAll) }
|
||||||
|
|
||||||
|
// OpenLogbook opens a SQLite logbook: the qso table and nothing from the
|
||||||
|
// settings side, and any unused settings tables an earlier version left in it
|
||||||
|
// are dropped if they are empty.
|
||||||
|
func OpenLogbook(path string) (*sql.DB, error) { return open(path, RoleLogbook) }
|
||||||
|
|
||||||
|
func open(path string, role Role) (*sql.DB, error) {
|
||||||
// Escape only the two characters a path could contain that the DSN would
|
// Escape only the two characters a path could contain that the DSN would
|
||||||
// otherwise read as its query/fragment delimiters. Windows separators
|
// otherwise read as its query/fragment delimiters. Windows separators
|
||||||
// (\\ and the drive ':') are left intact — url.PathEscape would mangle them.
|
// (\\ and the drive ':') are left intact — url.PathEscape would mangle them.
|
||||||
@@ -162,10 +172,12 @@ func Open(path string) (*sql.DB, error) {
|
|||||||
return nil, fmt.Errorf("ping sqlite: %w", err)
|
return nil, fmt.Errorf("ping sqlite: %w", err)
|
||||||
}
|
}
|
||||||
Dialect = "sqlite"
|
Dialect = "sqlite"
|
||||||
if err := migrate(conn, nil, path, filepath.Base(path)); err != nil {
|
label := filepath.Base(path)
|
||||||
|
if err := migrate(conn, nil, path, label, role); err != nil {
|
||||||
_ = conn.Close()
|
_ = conn.Close()
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
pruneForeignTables(conn, role, label)
|
||||||
return conn, nil
|
return conn, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -236,7 +248,7 @@ func backupBeforeRewrite(conn *sql.DB, dbPath, migration string) {
|
|||||||
// interleaved migration runs in one log were indistinguishable — an operator
|
// interleaved migration runs in one log were indistinguishable — an operator
|
||||||
// reported "migrations are very slow" and the lines gave no way to tell one
|
// reported "migrations are very slow" and the lines gave no way to tell one
|
||||||
// database migrated three times from three databases migrated once.
|
// database migrated three times from three databases migrated once.
|
||||||
func migrate(conn *sql.DB, translate func(string) string, dbPath, label string) error {
|
func migrate(conn *sql.DB, translate func(string) string, dbPath, label string, role Role) error {
|
||||||
// A non-nil translator means this is the MySQL connection (use the
|
// A non-nil translator means this is the MySQL connection (use the
|
||||||
// per-statement, FK-aware path); nil means a SQLite connection. This is
|
// per-statement, FK-aware path); nil means a SQLite connection. This is
|
||||||
// determined by the caller's argument, NOT the global Dialect, so the
|
// determined by the caller's argument, NOT the global Dialect, so the
|
||||||
@@ -331,9 +343,18 @@ func migrate(conn *sql.DB, translate func(string) string, dbPath, label string)
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("begin tx for %s: %w", name, err)
|
return fmt.Errorf("begin tx for %s: %w", name, err)
|
||||||
}
|
}
|
||||||
if _, err := tx.Exec(sqlText); err != nil {
|
// Statement by statement rather than one Exec of the whole file: the role
|
||||||
_ = tx.Rollback()
|
// filter works per statement, and a settings-table statement must not
|
||||||
return fmt.Errorf("apply migration %s: %w", name, err)
|
// reach a logbook database (see roles.go). Still one transaction, so the
|
||||||
|
// file remains atomic.
|
||||||
|
for _, stmt := range splitStatements(sqlText) {
|
||||||
|
if !keepForRole(stmt, role) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if _, err := tx.Exec(stmt); err != nil {
|
||||||
|
_ = tx.Rollback()
|
||||||
|
return fmt.Errorf("apply migration %s: %w", name, err)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if _, err := tx.Exec(`INSERT INTO schema_migrations(name) VALUES(?)`, name); err != nil {
|
if _, err := tx.Exec(`INSERT INTO schema_migrations(name) VALUES(?)`, name); err != nil {
|
||||||
_ = tx.Rollback()
|
_ = tx.Rollback()
|
||||||
|
|||||||
@@ -0,0 +1,87 @@
|
|||||||
|
package db
|
||||||
|
|
||||||
|
import (
|
||||||
|
"regexp"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
// A TEXT column that an index is built on must be listed in varcharColumns.
|
||||||
|
//
|
||||||
|
// MySQL cannot index a TEXT column without a prefix length: the migration dies
|
||||||
|
// with error 1170 — and it dies again on every startup afterwards, leaving the
|
||||||
|
// operator with a logbook that will not connect and no way forward from the
|
||||||
|
// interface. The translator only emits VARCHAR for the names in varcharColumns,
|
||||||
|
// and that list is maintained by hand.
|
||||||
|
//
|
||||||
|
// So: read the migrations, work out which columns are TEXT, find which are
|
||||||
|
// indexed, and insist the list covers the overlap. Integer columns are indexed
|
||||||
|
// perfectly well and are none of this test's business.
|
||||||
|
func TestIndexedTextColumnsAreVarchar(t *testing.T) {
|
||||||
|
files, err := migrationsFS.ReadDir("migrations")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("read migrations: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// name → declared type, from "ADD COLUMN name TYPE" and from the column
|
||||||
|
// lines inside a CREATE TABLE body.
|
||||||
|
declared := map[string]string{}
|
||||||
|
reAdd := regexp.MustCompile(`(?i)ADD\s+COLUMN\s+` + "`" + `?(\w+)` + "`" + `?\s+(\w+)`)
|
||||||
|
reCol := regexp.MustCompile(`(?im)^\s*` + "`" + `?(\w+)` + "`" + `?\s+(TEXT|VARCHAR|INTEGER|INT|REAL|BLOB|DATETIME|BOOLEAN)\b`)
|
||||||
|
reIdx := regexp.MustCompile(`(?i)CREATE\s+INDEX\s+(?:IF\s+NOT\s+EXISTS\s+)?\S+\s+ON\s+\S+\s*\(([^)]*)\)`)
|
||||||
|
|
||||||
|
var indexed []struct{ file, col string }
|
||||||
|
for _, f := range files {
|
||||||
|
if f.IsDir() || !strings.HasSuffix(f.Name(), ".sql") {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
body, err := migrationsFS.ReadFile("migrations/" + f.Name())
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("read %s: %v", f.Name(), err)
|
||||||
|
}
|
||||||
|
src := string(body)
|
||||||
|
for _, m := range reAdd.FindAllStringSubmatch(src, -1) {
|
||||||
|
declared[strings.ToLower(m[1])] = strings.ToUpper(m[2])
|
||||||
|
}
|
||||||
|
for _, m := range reCol.FindAllStringSubmatch(src, -1) {
|
||||||
|
if _, seen := declared[strings.ToLower(m[1])]; !seen {
|
||||||
|
declared[strings.ToLower(m[1])] = strings.ToUpper(m[2])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for _, m := range reIdx.FindAllStringSubmatch(src, -1) {
|
||||||
|
for _, col := range strings.Split(m[1], ",") {
|
||||||
|
col = strings.TrimSpace(col)
|
||||||
|
if col == "" || strings.Contains(col, "(") {
|
||||||
|
continue // a prefix length or an expression is MySQL-safe already
|
||||||
|
}
|
||||||
|
col = strings.Trim(col, "`\"")
|
||||||
|
if i := strings.IndexAny(col, " \t"); i > 0 {
|
||||||
|
col = col[:i] // "col DESC"
|
||||||
|
}
|
||||||
|
indexed = append(indexed, struct{ file, col string }{f.Name(), strings.ToLower(col)})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(indexed) == 0 || len(declared) == 0 {
|
||||||
|
t.Fatal("nothing parsed out of the migrations — this test has stopped checking anything")
|
||||||
|
}
|
||||||
|
|
||||||
|
textIndexed := 0
|
||||||
|
for _, ix := range indexed {
|
||||||
|
typ, known := declared[ix.col]
|
||||||
|
if !known || typ != "TEXT" {
|
||||||
|
continue // an integer index, or a column this test could not type
|
||||||
|
}
|
||||||
|
textIndexed++
|
||||||
|
if !varcharColumns[ix.col] {
|
||||||
|
t.Errorf("%s indexes the TEXT column %q, which is not in varcharColumns — "+
|
||||||
|
"on MySQL that migration fails with error 1170 and the logbook stops connecting for good",
|
||||||
|
ix.file, ix.col)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if textIndexed == 0 {
|
||||||
|
t.Fatal("no indexed TEXT column found — the parsing has drifted and this test checks nothing")
|
||||||
|
}
|
||||||
|
t.Logf("%d indexed TEXT column(s) checked against varcharColumns", textIndexed)
|
||||||
|
}
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
-- A stable identity per contact, for folder-based synchronisation.
|
||||||
|
--
|
||||||
|
-- Two PCs exchanging changes through a shared folder need to name the SAME
|
||||||
|
-- contact in both logs. "the QSO with M0ABC at 14:32" is a guess, and the two
|
||||||
|
-- machines can disagree about which row that is — so an edit or a deletion
|
||||||
|
-- cannot be addressed at all without an identity that travels with the record.
|
||||||
|
--
|
||||||
|
-- A REAL COLUMN, indexed, rather than a key inside extras_json. The identity is
|
||||||
|
-- looked up once per incoming change, and on a 120 000-QSO logbook scanning
|
||||||
|
-- JSON for it would turn every sync into a full table read. A column costs one
|
||||||
|
-- migration; the JSON would cost a scan every time.
|
||||||
|
--
|
||||||
|
-- sync_uid is listed in varcharColumns (internal/db/mysql.go): MySQL cannot
|
||||||
|
-- index a TEXT column without a prefix length, and a migration that tries dies
|
||||||
|
-- with error 1170 on every startup thereafter, with no way out from the UI.
|
||||||
|
--
|
||||||
|
-- Empty on every existing row, and it STAYS empty on most of them. The change
|
||||||
|
-- log starts empty too, so contacts logged before synchronisation was switched
|
||||||
|
-- on are never exchanged: nothing has to be copied across, and an identity is
|
||||||
|
-- stamped only on a contact that is actually logged, edited or deleted from
|
||||||
|
-- then on. Seeding a second machine with the existing log is a one-time copy of
|
||||||
|
-- the database or an ADIF import, not something synchronisation does.
|
||||||
|
ALTER TABLE qso ADD COLUMN sync_uid TEXT NOT NULL DEFAULT '';
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_qso_sync_uid ON qso (sync_uid);
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
-- The lookup cache gains the IOTA reference QRZ was already sending.
|
||||||
|
--
|
||||||
|
-- QRZ's XML carries <iota>EU-048</iota> for an operator on an island, and
|
||||||
|
-- nothing read it — so the one place an IOTA reference can be known BEFORE the
|
||||||
|
-- contact is logged was thrown away on every lookup. There is no live "who is
|
||||||
|
-- on an island right now" feed anywhere (unlike POTA), which makes the callbook
|
||||||
|
-- record the practical source.
|
||||||
|
ALTER TABLE callsign_cache ADD COLUMN iota TEXT;
|
||||||
@@ -67,6 +67,10 @@ var varcharColumns = map[string]bool{
|
|||||||
"callsign": true, "qso_date": true, "band": true, "mode": true,
|
"callsign": true, "qso_date": true, "band": true, "mode": true,
|
||||||
"grid": true, "station_callsign": true, "state": true, "contest_id": true,
|
"grid": true, "station_callsign": true, "state": true, "contest_id": true,
|
||||||
"sat_name": true, "prop_mode": true, "sig": true, "wwff_ref": true, "skcc": true,
|
"sat_name": true, "prop_mode": true, "sig": true, "wwff_ref": true, "skcc": true,
|
||||||
|
"sync_uid": true, // qso index (0029) — folder-sync identity, looked up per record
|
||||||
|
// A new indexed TEXT column MUST be added here. TestIndexedTextColumnsAreVarchar
|
||||||
|
// reads the migrations and fails if one is missing, because the alternative is
|
||||||
|
// a MySQL logbook that stops connecting for good on error 1170.
|
||||||
// integrations_udp index (0011)
|
// integrations_udp index (0011)
|
||||||
"direction": true,
|
"direction": true,
|
||||||
// award_references composite primary key (0017)
|
// award_references composite primary key (0017)
|
||||||
@@ -248,7 +252,7 @@ func OpenMySQL(c MySQLConfig) (*sql.DB, error) {
|
|||||||
return nil, rerr
|
return nil, rerr
|
||||||
}
|
}
|
||||||
// Then apply only the migrations it's missing.
|
// Then apply only the migrations it's missing.
|
||||||
err = migrate(conn, mysqlDDL, "", "mysql:"+name)
|
err = migrate(conn, mysqlDDL, "", "mysql:"+name, RoleLogbook)
|
||||||
}
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
_ = conn.Close()
|
_ = conn.Close()
|
||||||
@@ -339,7 +343,9 @@ func applyMySQLBaseline(conn *sql.DB) error {
|
|||||||
// database. Labelled so its (fast) migration lines are not mistaken for a
|
// database. Labelled so its (fast) migration lines are not mistaken for a
|
||||||
// real database being migrated — in one operator's log this pass sat between
|
// real database being migrated — in one operator's log this pass sat between
|
||||||
// two slow MySQL runs and looked like a third database.
|
// two slow MySQL runs and looked like a third database.
|
||||||
if err := migrate(mem, nil, "", "baseline:memory"); err != nil {
|
// RoleLogbook: the baseline defines what a FRESH shared logbook gets, and a
|
||||||
|
// logbook has no business holding settings or station profiles.
|
||||||
|
if err := migrate(mem, nil, "", "baseline:memory", RoleLogbook); err != nil {
|
||||||
return fmt.Errorf("build baseline schema: %w", err)
|
return fmt.Errorf("build baseline schema: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,321 @@
|
|||||||
|
package db
|
||||||
|
|
||||||
|
// Which tables belong in which database.
|
||||||
|
//
|
||||||
|
// OpsLog keeps settings and contacts apart — a settings database (settings.db /
|
||||||
|
// opslog.db) and a logbook (logbook.db, a per-profile file, or a shared MySQL).
|
||||||
|
// The SEPARATION of the data was real from the start; the SCHEMA was not: every
|
||||||
|
// target got the whole migration set, so a shared MySQL logbook grew a settings
|
||||||
|
// table and a station_profiles table that nothing ever wrote to. An operator
|
||||||
|
// inspecting the server with phpMyAdmin had no way to tell which copy was
|
||||||
|
// authoritative — a fair question, and the reason for this file.
|
||||||
|
//
|
||||||
|
// So a migration statement is now filtered by the ROLE of the database it is
|
||||||
|
// being applied to. Only two rules, and both fail safe:
|
||||||
|
//
|
||||||
|
// - RoleAll (the settings database) applies everything, exactly as before.
|
||||||
|
// It has to: a legacy single-file installation holds its QSOs there, and it
|
||||||
|
// still serves as the logbook when no separate one could be created.
|
||||||
|
// - RoleLogbook applies everything EXCEPT statements aimed at a table on the
|
||||||
|
// settings side. A table this file does not know about is kept, in both —
|
||||||
|
// an unrecognised future table behaves as it does today rather than
|
||||||
|
// silently going missing from one database.
|
||||||
|
|
||||||
|
import (
|
||||||
|
"database/sql"
|
||||||
|
"fmt"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Role is what a database is for.
|
||||||
|
type Role int
|
||||||
|
|
||||||
|
const (
|
||||||
|
// RoleAll applies every migration statement. The settings database.
|
||||||
|
RoleAll Role = iota
|
||||||
|
// RoleLogbook applies only what the contacts need.
|
||||||
|
RoleLogbook
|
||||||
|
)
|
||||||
|
|
||||||
|
// settingsTables are owned by the settings database. Every one of them is
|
||||||
|
// reached through the settings connection in app.go — grep NewRepo/NewStore
|
||||||
|
// there: only qso.NewRepo is given the logbook connection.
|
||||||
|
//
|
||||||
|
// Ordered children-before-parents, because pruneForeignTables drops them in
|
||||||
|
// this order and operating_antennas has a foreign key into operating_stations.
|
||||||
|
var settingsTables = []string{
|
||||||
|
"operating_antenna_bands",
|
||||||
|
"operating_antennas",
|
||||||
|
"operating_antennas_new",
|
||||||
|
"operating_stations",
|
||||||
|
"operating_stations_new",
|
||||||
|
"award_references",
|
||||||
|
"qsl_templates",
|
||||||
|
"cluster_servers",
|
||||||
|
"integrations_udp",
|
||||||
|
"callsign_cache",
|
||||||
|
"station_profiles",
|
||||||
|
"settings",
|
||||||
|
}
|
||||||
|
|
||||||
|
// keepForRole reports whether one migration statement applies to this role.
|
||||||
|
func keepForRole(stmt string, role Role) bool {
|
||||||
|
if role == RoleAll {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
t := stmtTable(stmt)
|
||||||
|
if t == "" {
|
||||||
|
return true // not a table statement (PRAGMA, or a shape we don't parse)
|
||||||
|
}
|
||||||
|
for _, s := range settingsTables {
|
||||||
|
if t == s {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
// stmtTable returns the lower-cased table a statement acts on, or "".
|
||||||
|
//
|
||||||
|
// Deliberately literal: it recognises the handful of statement shapes the
|
||||||
|
// migrations actually use, and returns "" for anything else — which keeps the
|
||||||
|
// statement. Guessing would be the only way to drop something by accident.
|
||||||
|
func stmtTable(stmt string) string {
|
||||||
|
f := strings.Fields(strings.ToLower(stmt))
|
||||||
|
at := func(i int) string {
|
||||||
|
if i < len(f) {
|
||||||
|
return f[i]
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
// Skip the leading keywords that carry no table name.
|
||||||
|
switch {
|
||||||
|
case at(0) == "create" || at(0) == "drop":
|
||||||
|
// CREATE [UNIQUE] INDEX <name> ON <table> …
|
||||||
|
// CREATE TABLE [IF NOT EXISTS] <table> … / DROP TABLE [IF EXISTS] <t>
|
||||||
|
//
|
||||||
|
// The "ON" search is confined to an INDEX statement on purpose: a CREATE
|
||||||
|
// TABLE body is full of "ON DELETE CASCADE", and scanning the whole
|
||||||
|
// statement for "on" once made every foreign-keyed table report itself as
|
||||||
|
// a table named "delete" — unrecognised, therefore kept, therefore created
|
||||||
|
// in a logbook that had no use for it.
|
||||||
|
if at(1) == "index" || (at(1) == "unique" && at(2) == "index") {
|
||||||
|
for i, w := range f {
|
||||||
|
if w == "on" && i+1 < len(f) {
|
||||||
|
return cleanIdent(f[i+1])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
i := 1
|
||||||
|
for at(i) == "unique" || at(i) == "table" || at(i) == "index" ||
|
||||||
|
at(i) == "if" || at(i) == "not" || at(i) == "exists" || at(i) == "view" {
|
||||||
|
i++
|
||||||
|
}
|
||||||
|
return cleanIdent(at(i))
|
||||||
|
case at(0) == "alter":
|
||||||
|
return cleanIdent(at(2)) // ALTER TABLE <table> …
|
||||||
|
case at(0) == "insert" || at(0) == "replace":
|
||||||
|
i := 1
|
||||||
|
for at(i) == "or" || at(i) == "ignore" || at(i) == "into" || at(i) == "replace" {
|
||||||
|
i++
|
||||||
|
}
|
||||||
|
return cleanIdent(at(i))
|
||||||
|
case at(0) == "update":
|
||||||
|
return cleanIdent(at(1))
|
||||||
|
case at(0) == "delete":
|
||||||
|
return cleanIdent(at(2)) // DELETE FROM <table>
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
// cleanIdent strips quoting and anything glued to the name — "qso(id)" from an
|
||||||
|
// index, `settings` from the MySQL translation, "qso;" from a split statement.
|
||||||
|
func cleanIdent(s string) string {
|
||||||
|
s = strings.TrimSpace(s)
|
||||||
|
if i := strings.IndexAny(s, "(;"); i >= 0 {
|
||||||
|
s = s[:i]
|
||||||
|
}
|
||||||
|
return strings.Trim(s, "`\"'[]")
|
||||||
|
}
|
||||||
|
|
||||||
|
// pruneForeignTables removes settings tables from a logbook database that an
|
||||||
|
// earlier version created there.
|
||||||
|
//
|
||||||
|
// ONLY WHEN EMPTY, without exception. A table with rows in it is data, whatever
|
||||||
|
// this file thinks it is for: a profile pointing at a legacy combined database
|
||||||
|
// as its logbook is a real configuration, and dropping its profiles because the
|
||||||
|
// schema now says they belong elsewhere would be destroying a log-keeping
|
||||||
|
// operator's work on the strength of a tidiness rule.
|
||||||
|
//
|
||||||
|
// Best effort throughout: a logbook the user cannot drop tables in (a restricted
|
||||||
|
// MySQL grant) keeps its empty tables and works exactly as it does today.
|
||||||
|
func pruneForeignTables(conn *sql.DB, role Role, label string) {
|
||||||
|
if role != RoleLogbook || conn == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// Once per database, recorded like a migration.
|
||||||
|
//
|
||||||
|
// The check itself is a COUNT(*) per settings table — twelve round trips,
|
||||||
|
// which is nothing locally and is paid on EVERY open of a remote MySQL
|
||||||
|
// logbook, including every profile switch. There is nothing to find after the
|
||||||
|
// first pass: the role filter means no settings table is ever created in a
|
||||||
|
// logbook again.
|
||||||
|
if _, err := conn.Exec(`INSERT INTO schema_migrations(name) VALUES(?)`, prunedMarker); err != nil {
|
||||||
|
return // already recorded (primary key), or the table is not writable
|
||||||
|
}
|
||||||
|
dropped := 0
|
||||||
|
for _, t := range settingsTables {
|
||||||
|
var n int
|
||||||
|
// A missing table errors here, which is the "nothing to do" answer.
|
||||||
|
if err := conn.QueryRow(`SELECT COUNT(*) FROM ` + quoteIdent(t)).Scan(&n); err != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if n != 0 {
|
||||||
|
logf("db[%s]: keeping %s — it has %d row(s)", label, t, n)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if _, err := conn.Exec(`DROP TABLE ` + quoteIdent(t)); err != nil {
|
||||||
|
logf("db[%s]: could not drop unused %s: %v", label, t, err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
dropped++
|
||||||
|
}
|
||||||
|
if dropped > 0 {
|
||||||
|
logf("db[%s]: dropped %d unused settings table(s) — this database holds contacts only", label, dropped)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// prunedMarker records, in schema_migrations, that a logbook has had its unused
|
||||||
|
// settings tables removed. Named like a migration and stored beside them because
|
||||||
|
// that is exactly what it is: a one-off schema step, and the applied set is
|
||||||
|
// already read in a single query at every open.
|
||||||
|
const prunedMarker = "_opslog_pruned_settings_tables"
|
||||||
|
|
||||||
|
// quoteIdent quotes one of OUR OWN table names for either dialect. Backticks
|
||||||
|
// work in MySQL and in SQLite alike, which is why the migrations use them.
|
||||||
|
func quoteIdent(s string) string { return "`" + s + "`" }
|
||||||
|
|
||||||
|
// DropRedundantSettingsTables removes the settings tables from a logbook
|
||||||
|
// database EVEN IF THEY HAVE ROWS.
|
||||||
|
//
|
||||||
|
// Reserved for the one case where those rows are provably a stale duplicate:
|
||||||
|
// the logbook file was seeded by VACUUM INTO from the old combined database
|
||||||
|
// (see the split at startup), so every profile and every setting in it is a
|
||||||
|
// copy of what the settings database still holds and is authoritative for.
|
||||||
|
// Nothing reads them — the settings connection is a different file entirely —
|
||||||
|
// and leaving them behind is what made the two databases look interchangeable.
|
||||||
|
//
|
||||||
|
// The caller must have established that authority. pruneForeignTables is the
|
||||||
|
// safe default for every other situation.
|
||||||
|
func DropRedundantSettingsTables(conn *sql.DB, label string) {
|
||||||
|
if conn == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
dropped := 0
|
||||||
|
for _, t := range settingsTables {
|
||||||
|
if err := conn.QueryRow(`SELECT COUNT(*) FROM ` + quoteIdent(t)).Scan(new(int)); err != nil {
|
||||||
|
continue // not there: nothing to do
|
||||||
|
}
|
||||||
|
if _, err := conn.Exec(`DROP TABLE ` + quoteIdent(t)); err != nil {
|
||||||
|
logf("db[%s]: could not drop redundant %s: %v", label, t, err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
dropped++
|
||||||
|
}
|
||||||
|
if dropped > 0 {
|
||||||
|
logf("db[%s]: dropped %d settings table(s) copied by the logbook split — the settings database keeps the originals", label, dropped)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// EnsureQSOTable recreates the contacts table if it is missing.
|
||||||
|
//
|
||||||
|
// It exists so dropping an EMPTY qso table from the settings database is a
|
||||||
|
// reversible act. The settings database can still be pressed into service as the
|
||||||
|
// logbook — that is the fallback when no separate logbook file can be created —
|
||||||
|
// and the migrations that would have built the table are recorded as applied, so
|
||||||
|
// nothing would ever build it again. This does, from the same migrations, on
|
||||||
|
// demand.
|
||||||
|
//
|
||||||
|
// The schema is derived rather than duplicated: the migrations are replayed on a
|
||||||
|
// throwaway in-memory SQLite whose sqlite_master then holds the FINAL shape of
|
||||||
|
// the table with every ALTER-added column folded in. Same trick as the MySQL
|
||||||
|
// baseline, and for the same reason — there is no second schema to drift.
|
||||||
|
//
|
||||||
|
// SQLite only: the shared MySQL logbook is never the settings database.
|
||||||
|
func EnsureQSOTable(conn *sql.DB) error {
|
||||||
|
if conn == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if err := conn.QueryRow(`SELECT COUNT(*) FROM qso`).Scan(new(int)); err == nil {
|
||||||
|
return nil // already there
|
||||||
|
}
|
||||||
|
stmts, err := qsoSchemaDDL()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
for _, st := range stmts {
|
||||||
|
if _, err := conn.Exec(st); err != nil {
|
||||||
|
return fmt.Errorf("recreate qso table: %w", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
logf("db: recreated the qso table — this database is being used as the logbook")
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// qsoSchemaDDL returns the CREATE statements for the qso table and its indexes,
|
||||||
|
// in that order.
|
||||||
|
func qsoSchemaDDL() ([]string, error) {
|
||||||
|
mem, err := sql.Open("sqlite", "file:opslog_qsoschema?mode=memory&cache=shared")
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("open schema sqlite: %w", err)
|
||||||
|
}
|
||||||
|
defer mem.Close()
|
||||||
|
if err := migrate(mem, nil, "", "qso-schema:memory", RoleLogbook); err != nil {
|
||||||
|
return nil, fmt.Errorf("build qso schema: %w", err)
|
||||||
|
}
|
||||||
|
rows, err := mem.Query(`SELECT type, sql FROM sqlite_master
|
||||||
|
WHERE sql IS NOT NULL AND tbl_name = 'qso'`)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
var tables, indexes []string
|
||||||
|
for rows.Next() {
|
||||||
|
var typ, s string
|
||||||
|
if err := rows.Scan(&typ, &s); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if typ == "table" {
|
||||||
|
tables = append(tables, s)
|
||||||
|
} else {
|
||||||
|
indexes = append(indexes, s)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(tables) == 0 {
|
||||||
|
return nil, fmt.Errorf("qso table not found in the derived schema")
|
||||||
|
}
|
||||||
|
return append(tables, indexes...), rows.Err()
|
||||||
|
}
|
||||||
|
|
||||||
|
// DropEmptyQSOTable removes the contacts table from a database that is not the
|
||||||
|
// logbook — the settings database, once its QSOs live in their own file.
|
||||||
|
//
|
||||||
|
// Only when empty, and reversible: EnsureQSOTable builds it again the moment
|
||||||
|
// this database is asked to serve as the logbook.
|
||||||
|
func DropEmptyQSOTable(conn *sql.DB, label string) {
|
||||||
|
if conn == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
var n int
|
||||||
|
if err := conn.QueryRow(`SELECT COUNT(*) FROM qso`).Scan(&n); err != nil {
|
||||||
|
return // not there: nothing to do
|
||||||
|
}
|
||||||
|
if n != 0 {
|
||||||
|
return // contacts: this table is data, whatever the schema says
|
||||||
|
}
|
||||||
|
if _, err := conn.Exec(`DROP TABLE qso`); err != nil {
|
||||||
|
logf("db[%s]: could not drop the unused qso table: %v", label, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
logf("db[%s]: dropped the unused qso table — the contacts live in their own database", label)
|
||||||
|
}
|
||||||
@@ -0,0 +1,283 @@
|
|||||||
|
package db
|
||||||
|
|
||||||
|
import (
|
||||||
|
"path/filepath"
|
||||||
|
"sort"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestStmtTable(t *testing.T) {
|
||||||
|
cases := map[string]string{
|
||||||
|
"CREATE TABLE station_profiles (\n id INTEGER PRIMARY KEY)": "station_profiles",
|
||||||
|
"CREATE TABLE IF NOT EXISTS settings (`key` TEXT PRIMARY KEY)": "settings",
|
||||||
|
"CREATE UNIQUE INDEX idx_qso_uid ON qso(sync_uid)": "qso",
|
||||||
|
"CREATE INDEX idx_ref ON award_references (award_code)": "award_references",
|
||||||
|
"ALTER TABLE qso ADD COLUMN ant_path TEXT NOT NULL DEFAULT ''": "qso",
|
||||||
|
"ALTER TABLE `station_profiles` ADD COLUMN my_cq_zone TEXT": "station_profiles",
|
||||||
|
"INSERT INTO settings(`key`, value) VALUES('x','y')": "settings",
|
||||||
|
"INSERT OR IGNORE INTO cluster_servers(name) VALUES('dxc')": "cluster_servers",
|
||||||
|
"UPDATE qso SET callsign = UPPER(callsign)": "qso",
|
||||||
|
"DELETE FROM operating_antennas WHERE station_id IS NULL": "operating_antennas",
|
||||||
|
"DROP TABLE IF EXISTS operating_stations_new": "operating_stations_new",
|
||||||
|
"PRAGMA foreign_keys = off": "",
|
||||||
|
"": "",
|
||||||
|
}
|
||||||
|
for in, want := range cases {
|
||||||
|
if got := stmtTable(in); got != want {
|
||||||
|
t.Errorf("stmtTable(%.40q) = %q, want %q", in, got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestKeepForRole(t *testing.T) {
|
||||||
|
// The settings database takes everything, exactly as before this existed.
|
||||||
|
for _, s := range []string{"CREATE TABLE settings (a TEXT)", "CREATE TABLE qso (a TEXT)"} {
|
||||||
|
if !keepForRole(s, RoleAll) {
|
||||||
|
t.Fatalf("RoleAll dropped %q", s)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// A logbook takes the contacts and refuses the settings side.
|
||||||
|
if !keepForRole("CREATE INDEX i ON qso(callsign)", RoleLogbook) {
|
||||||
|
t.Fatal("logbook dropped a qso statement")
|
||||||
|
}
|
||||||
|
if keepForRole("CREATE TABLE station_profiles (id INTEGER)", RoleLogbook) {
|
||||||
|
t.Fatal("logbook accepted station_profiles")
|
||||||
|
}
|
||||||
|
// An unrecognised statement — a future table, a PRAGMA — is kept, so a new
|
||||||
|
// migration behaves as it does today rather than vanishing from one database.
|
||||||
|
if !keepForRole("CREATE TABLE something_new (id INTEGER)", RoleLogbook) {
|
||||||
|
t.Fatal("logbook dropped an unknown table")
|
||||||
|
}
|
||||||
|
if !keepForRole("PRAGMA foreign_keys = off", RoleLogbook) {
|
||||||
|
t.Fatal("logbook dropped a PRAGMA")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// tablesIn lists the tables of an open database.
|
||||||
|
func tablesIn(t *testing.T, path string) []string {
|
||||||
|
t.Helper()
|
||||||
|
conn, err := Open(path) // RoleAll: opening must not change what is there
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
defer conn.Close()
|
||||||
|
rows, err := conn.Query(`SELECT name FROM sqlite_master WHERE type='table' AND name NOT LIKE 'sqlite_%'`)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
var out []string
|
||||||
|
for rows.Next() {
|
||||||
|
var n string
|
||||||
|
if err := rows.Scan(&n); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
out = append(out, n)
|
||||||
|
}
|
||||||
|
sort.Strings(out)
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
// A logbook opened through OpenLogbook holds the contacts and nothing else.
|
||||||
|
func TestOpenLogbookSchema(t *testing.T) {
|
||||||
|
path := filepath.Join(t.TempDir(), "logbook.db")
|
||||||
|
conn, err := OpenLogbook(path)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
var n int
|
||||||
|
// The one table that matters has to be there and has to be usable.
|
||||||
|
if err := conn.QueryRow(`SELECT COUNT(*) FROM qso`).Scan(&n); err != nil {
|
||||||
|
t.Fatalf("qso table unusable: %v", err)
|
||||||
|
}
|
||||||
|
for _, forbidden := range settingsTables {
|
||||||
|
if err := conn.QueryRow(`SELECT COUNT(*) FROM ` + quoteIdent(forbidden)).Scan(&n); err == nil {
|
||||||
|
t.Errorf("%s was created in a logbook database", forbidden)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
conn.Close()
|
||||||
|
|
||||||
|
// Reopening as a logbook is idempotent, and the migrations already recorded
|
||||||
|
// as applied must not be re-run into a half-schema.
|
||||||
|
conn2, err := OpenLogbook(path)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("reopen: %v", err)
|
||||||
|
}
|
||||||
|
if err := conn2.QueryRow(`SELECT COUNT(*) FROM qso`).Scan(&n); err != nil {
|
||||||
|
t.Fatalf("qso lost on reopen: %v", err)
|
||||||
|
}
|
||||||
|
conn2.Close()
|
||||||
|
}
|
||||||
|
|
||||||
|
// An existing logbook that an older version filled with the whole schema loses
|
||||||
|
// the unused tables — and keeps any that hold rows.
|
||||||
|
func TestPruneKeepsNonEmptyTables(t *testing.T) {
|
||||||
|
path := filepath.Join(t.TempDir(), "legacy.db")
|
||||||
|
conn, err := Open(path) // the old behaviour: every table everywhere
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if _, err := conn.Exec(`INSERT INTO station_profiles(name) VALUES('Home')`); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
conn.Close()
|
||||||
|
|
||||||
|
if got := tablesIn(t, path); len(got) < 10 {
|
||||||
|
t.Fatalf("expected a full legacy schema, got %v", got)
|
||||||
|
}
|
||||||
|
|
||||||
|
conn, err = OpenLogbook(path)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
defer conn.Close()
|
||||||
|
var n int
|
||||||
|
// Rows are data: this one stays, whatever the schema says it is for.
|
||||||
|
if err := conn.QueryRow(`SELECT COUNT(*) FROM station_profiles`).Scan(&n); err != nil || n != 1 {
|
||||||
|
t.Fatalf("station_profiles dropped with a row in it (err=%v n=%d)", err, n)
|
||||||
|
}
|
||||||
|
// The empty ones go.
|
||||||
|
if err := conn.QueryRow(`SELECT COUNT(*) FROM settings`).Scan(&n); err == nil {
|
||||||
|
t.Error("empty settings table survived in a logbook")
|
||||||
|
}
|
||||||
|
// And the contacts are untouched throughout.
|
||||||
|
if err := conn.QueryRow(`SELECT COUNT(*) FROM qso`).Scan(&n); err != nil {
|
||||||
|
t.Fatalf("qso table lost: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A CREATE TABLE body is full of "ON DELETE CASCADE": the index rule must not
|
||||||
|
// read it as a table name, or the table goes unrecognised and gets created in
|
||||||
|
// every database.
|
||||||
|
func TestStmtTableForeignKeyBody(t *testing.T) {
|
||||||
|
stmt := `CREATE TABLE operating_stations (
|
||||||
|
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||||
|
profile_id INTEGER NOT NULL,
|
||||||
|
FOREIGN KEY (profile_id) REFERENCES station_profiles(id) ON DELETE CASCADE
|
||||||
|
)`
|
||||||
|
if got := stmtTable(stmt); got != "operating_stations" {
|
||||||
|
t.Fatalf("got %q", got)
|
||||||
|
}
|
||||||
|
if keepForRole(stmt, RoleLogbook) {
|
||||||
|
t.Fatal("a settings table reached a logbook database")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The settings database loses its unused qso table — and gets it back, in full,
|
||||||
|
// the moment it has to serve as the logbook again.
|
||||||
|
func TestDropAndRecreateQSOTable(t *testing.T) {
|
||||||
|
path := filepath.Join(t.TempDir(), "settings.db")
|
||||||
|
conn, err := Open(path)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
defer conn.Close()
|
||||||
|
|
||||||
|
// A contact in it is data: the table must survive.
|
||||||
|
if _, err := conn.Exec(`INSERT INTO qso(callsign, qso_date, band, mode)
|
||||||
|
VALUES('F4BPO','2026-01-01T12:00:00Z','20m','SSB')`); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
DropEmptyQSOTable(conn, "settings")
|
||||||
|
var n int
|
||||||
|
if err := conn.QueryRow(`SELECT COUNT(*) FROM qso`).Scan(&n); err != nil || n != 1 {
|
||||||
|
t.Fatalf("dropped a qso table holding a contact (err=%v n=%d)", err, n)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Empty, so it goes.
|
||||||
|
if _, err := conn.Exec(`DELETE FROM qso`); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
DropEmptyQSOTable(conn, "settings")
|
||||||
|
if err := conn.QueryRow(`SELECT COUNT(*) FROM qso`).Scan(&n); err == nil {
|
||||||
|
t.Fatal("empty qso table survived")
|
||||||
|
}
|
||||||
|
|
||||||
|
// And comes back complete when this database is pressed into service as the
|
||||||
|
// logbook — a late column and an index included, not just a bare table.
|
||||||
|
if err := EnsureQSOTable(conn); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if _, err := conn.Exec(`INSERT INTO qso(callsign, qso_date, band, mode, ant_path, sync_uid)
|
||||||
|
VALUES('F1TRF','2026-01-02T13:00:00Z','40m','CW','S','uid-1')`); err != nil {
|
||||||
|
t.Fatalf("recreated qso table is incomplete: %v", err)
|
||||||
|
}
|
||||||
|
if err := conn.QueryRow(`SELECT COUNT(*) FROM qso`).Scan(&n); err != nil || n != 1 {
|
||||||
|
t.Fatalf("recreated table unusable (err=%v n=%d)", err, n)
|
||||||
|
}
|
||||||
|
// Idempotent: a second call on a live table must not touch it.
|
||||||
|
if err := EnsureQSOTable(conn); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if err := conn.QueryRow(`SELECT COUNT(*) FROM qso`).Scan(&n); err != nil || n != 1 {
|
||||||
|
t.Fatalf("EnsureQSOTable disturbed an existing table (err=%v n=%d)", err, n)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A brand-new logbook — the case of a fresh install, or the "New database"
|
||||||
|
// button — is right from the first open: the contacts and the migration ledger,
|
||||||
|
// nothing else. Pinned as an exact list so an accidentally unfiltered future
|
||||||
|
// migration shows up here rather than in an operator's phpMyAdmin.
|
||||||
|
func TestFreshLogbookHasOnlyContactTables(t *testing.T) {
|
||||||
|
path := filepath.Join(t.TempDir(), "fresh.db")
|
||||||
|
conn, err := OpenLogbook(path)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
rows, err := conn.Query(`SELECT name FROM sqlite_master WHERE type='table' AND name NOT LIKE 'sqlite_%'`)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
var got []string
|
||||||
|
for rows.Next() {
|
||||||
|
var n string
|
||||||
|
if err := rows.Scan(&n); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
got = append(got, n)
|
||||||
|
}
|
||||||
|
rows.Close()
|
||||||
|
conn.Close()
|
||||||
|
sort.Strings(got)
|
||||||
|
want := []string{"qso", "schema_migrations"}
|
||||||
|
if strings.Join(got, ",") != strings.Join(want, ",") {
|
||||||
|
t.Fatalf("fresh logbook holds %v, want %v", got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The cleanup is a one-off, recorded like a migration: it must not be repeated
|
||||||
|
// at every connection. Twelve COUNT(*) round trips on a remote MySQL is a cost
|
||||||
|
// paid at every profile switch for something that can no longer be found.
|
||||||
|
func TestPruneRunsOnlyOnce(t *testing.T) {
|
||||||
|
path := filepath.Join(t.TempDir(), "once.db")
|
||||||
|
conn, err := Open(path) // full legacy schema
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
conn.Close()
|
||||||
|
|
||||||
|
conn, err = OpenLogbook(path) // first open: the cleanup happens
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
var n int
|
||||||
|
if err := conn.QueryRow(`SELECT COUNT(*) FROM settings`).Scan(&n); err == nil {
|
||||||
|
t.Fatal("first open did not clean up")
|
||||||
|
}
|
||||||
|
// Put one back by hand. A second pass would remove it again; a cleanup that
|
||||||
|
// knows it is done leaves it alone.
|
||||||
|
if _, err := conn.Exec("CREATE TABLE `settings` (`key` TEXT PRIMARY KEY, value TEXT)"); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
conn.Close()
|
||||||
|
|
||||||
|
conn, err = OpenLogbook(path)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
defer conn.Close()
|
||||||
|
if err := conn.QueryRow(`SELECT COUNT(*) FROM settings`).Scan(&n); err != nil {
|
||||||
|
t.Fatal("the cleanup ran a second time — it is not recorded as done")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -40,12 +40,26 @@ func looksLikeHTML(s string) bool {
|
|||||||
// anything in the operator's log, which is what a test button must never do.
|
// anything in the operator's log, which is what a test button must never do.
|
||||||
const clublogDownloadURL = "https://clublog.org/getadif.php"
|
const clublogDownloadURL = "https://clublog.org/getadif.php"
|
||||||
|
|
||||||
// clublogAppAPIKey is OpsLog's Club Log *application* API key. Club Log
|
// clublogAppAPIKey is OpsLog's own Club Log *application* API key, issued to
|
||||||
// requires an api parameter that identifies the client software (not the
|
// "OpsLog" by G7VJR on 2026-08-18.
|
||||||
// user) — the same way Log4OM embeds its own key — so we ship it baked in
|
//
|
||||||
// rather than asking each user for one. It's an application identifier, not
|
// Club Log requires an api parameter identifying the client SOFTWARE, not the
|
||||||
// a user secret, but note it is visible in the source and the binary.
|
// user — the same way Log4OM embeds its own — so it ships baked in rather than
|
||||||
const clublogAppAPIKey = "5767f19333363a9ef432ee9cd4141fe76b8adf38"
|
// asking every operator to request one.
|
||||||
|
//
|
||||||
|
// It replaces a key that was registered to XV9Q, not to OpsLog. That was not a
|
||||||
|
// cosmetic detail: every OpsLog upload in the world was attributed to that
|
||||||
|
// callsign, its owner received the abuse warnings OpsLog earned, and a
|
||||||
|
// revocation aimed at them would have cut Club Log uploads for every user of
|
||||||
|
// this program at once.
|
||||||
|
//
|
||||||
|
// Club Log asks that the key not be published in source code. The source lives
|
||||||
|
// on a private remote and only the built exe is released — but the key is still
|
||||||
|
// recoverable from that binary by anyone who looks, as it is for every logger
|
||||||
|
// that embeds one. Treat it as an identifier that can be attributed, never as a
|
||||||
|
// secret: it authorises nothing on its own, since every request also carries the
|
||||||
|
// operator's own e-mail and password.
|
||||||
|
const clublogAppAPIKey = "8df47807a412c586787c9401c96c10c135d6e580"
|
||||||
|
|
||||||
// UploadClublog pushes one ADIF record to Club Log in real time. The user
|
// UploadClublog pushes one ADIF record to Club Log in real time. The user
|
||||||
// supplies the account email + password and the logbook callsign; the
|
// supplies the account email + password and the logbook callsign; the
|
||||||
@@ -117,6 +131,13 @@ func UploadClublogADIF(ctx context.Context, client *http.Client, cfg ServiceConf
|
|||||||
if api == "" {
|
if api == "" {
|
||||||
api = clublogAppAPIKey
|
api = clublogAppAPIKey
|
||||||
}
|
}
|
||||||
|
// putlogs.php reads the upload as an ADIF *file*, so it needs a header.
|
||||||
|
// Callers that already build a full document (the QSL Manager) pass one;
|
||||||
|
// callers that only have <EOR>-terminated records (the on-close flush) do
|
||||||
|
// not, and a headerless file is rejected. Same rule as the LoTW writer.
|
||||||
|
if !strings.Contains(strings.ToUpper(adifDoc), "<EOH>") {
|
||||||
|
adifDoc = "OpsLog Club Log upload\n<PROGRAMID:6>OpsLog <EOH>\n" + adifDoc
|
||||||
|
}
|
||||||
|
|
||||||
var buf bytes.Buffer
|
var buf bytes.Buffer
|
||||||
mw := multipart.NewWriter(&buf)
|
mw := multipart.NewWriter(&buf)
|
||||||
|
|||||||
@@ -267,6 +267,78 @@ func UploadEQSL(ctx context.Context, client *http.Client, user, pswd, qthNick, a
|
|||||||
return UploadResult{OK: false, Message: reason}, fmt.Errorf("eqsl: upload failed: %s", reason)
|
return UploadResult{OK: false, Message: reason}, fmt.Errorf("eqsl: upload failed: %s", reason)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// eqslBatchMax is the largest number of records eQSL asks a single upload to
|
||||||
|
// carry ("upload only files smaller than about 1000 records at a time", eQSL's
|
||||||
|
// own ImportADIF interface notes). Callers chunk to this.
|
||||||
|
const eqslBatchMax = 1000
|
||||||
|
|
||||||
|
// UploadEQSLBatch pushes MANY ADIF records to eQSL.cc in ONE request.
|
||||||
|
//
|
||||||
|
// ImportADIF.cfm is a file importer, not a per-QSO endpoint: it takes one *or
|
||||||
|
// more* QSOs and answers "Result: X out of Y records added" — the plural in its
|
||||||
|
// own reply. So an on-close sweep or a bulk upload is one request, not one per
|
||||||
|
// contact. No ADIF header is prepended: the single-record path has always posted
|
||||||
|
// bare <EOR> records and eQSL accepts them (per ADIF, a file starting with '<'
|
||||||
|
// has no header), and there is no reason to change what is known to work.
|
||||||
|
//
|
||||||
|
// A PARTIAL result ("97 out of 100") sets Ignored so the caller can say so.
|
||||||
|
// eQSL does not identify which records it left out, and in practice they are
|
||||||
|
// QSOs it already holds — the same duplicate that UploadEQSL reports as success.
|
||||||
|
func UploadEQSLBatch(ctx context.Context, client *http.Client, user, pswd, qthNick string, records []string) (UploadResult, error) {
|
||||||
|
user = strings.ToUpper(strings.TrimSpace(user))
|
||||||
|
if user == "" {
|
||||||
|
return UploadResult{}, fmt.Errorf("eqsl: username (callsign) not set")
|
||||||
|
}
|
||||||
|
if strings.TrimSpace(pswd) == "" {
|
||||||
|
return UploadResult{}, fmt.Errorf("eqsl: password not set")
|
||||||
|
}
|
||||||
|
docs := make([]string, 0, len(records))
|
||||||
|
for _, r := range records {
|
||||||
|
if strings.TrimSpace(r) == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
docs = append(docs, eqslRecordWithNickname(strings.TrimRight(r, "\r\n"), qthNick))
|
||||||
|
}
|
||||||
|
if len(docs) == 0 {
|
||||||
|
return UploadResult{}, fmt.Errorf("eqsl: empty adif batch")
|
||||||
|
}
|
||||||
|
if len(docs) > eqslBatchMax {
|
||||||
|
return UploadResult{}, fmt.Errorf("eqsl: batch of %d exceeds the %d-record limit", len(docs), eqslBatchMax)
|
||||||
|
}
|
||||||
|
|
||||||
|
body, err := eqslPost(ctx, client, user, pswd, strings.Join(docs, "\n"))
|
||||||
|
if err != nil {
|
||||||
|
return UploadResult{OK: false, Message: body}, err
|
||||||
|
}
|
||||||
|
if reason := authErrEQSL(body); reason != "" {
|
||||||
|
return UploadResult{OK: false, Message: reason}, fmt.Errorf("eqsl: %s", reason)
|
||||||
|
}
|
||||||
|
|
||||||
|
// The counted result is read FIRST here, unlike the single-record path: a
|
||||||
|
// batch reply routinely carries both "Result: 97 out of 100 records added"
|
||||||
|
// and a "Bad record: Duplicate" line for the other three, and matching the
|
||||||
|
// duplicate first would throw away the count that says the rest went in.
|
||||||
|
if m := eqslResultRe.FindStringSubmatch(body); m != nil {
|
||||||
|
added, _ := strconv.Atoi(m[1])
|
||||||
|
total, _ := strconv.Atoi(m[2])
|
||||||
|
if added >= 1 {
|
||||||
|
return UploadResult{OK: true, Message: strings.TrimSpace(m[0]), Ignored: added < total}, nil
|
||||||
|
}
|
||||||
|
// "0 out of N" — nothing added. A re-upload of QSOs eQSL already holds
|
||||||
|
// lands here, and that is not a failure.
|
||||||
|
if strings.Contains(strings.ToLower(body), "duplicate") {
|
||||||
|
return UploadResult{OK: true, Message: "already in logbook"}, nil
|
||||||
|
}
|
||||||
|
reason := eqslReason(body)
|
||||||
|
return UploadResult{OK: false, Message: reason}, fmt.Errorf("eqsl: batch upload failed: %s", reason)
|
||||||
|
}
|
||||||
|
if strings.Contains(strings.ToLower(body), "duplicate") {
|
||||||
|
return UploadResult{OK: true, Message: "already in logbook"}, nil
|
||||||
|
}
|
||||||
|
reason := eqslReason(body)
|
||||||
|
return UploadResult{OK: false, Message: reason}, fmt.Errorf("eqsl: batch upload failed: %s", reason)
|
||||||
|
}
|
||||||
|
|
||||||
// eqslReason trims an eQSL reply to a short human-readable reason: the first
|
// eqslReason trims an eQSL reply to a short human-readable reason: the first
|
||||||
// "Error:" / "Warning:" / "Bad record:" line if present, else the whole body
|
// "Error:" / "Warning:" / "Bad record:" line if present, else the whole body
|
||||||
// (capped), else a generic phrase.
|
// (capped), else a generic phrase.
|
||||||
|
|||||||
+180
-30
@@ -295,9 +295,10 @@ func (m *Manager) CloseUploadCount() int {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// FlushOnClose uploads every QSO due for an on-close push, scanning the whole
|
// FlushOnClose uploads every QSO due for an on-close push, scanning the whole
|
||||||
// logbook (not just this session). Called from the shutdown sequence. QRZ/Club
|
// logbook (not just this session). Called from the shutdown sequence. QRZ and
|
||||||
// Log go one-by-one (fast HTTP); LoTW is signed and uploaded as a single TQSL
|
// the rest go one-by-one (fast HTTP, no batch API); LoTW is signed and uploaded
|
||||||
// batch. Returns the number of QSOs uploaded successfully.
|
// as a single TQSL batch, and Club Log goes through its batch endpoint.
|
||||||
|
// Returns the number of QSOs uploaded successfully.
|
||||||
func (m *Manager) FlushOnClose() int {
|
func (m *Manager) FlushOnClose() int {
|
||||||
if m.deps.CloseUploadIDs == nil {
|
if m.deps.CloseUploadIDs == nil {
|
||||||
return 0
|
return 0
|
||||||
@@ -312,41 +313,190 @@ func (m *Manager) FlushOnClose() int {
|
|||||||
switch svc {
|
switch svc {
|
||||||
case ServiceLoTW:
|
case ServiceLoTW:
|
||||||
uploaded += m.flushLoTWBatch(ids, cfg.LoTW)
|
uploaded += m.flushLoTWBatch(ids, cfg.LoTW)
|
||||||
case ServiceQRZ:
|
|
||||||
for _, id := range ids {
|
|
||||||
if ok, _ := m.upload(svc, id, cfg.QRZ); ok {
|
|
||||||
uploaded++
|
|
||||||
}
|
|
||||||
}
|
|
||||||
case ServiceClublog:
|
case ServiceClublog:
|
||||||
for _, id := range ids {
|
uploaded += m.flushClublogBatch(ids, cfg.Clublog)
|
||||||
if ok, _ := m.upload(svc, id, cfg.Clublog); ok {
|
|
||||||
uploaded++
|
|
||||||
}
|
|
||||||
}
|
|
||||||
case ServiceHRDLog:
|
|
||||||
for _, id := range ids {
|
|
||||||
if ok, _ := m.upload(svc, id, cfg.HRDLog); ok {
|
|
||||||
uploaded++
|
|
||||||
}
|
|
||||||
}
|
|
||||||
case ServiceEQSL:
|
case ServiceEQSL:
|
||||||
for _, id := range ids {
|
uploaded += m.flushEQSLBatch(ids, cfg.EQSL)
|
||||||
if ok, _ := m.upload(svc, id, cfg.EQSL); ok {
|
case ServiceQRZ:
|
||||||
uploaded++
|
uploaded += m.flushOneByOne(svc, ids, cfg.QRZ)
|
||||||
}
|
case ServiceHRDLog:
|
||||||
}
|
uploaded += m.flushOneByOne(svc, ids, cfg.HRDLog)
|
||||||
case ServiceCloudlog:
|
case ServiceCloudlog:
|
||||||
for _, id := range ids {
|
uploaded += m.flushOneByOne(svc, ids, cfg.Cloudlog)
|
||||||
if ok, _ := m.upload(svc, id, cfg.Cloudlog); ok {
|
|
||||||
uploaded++
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return uploaded
|
return uploaded
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// uploadPace is the shortest gap between two consecutive single-QSO uploads in
|
||||||
|
// an on-close sweep. QRZ, HRDLog and Cloudlog have no batch endpoint — HRDLog's
|
||||||
|
// NewEntry.aspx keeps only the first record of a multi-record ADIF — so a sweep
|
||||||
|
// of a freshly imported log is unavoidably one request per contact. It does not
|
||||||
|
// have to arrive as fast as the link allows, though: that burst is what a
|
||||||
|
// service reads as a robot, and what got an operator's IP threatened at Club Log
|
||||||
|
// (see flushClublogBatch). The gap costs nothing in practice, since a round trip
|
||||||
|
// to any of these already takes longer than it.
|
||||||
|
const uploadPace = 200 * time.Millisecond
|
||||||
|
|
||||||
|
// flushOneByOne uploads ids one request at a time, paced. For the services that
|
||||||
|
// have no batch API; everything else has its own flush<Service>Batch.
|
||||||
|
func (m *Manager) flushOneByOne(svc Service, ids []int64, cfg ServiceConfig) int {
|
||||||
|
uploaded := 0
|
||||||
|
for i, id := range ids {
|
||||||
|
if i > 0 {
|
||||||
|
time.Sleep(uploadPace)
|
||||||
|
}
|
||||||
|
if ok, _ := m.upload(svc, id, cfg); ok {
|
||||||
|
uploaded++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return uploaded
|
||||||
|
}
|
||||||
|
|
||||||
|
// eqslBatchChunk is how many QSOs go into one ImportADIF.cfm request. eQSL's own
|
||||||
|
// limit is ten times this (eqslBatchMax); the smaller chunk keeps one refused
|
||||||
|
// record from taking a thousand others down with it, and keeps the form body
|
||||||
|
// small enough to be unremarkable.
|
||||||
|
const eqslBatchChunk = 100
|
||||||
|
|
||||||
|
// flushEQSLBatch uploads the on-close eQSL QSOs through ImportADIF.cfm in
|
||||||
|
// batches instead of one request per contact. Same reasoning as
|
||||||
|
// flushClublogBatch — eQSL's import endpoint has always taken a whole file, so
|
||||||
|
// the one-at-a-time loop was making hundreds of requests it never needed to.
|
||||||
|
func (m *Manager) flushEQSLBatch(ids []int64, cfg ServiceConfig) int {
|
||||||
|
uploaded := 0
|
||||||
|
var records []string
|
||||||
|
var kept []int64
|
||||||
|
|
||||||
|
send := func() {
|
||||||
|
if len(records) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// nil client: UploadEQSLBatch then builds one with a 30 s timeout rather
|
||||||
|
// than reusing the 20 s budget of a single realtime QSO.
|
||||||
|
res, err := UploadEQSLBatch(context.Background(), nil, cfg.Username, cfg.Password, cfg.QTHNickname, records)
|
||||||
|
if err != nil || !res.OK {
|
||||||
|
if err == nil {
|
||||||
|
err = errFromResult(res)
|
||||||
|
}
|
||||||
|
m.logf("extsvc: eqsl batch upload (%d QSOs) failed: %v", len(kept), err)
|
||||||
|
if m.deps.NotifyError != nil {
|
||||||
|
m.deps.NotifyError(ServiceEQSL, 0, err)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// res.Ignored means eQSL took the file but left records out. Say the
|
||||||
|
// count out loud: the whole chunk is still marked sent (eQSL never
|
||||||
|
// says WHICH it dropped, and in practice they are QSOs it already
|
||||||
|
// had), so the log line is the only trace of the shortfall.
|
||||||
|
if res.Ignored {
|
||||||
|
m.logf("extsvc: eqsl batch upload PARTIAL (%d QSOs sent) %s", len(kept), res.Message)
|
||||||
|
} else {
|
||||||
|
m.logf("extsvc: eqsl batch upload OK (%d QSOs) %s", len(kept), res.Message)
|
||||||
|
}
|
||||||
|
if m.deps.MarkUploaded != nil {
|
||||||
|
for _, id := range kept {
|
||||||
|
m.deps.MarkUploaded(ServiceEQSL, id, res.LogID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
uploaded += len(kept)
|
||||||
|
}
|
||||||
|
records = records[:0]
|
||||||
|
kept = kept[:0]
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, id := range ids {
|
||||||
|
if m.deps.ShouldUpload != nil && !m.deps.ShouldUpload(ServiceEQSL, id) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
// eQSL keeps the QSO's own station call; the account is identified by the
|
||||||
|
// credentials and the optional QTH nickname — as in upload().
|
||||||
|
rec, ok := m.deps.BuildADIF(id, "")
|
||||||
|
if !ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
records = append(records, rec)
|
||||||
|
kept = append(kept, id)
|
||||||
|
if len(records) >= eqslBatchChunk {
|
||||||
|
send()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
send()
|
||||||
|
return uploaded
|
||||||
|
}
|
||||||
|
|
||||||
|
// clublogBatchChunk is how many QSOs go into one putlogs.php request. Club Log
|
||||||
|
// dedupes server-side, so chunking is not about correctness — it keeps a single
|
||||||
|
// malformed record from failing a whole ten-thousand-QSO document, and matches
|
||||||
|
// what the QSL Manager's bulk upload already uses.
|
||||||
|
const clublogBatchChunk = 100
|
||||||
|
|
||||||
|
// flushClublogBatch uploads the on-close Club Log QSOs through the BATCH
|
||||||
|
// endpoint (putlogs.php) rather than one realtime.php call each.
|
||||||
|
//
|
||||||
|
// It used to walk the ids and call UploadClublog per QSO. On-close upload sweeps
|
||||||
|
// the WHOLE logbook, so importing an ADIF — or simply switching Club Log on over
|
||||||
|
// an existing log — turned one app close into hundreds of realtime.php posts.
|
||||||
|
// That endpoint is reserved for an operator logging contacts as they work them,
|
||||||
|
// and Club Log blocks the IP of anything that batches through it: an OpsLog user
|
||||||
|
// was flagged by G7VJR for 185 QSOs in four minutes, which is this loop, not a
|
||||||
|
// pile-up. Batch upload is the mechanism Club Log provides for exactly this.
|
||||||
|
func (m *Manager) flushClublogBatch(ids []int64, cfg ServiceConfig) int {
|
||||||
|
uploaded := 0
|
||||||
|
var records []string
|
||||||
|
var kept []int64
|
||||||
|
|
||||||
|
send := func() {
|
||||||
|
if len(records) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// nil client on purpose: UploadClublogADIF then builds one with a 120 s
|
||||||
|
// timeout. m.deps.Client is the 20 s budget of a single realtime QSO,
|
||||||
|
// which a hundred-QSO document on a slow link would blow through.
|
||||||
|
res, err := UploadClublogADIF(context.Background(), nil, cfg, strings.Join(records, "\n"))
|
||||||
|
if err != nil || !res.OK {
|
||||||
|
if err == nil {
|
||||||
|
err = errFromResult(res)
|
||||||
|
}
|
||||||
|
m.logf("extsvc: clublog batch upload (%d QSOs) failed: %v", len(kept), err)
|
||||||
|
if m.deps.NotifyError != nil {
|
||||||
|
m.deps.NotifyError(ServiceClublog, 0, err)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
m.logf("extsvc: clublog batch upload OK (%d QSOs) %s", len(kept), res.Message)
|
||||||
|
if m.deps.MarkUploaded != nil {
|
||||||
|
for _, id := range kept {
|
||||||
|
m.deps.MarkUploaded(ServiceClublog, id, res.LogID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
uploaded += len(kept)
|
||||||
|
}
|
||||||
|
records = records[:0]
|
||||||
|
kept = kept[:0]
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, id := range ids {
|
||||||
|
// Skip QSOs not eligible (already sent). The wrong-logbook guard that
|
||||||
|
// upload() applies per QSO is not repeated here: closeUploadIDs has
|
||||||
|
// already filtered the sweep down to this logbook's callsign.
|
||||||
|
if m.deps.ShouldUpload != nil && !m.deps.ShouldUpload(ServiceClublog, id) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
// Club Log takes the logbook callsign as its own form field, so the ADIF
|
||||||
|
// keeps the QSO's own station call (no override) — as in upload().
|
||||||
|
rec, ok := m.deps.BuildADIF(id, "")
|
||||||
|
if !ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
records = append(records, rec)
|
||||||
|
kept = append(kept, id)
|
||||||
|
if len(records) >= clublogBatchChunk {
|
||||||
|
send()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
send()
|
||||||
|
return uploaded
|
||||||
|
}
|
||||||
|
|
||||||
// flushLoTWBatch signs+uploads all queued LoTW QSOs in one TQSL run, then
|
// flushLoTWBatch signs+uploads all queued LoTW QSOs in one TQSL run, then
|
||||||
// stamps each as uploaded on success.
|
// stamps each as uploaded on success.
|
||||||
func (m *Manager) flushLoTWBatch(ids []int64, cfg ServiceConfig) int {
|
func (m *Manager) flushLoTWBatch(ids []int64, cfg ServiceConfig) int {
|
||||||
|
|||||||
@@ -37,6 +37,19 @@ const (
|
|||||||
ServiceDBUpdated ServiceType = "db_updated" // ADIF of each locally-logged QSO (on save)
|
ServiceDBUpdated ServiceType = "db_updated" // ADIF of each locally-logged QSO (on save)
|
||||||
ServicePstFreq ServiceType = "pstrotator_freq" // <PST><FREQUENCY> radio freq (on freq change)
|
ServicePstFreq ServiceType = "pstrotator_freq" // <PST><FREQUENCY> radio freq (on freq change)
|
||||||
ServiceN1MMRadio ServiceType = "n1mm_radioinfo" // N1MM RadioInfo XML: freq+mode (on freq/mode change)
|
ServiceN1MMRadio ServiceType = "n1mm_radioinfo" // N1MM RadioInfo XML: freq+mode (on freq/mode change)
|
||||||
|
// ServiceWSJTRelay re-sends every datagram an inbound WSJT listener receives,
|
||||||
|
// byte for byte, to somewhere else.
|
||||||
|
//
|
||||||
|
// WSJT-X, JTDX and MSHV send to ONE address. Anything else that wants the
|
||||||
|
// same stream — JTAlert, GridTracker, a second logger — has to be fed by a
|
||||||
|
// relay, and this is it, so OpsLog stops being the reason you cannot run the
|
||||||
|
// two together.
|
||||||
|
//
|
||||||
|
// VERBATIM, with no origin header prepended. The relays in the field add one
|
||||||
|
// ("127.0.0.1:2237|"), which is precisely why stripForwarderHeader exists on
|
||||||
|
// the receiving side here; inflicting the same thing on whatever is
|
||||||
|
// downstream would be repeating a mistake we had to write code to survive.
|
||||||
|
ServiceWSJTRelay ServiceType = "wsjt_relay"
|
||||||
// ServiceWSJTLog wraps the same ADIF in a WSJT-X "Logged ADIF" datagram.
|
// ServiceWSJTLog wraps the same ADIF in a WSJT-X "Logged ADIF" datagram.
|
||||||
// Logger32 and others listen on the WSJT-X interface, not for plain text, and
|
// Logger32 and others listen on the WSJT-X interface, not for plain text, and
|
||||||
// discard a bare ADIF record without a word — so the two cannot be one row.
|
// discard a bare ADIF record without a word — so the two cannot be one row.
|
||||||
|
|||||||
@@ -0,0 +1,75 @@
|
|||||||
|
package udp
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"encoding/binary"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
// A grid reaches OpsLog in TWO kinds of message, not one. The reply that
|
||||||
|
// answers a CQ with a locator — "C91RU IZ5EME JN52" — is the commonest of them
|
||||||
|
// on a busy band, and reading only CQs meant any station whose CQ we happened
|
||||||
|
// to miss had no known grid at all, so it could never be flagged as a new one.
|
||||||
|
func TestDecodeGridFromBothMessageShapes(t *testing.T) {
|
||||||
|
for _, tc := range []struct {
|
||||||
|
msg string
|
||||||
|
call string
|
||||||
|
cq bool
|
||||||
|
grid string
|
||||||
|
why string
|
||||||
|
}{
|
||||||
|
{"CQ RW9MZ MO74", "RW9MZ", true, "MO74", "a plain CQ"},
|
||||||
|
{"CQ DX F4BPO JN36", "F4BPO", true, "JN36", "a CQ with a modifier"},
|
||||||
|
{"C91RU IZ5EME JN52", "IZ5EME", false, "JN52", "a reply answering with its grid"},
|
||||||
|
{"YB1EWD YO6GLT KN36", "YO6GLT", false, "KN36", "the same, other way round"},
|
||||||
|
|
||||||
|
// Everything else in the third slot is a report or a sign-off, and must
|
||||||
|
// never be mistaken for a locator.
|
||||||
|
{"C91RU IZ5EME -05", "IZ5EME", false, "", "a signal report is not a grid"},
|
||||||
|
{"C91RU IZ5EME R-05", "IZ5EME", false, "", "a rogered report is not a grid"},
|
||||||
|
{"C91RU IZ5EME RRR", "IZ5EME", false, "", "RRR is not a grid"},
|
||||||
|
{"C91RU IZ5EME RR73", "IZ5EME", false, "", "RR73 has the shape of one and is not"},
|
||||||
|
{"C91RU IZ5EME 73", "IZ5EME", false, "", "73 is not a grid"},
|
||||||
|
{"<YO7LBX> 8F81SU RR73", "8F81SU", false, "", "a hashed call, signing off"},
|
||||||
|
} {
|
||||||
|
call, cq, grid := wsjtSender(tc.msg)
|
||||||
|
if call != tc.call || cq != tc.cq || grid != tc.grid {
|
||||||
|
t.Errorf("wsjtSender(%q) = (%q, %v, %q), want (%q, %v, %q) — %s",
|
||||||
|
tc.msg, call, cq, grid, tc.call, tc.cq, tc.grid, tc.why)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The Reply replays the decode field for field, so the message must survive the
|
||||||
|
// trip UNTRIMMED. DecodeMsg is trimmed for display; DecodeMsgRaw is what goes
|
||||||
|
// back, and a stripped trailing space is a mismatch the far end reports nowhere.
|
||||||
|
func TestDecodeKeepsTheUntrimmedMessage(t *testing.T) {
|
||||||
|
qstr := func(b *bytes.Buffer, v string) {
|
||||||
|
binary.Write(b, binary.BigEndian, int32(len(v)))
|
||||||
|
b.WriteString(v)
|
||||||
|
}
|
||||||
|
const padded = "CQ RW9MZ MO74 "
|
||||||
|
var p bytes.Buffer
|
||||||
|
binary.Write(&p, binary.BigEndian, uint32(wsjtMagic))
|
||||||
|
binary.Write(&p, binary.BigEndian, uint32(2))
|
||||||
|
binary.Write(&p, binary.BigEndian, uint32(wsjtMsgDecode))
|
||||||
|
qstr(&p, "JTDX")
|
||||||
|
binary.Write(&p, binary.BigEndian, uint8(1))
|
||||||
|
binary.Write(&p, binary.BigEndian, uint32(45_000_000))
|
||||||
|
binary.Write(&p, binary.BigEndian, int32(-6))
|
||||||
|
binary.Write(&p, binary.BigEndian, float64(0.2))
|
||||||
|
binary.Write(&p, binary.BigEndian, uint32(1500))
|
||||||
|
qstr(&p, "~")
|
||||||
|
qstr(&p, padded)
|
||||||
|
|
||||||
|
ev, ok, err := ParseWSJT(p.Bytes())
|
||||||
|
if err != nil || !ok {
|
||||||
|
t.Fatalf("parse: %v ok=%v", err, ok)
|
||||||
|
}
|
||||||
|
if ev.DecodeMsgRaw != padded {
|
||||||
|
t.Errorf("DecodeMsgRaw = %q, want %q — a Reply built from this will not match", ev.DecodeMsgRaw, padded)
|
||||||
|
}
|
||||||
|
if ev.DecodeMsg != "CQ RW9MZ MO74" {
|
||||||
|
t.Errorf("DecodeMsg = %q, want it trimmed for display", ev.DecodeMsg)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,115 @@
|
|||||||
|
package udp
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"encoding/binary"
|
||||||
|
"net"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
// A Decode does not carry the mode's NAME. It carries the one-character marker
|
||||||
|
// from the decode line — "~" for FT8, "+" for FT4 — and that character used to
|
||||||
|
// be passed on as if it were a mode. Everything downstream compared it against
|
||||||
|
// the modes in the log, matched nothing, and reported every station on an
|
||||||
|
// already-worked band as a NEW MODE.
|
||||||
|
func TestDecodeModeNameResolvesTheMarker(t *testing.T) {
|
||||||
|
for raw, want := range map[string]string{
|
||||||
|
"~": "FT8",
|
||||||
|
"+": "FT4",
|
||||||
|
"#": "JT65",
|
||||||
|
"@": "JT9",
|
||||||
|
} {
|
||||||
|
if got := DecodeModeName(raw, "FT8"); got != want {
|
||||||
|
t.Errorf("DecodeModeName(%q) = %q, want %q", raw, got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A sender that puts the real name in the field is believed as-is — several do,
|
||||||
|
// and the marker table must not get in their way.
|
||||||
|
func TestDecodeModeNameKeepsARealName(t *testing.T) {
|
||||||
|
for _, raw := range []string{"FT8", "ft4", "JS8", "Q65"} {
|
||||||
|
if got := DecodeModeName(raw, ""); got == "" || got != upper(raw) {
|
||||||
|
t.Errorf("DecodeModeName(%q) = %q, want the name itself", raw, got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The safety net: an unknown marker falls back to the mode from the sender's
|
||||||
|
// last Status, which always carries the real name. This is what keeps a future
|
||||||
|
// or unlisted marker degrading to correct rather than to nonsense.
|
||||||
|
func TestDecodeModeNameFallsBackToStatus(t *testing.T) {
|
||||||
|
if got := DecodeModeName("%", "FT4"); got != "FT4" {
|
||||||
|
t.Errorf("unknown marker resolved to %q, want the Status mode FT4", got)
|
||||||
|
}
|
||||||
|
if got := DecodeModeName("", "FT8"); got != "FT8" {
|
||||||
|
t.Errorf("empty mode resolved to %q, want the Status mode FT8", got)
|
||||||
|
}
|
||||||
|
// Nothing known at all is empty rather than a guess: an empty mode makes the
|
||||||
|
// status resolver answer "worked", which is the safe side — a wrong mode
|
||||||
|
// would invent a new-mode flag exactly as the marker did.
|
||||||
|
if got := DecodeModeName("%", ""); got != "" {
|
||||||
|
t.Errorf("with no Status mode the result was %q, want empty", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func upper(s string) string {
|
||||||
|
out := []rune(s)
|
||||||
|
for i, r := range out {
|
||||||
|
if r >= 'a' && r <= 'z' {
|
||||||
|
out[i] = r - 32
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return string(out)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Resolving the marker must not DESTROY it. A Reply is matched by the receiving
|
||||||
|
// application against its own decode list field for field, and the mode field it
|
||||||
|
// compares is the one it sent — the marker. Sending the resolved name instead is
|
||||||
|
// accepted silently and simply never transmits: JTDX finds no matching decode,
|
||||||
|
// and no error is reported anywhere to say so. Reported as "clicking a CQ does
|
||||||
|
// nothing in JTDX".
|
||||||
|
//
|
||||||
|
// So a Decode has to carry BOTH: Mode for the log and the status resolver,
|
||||||
|
// DecodeModeRaw for the Reply.
|
||||||
|
func TestDecodeKeepsTheRawModeMarkerForReplies(t *testing.T) {
|
||||||
|
qstr := func(b *bytes.Buffer, v string) {
|
||||||
|
binary.Write(b, binary.BigEndian, int32(len(v)))
|
||||||
|
b.WriteString(v)
|
||||||
|
}
|
||||||
|
var p bytes.Buffer
|
||||||
|
binary.Write(&p, binary.BigEndian, uint32(wsjtMagic))
|
||||||
|
binary.Write(&p, binary.BigEndian, uint32(2)) // schema
|
||||||
|
binary.Write(&p, binary.BigEndian, uint32(wsjtMsgDecode)) // type 2
|
||||||
|
qstr(&p, "JTDX") // id
|
||||||
|
binary.Write(&p, binary.BigEndian, uint8(1)) // is_new
|
||||||
|
binary.Write(&p, binary.BigEndian, uint32(45_000_000)) // time (ms since midnight)
|
||||||
|
binary.Write(&p, binary.BigEndian, int32(-6)) // snr
|
||||||
|
binary.Write(&p, binary.BigEndian, float64(0.2)) // delta_time
|
||||||
|
binary.Write(&p, binary.BigEndian, uint32(1500)) // delta_frequency
|
||||||
|
qstr(&p, "~") // mode — the MARKER
|
||||||
|
qstr(&p, "CQ EN35UKR") // message
|
||||||
|
|
||||||
|
out := make(chan Event, 4)
|
||||||
|
s := &Server{
|
||||||
|
out: out,
|
||||||
|
cfg: Config{Name: "JTDX", ServiceType: ServiceWSJT},
|
||||||
|
lastMode: map[string]string{"JTDX": "FT8"},
|
||||||
|
dialHz: map[string]int64{"JTDX": 14074000},
|
||||||
|
}
|
||||||
|
s.handle(p.Bytes(), &net.UDPAddr{IP: net.IPv4(127, 0, 0, 1), Port: 2237})
|
||||||
|
|
||||||
|
var ev Event
|
||||||
|
select {
|
||||||
|
case ev = <-out:
|
||||||
|
default:
|
||||||
|
t.Fatal("no event emitted for the decode")
|
||||||
|
}
|
||||||
|
if ev.Mode != "FT8" {
|
||||||
|
t.Errorf("resolved Mode = %q, want FT8 (what the log and the status resolver need)", ev.Mode)
|
||||||
|
}
|
||||||
|
if ev.DecodeModeRaw != "~" {
|
||||||
|
t.Errorf("DecodeModeRaw = %q, want %q — a Reply built from this will not match and JTDX will not transmit",
|
||||||
|
ev.DecodeModeRaw, "~")
|
||||||
|
}
|
||||||
|
}
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user