Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
839cf0aafd | ||
|
|
9fd801ea69 | ||
|
|
298c2fde44 | ||
|
|
78e99afc63 | ||
|
|
740f007395 | ||
|
|
43095a1d89 | ||
|
|
fa01968207 | ||
|
|
91452cefc0 | ||
|
|
904b451951 | ||
|
|
c4d90e6880 | ||
|
|
1ac00c101e | ||
|
|
e107b0b741 | ||
|
|
24668d5981 | ||
|
|
8aa0e39aff | ||
|
|
96c99f0ae6 | ||
|
|
0550ecdac3 | ||
|
|
9c33feecfa | ||
|
|
8afba2c4e8 | ||
|
|
2d3bfa704e | ||
|
|
29bdea1e43 | ||
|
|
b93c67f3cb | ||
|
|
735dfe69db | ||
|
|
67fe5bcff0 | ||
|
|
d36d431d9a | ||
|
|
0c8d79e2fa | ||
|
|
796a1d8e7d | ||
|
|
9531a54ac1 | ||
|
|
d2d64706f5 | ||
|
|
cfdd24d52e | ||
|
|
8052bd2935 | ||
|
|
55879809f2 | ||
|
|
6969560efb | ||
|
|
7eff19f6e2 | ||
|
|
e0dfa53f54 | ||
|
|
4f87cedc2c | ||
|
|
d273d21f1a | ||
|
|
bde136b98b | ||
|
|
ae7472a67d | ||
|
|
0d48dbfd17 | ||
|
|
d6ed9f03eb | ||
|
|
c95a1137fc | ||
|
|
d41352a3a5 | ||
|
|
9b2115be8f | ||
|
|
0a8c1ac45f | ||
|
|
6497568813 | ||
|
|
9f62808392 | ||
|
|
9d8b69d804 | ||
|
|
6825af135a | ||
|
|
ca42fd90f9 | ||
|
|
18a583901c | ||
|
|
2cb1add3db | ||
|
|
a3815c24a1 | ||
|
|
f6f5235a8b | ||
|
|
86a644863a | ||
|
|
dd9fddbc5b | ||
|
|
74acf88976 | ||
|
|
da9c76e161 | ||
|
|
fb78b1c052 | ||
|
|
e51abd262e | ||
|
|
0ec855d95a | ||
|
|
ae06495f91 | ||
|
|
4dd2c3b997 | ||
|
|
ec71dd1661 | ||
|
|
31f9bdfc98 | ||
|
|
57e98139ab | ||
|
|
b10a867125 | ||
|
|
17819ea673 | ||
|
|
a8fac52400 | ||
|
|
2bf98a9801 | ||
|
|
80dac64b56 | ||
|
|
79427ccd18 | ||
|
|
4352b9aec5 | ||
|
|
a0f7f2abf0 | ||
|
|
40f5960c76 | ||
|
|
59135d55ab | ||
|
|
44cf5954fd | ||
|
|
f1b7a7e477 | ||
|
|
19ae00124f | ||
|
|
642ed358c2 | ||
|
|
1d8cd25205 | ||
|
|
1f55cfe9fa | ||
|
|
90c6458af0 | ||
|
|
18f44a5aa3 | ||
|
|
4d13cf7d15 | ||
|
|
366d9df634 | ||
|
|
f4b7c9dcf8 | ||
|
|
48c448e6f3 | ||
|
|
9c757e5175 | ||
|
|
626edca8ba | ||
|
|
b202d98ae5 | ||
|
|
949cc17ed1 | ||
|
|
e9feeffdc3 | ||
|
|
7d7d1042c0 | ||
|
|
9cbfd39da0 | ||
|
|
5338ad0b29 | ||
|
|
970127cc16 | ||
|
|
3704dbdd99 | ||
|
|
3cdf16b501 | ||
|
|
9a72afd467 | ||
|
|
e2bfe73bdb | ||
|
|
6e2e2cc3aa | ||
|
|
75d11a4069 | ||
|
|
cfe5d6f2a7 | ||
|
|
78c289d681 | ||
|
|
761f554ac0 | ||
|
|
4c1b4fd1a8 | ||
|
|
f2cc4f11cd | ||
|
|
faf084ddfc | ||
|
|
01dcd91253 | ||
|
|
3d603d34aa | ||
|
|
3d1602c4bd | ||
|
|
a10fb2413a | ||
|
|
bd8ca2e9de | ||
|
|
df56391eb8 | ||
|
|
82ce3353c4 | ||
|
|
20dc3e83a6 | ||
|
|
62cdabe114 | ||
|
|
9bfb44925b | ||
|
|
fb1af9b6a2 | ||
|
|
57a9bed145 | ||
|
|
fbd323af26 | ||
|
|
689d1cc902 | ||
|
|
67602fd485 | ||
|
|
2de5bce998 | ||
|
|
f0959c796d | ||
|
|
16e64fd7b7 | ||
|
|
7e696a72bb | ||
|
|
9af2732314 | ||
|
|
f82d92565f | ||
|
|
d0f25aea9b | ||
|
|
f91b83ee12 | ||
|
|
a554257d5f | ||
|
|
a20d9a0b76 | ||
|
|
92ee8aadde | ||
|
|
61c6666a4c | ||
|
|
9f5c482667 | ||
|
|
b9ea077a64 | ||
|
|
a48fa0b2e7 | ||
|
|
821883dfd3 | ||
|
|
ef087492cc | ||
|
|
98f11ee3d0 | ||
|
|
058f164ab6 | ||
|
|
6c47c27775 | ||
|
|
7410fa4825 | ||
|
|
246d9d1b6a | ||
|
|
d12cfe94cd | ||
|
|
ede81d3926 | ||
|
|
f27faa81a6 | ||
|
|
69e6c20b97 | ||
|
|
d93c40ebb3 | ||
|
|
dfe3afbf2d | ||
|
|
bb3542c920 | ||
|
|
a966abd9df | ||
|
|
95482ec1d8 | ||
|
|
500fe8bfec |
@@ -0,0 +1,57 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
wruntime "github.com/wailsapp/wails/v2/pkg/runtime"
|
||||
)
|
||||
|
||||
// keyAwardsTracked holds the PER-PROFILE list of award codes the operator wants
|
||||
// to follow (JSON array of award.Def.Code). Award definitions themselves are
|
||||
// global (keyAwardDefs, shared across profiles), but WHICH awards a station
|
||||
// tracks is a per-profile choice — a DX profile follows DXCC/WPX, a POTA profile
|
||||
// follows POTA/WWFF. An empty/unset list means "track them all" so the Awards
|
||||
// tab is never blank before the operator has picked anything.
|
||||
const keyAwardsTracked = "awards.tracked"
|
||||
|
||||
// GetTrackedAwards returns the active profile's followed award codes. An empty
|
||||
// slice means the operator has not narrowed the list — the Awards tab then shows
|
||||
// every award.
|
||||
func (a *App) GetTrackedAwards() ([]string, error) {
|
||||
out := []string{}
|
||||
if a.settings == nil {
|
||||
return out, nil
|
||||
}
|
||||
s, _ := a.settings.Get(a.ctx, keyAwardsTracked)
|
||||
if strings.TrimSpace(s) == "" {
|
||||
return out, nil
|
||||
}
|
||||
if err := json.Unmarshal([]byte(s), &out); err != nil {
|
||||
return []string{}, nil
|
||||
}
|
||||
return out, nil
|
||||
}
|
||||
|
||||
// SaveTrackedAwards persists the followed award codes for the active profile and
|
||||
// notifies the Awards tab to re-filter its list. Codes are stored verbatim; the
|
||||
// Awards tab intersects them with the live award definitions, so a code that no
|
||||
// longer exists is simply ignored (not an error).
|
||||
func (a *App) SaveTrackedAwards(codes []string) error {
|
||||
if a.settings == nil {
|
||||
return fmt.Errorf("db not initialized")
|
||||
}
|
||||
if codes == nil {
|
||||
codes = []string{}
|
||||
}
|
||||
b, err := json.Marshal(codes)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if err := a.settings.Set(a.ctx, keyAwardsTracked, string(b)); err != nil {
|
||||
return err
|
||||
}
|
||||
wruntime.EventsEmit(a.ctx, "awards:tracked-changed")
|
||||
return nil
|
||||
}
|
||||
+62
@@ -0,0 +1,62 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"crypto/sha256"
|
||||
"encoding/hex"
|
||||
"os"
|
||||
"strings"
|
||||
)
|
||||
|
||||
// deniedCallHashes lists station callsigns not permitted to run this build,
|
||||
// stored as SHA-256 hex of the base call so the calls themselves appear nowhere
|
||||
// in the source or the compiled binary. Enforcement is best-effort by design —
|
||||
// the call is entered by the operator and can be changed — so this only turns
|
||||
// away straightforward use, not a determined one.
|
||||
var deniedCallHashes = map[string]struct{}{
|
||||
"2282a88b3e5e4eebc6b8174d005bb46d32025758b7741bdcf34f2b3621c02205": {},
|
||||
"0ee09fe60817a2a4982f5e5b14a60b8dbb11cff55b3d36661213c4cbdd0933ea": {},
|
||||
"46fb61e71afb40627cb6493a6a59c9d4d0231ee3cad1a2bf3fcc4cdfce36fabc": {},
|
||||
"d1ae6212ec057f9d5c6f379fb57acedac7c94142c9d49667dc04b2016d03d1b6": {},
|
||||
"0741c9e394b42f43191899105553b47155ddc3026da12b5360701f9c181ff123": {},
|
||||
}
|
||||
|
||||
// callDenied reports whether a callsign is on deniedCallHashes. The call is
|
||||
// reduced to its base form (upper-cased, portable prefix/suffix dropped) the
|
||||
// same way extsvc does, so F4XYZ/P matches F4XYZ.
|
||||
func callDenied(call string) bool {
|
||||
base := denyBaseCall(call)
|
||||
if base == "" {
|
||||
return false
|
||||
}
|
||||
sum := sha256.Sum256([]byte(base))
|
||||
_, bad := deniedCallHashes[hex.EncodeToString(sum[:])]
|
||||
return bad
|
||||
}
|
||||
|
||||
// denyBaseCall mirrors extsvc.baseCall: for a slashed form it returns the
|
||||
// longest token (the real call), otherwise the call itself, upper-cased.
|
||||
func denyBaseCall(s string) string {
|
||||
s = strings.ToUpper(strings.TrimSpace(s))
|
||||
if !strings.Contains(s, "/") {
|
||||
return s
|
||||
}
|
||||
best := ""
|
||||
for _, part := range strings.Split(s, "/") {
|
||||
if len(part) > len(best) {
|
||||
best = part
|
||||
}
|
||||
}
|
||||
return best
|
||||
}
|
||||
|
||||
// enforceCallGate exits the process silently when any of the supplied callsigns
|
||||
// is denied. Called once at startup, after the profiles are loaded: the first
|
||||
// launch is where the operator enters and saves the call, so a denied build
|
||||
// simply does not come back up on the next launch. No window, no message.
|
||||
func enforceCallGate(calls ...string) {
|
||||
for _, c := range calls {
|
||||
if callDenied(c) {
|
||||
os.Exit(0)
|
||||
}
|
||||
}
|
||||
}
|
||||
+54
-4
@@ -32,12 +32,19 @@ const (
|
||||
keyQSLEmailSubject = "qsl.email_subject"
|
||||
keyQSLEmailBody = "qsl.email_body"
|
||||
keyQSLAutoSend = "qsl.auto_send" // "1" → render+send an eQSL on log when an e-mail and default template exist
|
||||
keyQSLDefaultMsg = "qsl.default_message" // fallback QSL message printed on the card when the QSO's own QSLMSG is empty
|
||||
)
|
||||
|
||||
// appQSLCardSentField is the ADIF APP_ field stamping when OpsLog e-mailed its
|
||||
// own QSL card. Deliberately NOT eqsl_sent (that's eQSL.cc's, kept independent).
|
||||
const appQSLCardSentField = "APP_OPSLOG_QSL_SENT"
|
||||
|
||||
// appQSLCardRcvdField marks that a QSL was RECEIVED for this QSO (set by the
|
||||
// operator, e.g. when a card arrives by e-mail). It drives the PSE/TNX stamp on
|
||||
// the card: received → "TNX QSL" (thanks for your card), not received → "PSE QSL"
|
||||
// (please send one). Independent of ADIF qsl_rcvd, like the sent field.
|
||||
const appQSLCardRcvdField = "APP_OPSLOG_QSL_RCVD"
|
||||
|
||||
const (
|
||||
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}"
|
||||
@@ -453,11 +460,37 @@ func (a *App) SendEQSL(qsoID int64, templateID int64, jpegB64 string) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
// QSLEmailTemplates is the eQSL e-mail subject/body plus the auto-send toggle.
|
||||
// qslDefaultMessage returns the operator's default QSL message (Settings), used
|
||||
// on the card when a QSO has no QSLMSG of its own.
|
||||
func (a *App) qslDefaultMessage() string {
|
||||
if a.settings == nil {
|
||||
return ""
|
||||
}
|
||||
s, _ := a.settings.Get(a.ctx, keyQSLDefaultMsg)
|
||||
return s
|
||||
}
|
||||
|
||||
// SetOpsLogQSLReceived marks (or clears) that a QSL was received for a QSO. This
|
||||
// flips the card's PSE/TNX stamp. Stored as a timestamp in the QSO extras (a
|
||||
// single-key UPDATE, like the sent marker) so it survives concurrent uploads.
|
||||
func (a *App) SetOpsLogQSLReceived(qsoID int64, on bool) error {
|
||||
if a.qso == nil {
|
||||
return fmt.Errorf("db not initialized")
|
||||
}
|
||||
v := ""
|
||||
if on {
|
||||
v = time.Now().UTC().Format(time.RFC3339)
|
||||
}
|
||||
return a.qso.SetExtra(a.ctx, qsoID, appQSLCardRcvdField, v)
|
||||
}
|
||||
|
||||
// QSLEmailTemplates is the eQSL e-mail subject/body, the auto-send toggle, and
|
||||
// the default QSL message printed on the card when a QSO has none of its own.
|
||||
type QSLEmailTemplates struct {
|
||||
Subject string `json:"subject"`
|
||||
Body string `json:"body"`
|
||||
AutoSend bool `json:"auto_send"`
|
||||
DefaultMessage string `json:"default_message"`
|
||||
}
|
||||
|
||||
// QSLGetEmailTemplates returns the eQSL e-mail templates (with defaults).
|
||||
@@ -466,7 +499,7 @@ func (a *App) QSLGetEmailTemplates() (QSLEmailTemplates, error) {
|
||||
if a.settings == nil {
|
||||
return out, nil
|
||||
}
|
||||
m, err := a.settings.GetMany(a.ctx, keyQSLEmailSubject, keyQSLEmailBody, keyQSLAutoSend)
|
||||
m, err := a.settings.GetMany(a.ctx, keyQSLEmailSubject, keyQSLEmailBody, keyQSLAutoSend, keyQSLDefaultMsg)
|
||||
if err != nil {
|
||||
return out, err
|
||||
}
|
||||
@@ -477,6 +510,7 @@ func (a *App) QSLGetEmailTemplates() (QSLEmailTemplates, error) {
|
||||
out.Body = b
|
||||
}
|
||||
out.AutoSend = m[keyQSLAutoSend] == "1"
|
||||
out.DefaultMessage = m[keyQSLDefaultMsg]
|
||||
return out, nil
|
||||
}
|
||||
|
||||
@@ -495,7 +529,10 @@ func (a *App) QSLSaveEmailTemplates(t QSLEmailTemplates) error {
|
||||
if t.AutoSend {
|
||||
v = "1"
|
||||
}
|
||||
return a.settings.Set(a.ctx, keyQSLAutoSend, v)
|
||||
if err := a.settings.Set(a.ctx, keyQSLAutoSend, v); err != nil {
|
||||
return err
|
||||
}
|
||||
return a.settings.Set(a.ctx, keyQSLDefaultMsg, t.DefaultMessage)
|
||||
}
|
||||
|
||||
// maybeAutoSendEQSL fires an eQSL render+send for a freshly-logged QSO when the
|
||||
@@ -634,6 +671,18 @@ func (a *App) qslVars(q qso.QSO) (map[string]string, qslcard.CountryInfo, error)
|
||||
}
|
||||
return strconv.Itoa(z)
|
||||
}
|
||||
// The QSL message on the card: the QSO's own QSLMSG wins; when it's empty the
|
||||
// operator's default message (Settings) is used instead.
|
||||
msg := q.QSLMsg
|
||||
if strings.TrimSpace(msg) == "" {
|
||||
msg = a.qslDefaultMessage()
|
||||
}
|
||||
// PSE/TNX stamp, chosen automatically by whether a QSL was received for this
|
||||
// QSO (appQSLCardRcvdField): received → thank them, otherwise ask for a card.
|
||||
pseTnx := "PSE QSL"
|
||||
if q.Extras != nil && strings.TrimSpace(q.Extras[appQSLCardRcvdField]) != "" {
|
||||
pseTnx = "TNX QSL"
|
||||
}
|
||||
vars := map[string]string{
|
||||
"profile.callsign": info.Callsign,
|
||||
"profile.operator_name": info.Operator,
|
||||
@@ -650,7 +699,8 @@ func (a *App) qslVars(q qso.QSO) (map[string]string, qslcard.CountryInfo, error)
|
||||
"qso.mode": q.Mode,
|
||||
"qso.submode": q.Submode,
|
||||
"qso.rst_sent": q.RSTSent,
|
||||
"qso.qsl_msg": q.QSLMsg,
|
||||
"qso.qsl_msg": msg,
|
||||
"qso.pse_tnx": pseTnx,
|
||||
"qso.name": q.Name,
|
||||
}
|
||||
vars["qso.my_rig"], vars["qso.my_antenna"] = a.qslRigAntenna(q)
|
||||
|
||||
@@ -27,6 +27,11 @@ var sensitiveSettingKeys = map[string]bool{
|
||||
keyExtHRDLogCode: true,
|
||||
keyExtEQSLPassword: true,
|
||||
keyExtCloudlogAPIKey: true,
|
||||
// The web-publish config is one JSON blob and the FTP password lives inside
|
||||
// it, so the whole blob is encrypted. That costs nothing — it is read and
|
||||
// written as a unit anyway — and beats storing a server password in clear
|
||||
// next to the rest.
|
||||
keyWebPublish: true,
|
||||
}
|
||||
|
||||
func isSensitiveSetting(key string) bool { return sensitiveSettingKeys[key] }
|
||||
|
||||
@@ -0,0 +1,219 @@
|
||||
package main
|
||||
|
||||
// The data sources band-opening detection depends on, and the settings that
|
||||
// switch them on.
|
||||
//
|
||||
// The detection shipped reading whatever the operator's cluster nodes happened
|
||||
// to carry. That was a design mistake of the worst kind: the feature depended
|
||||
// on RBN feeds and a PSK Reporter subscription that nobody could know were
|
||||
// needed, so it looked broken rather than unconfigured. Nexus showed a 6 m
|
||||
// opening with 869 stations while OpsLog, on the same PC, showed nothing.
|
||||
//
|
||||
// So enabling the watch ARRANGES ITS OWN SOURCES: it adds the two RBN nodes if
|
||||
// they are missing and brings the PSK Reporter feed up. Turning it off leaves
|
||||
// the nodes alone — they may have been wanted for their own sake, and silently
|
||||
// removing a cluster node an operator is using would be worse than leaving one
|
||||
// they no longer need.
|
||||
|
||||
import (
|
||||
"strings"
|
||||
|
||||
"hamlog/internal/applog"
|
||||
"hamlog/internal/bandopen"
|
||||
"hamlog/internal/cluster"
|
||||
"hamlog/internal/pskr"
|
||||
)
|
||||
|
||||
const (
|
||||
keyBandOpenEnabled = "bandopen.enabled"
|
||||
keyBandOpenBands = "bandopen.bands" // comma-separated; empty = the default set
|
||||
)
|
||||
|
||||
// rbnNodes are the two Reverse Beacon Network endpoints the watch wants: CW and
|
||||
// digital are separate ports and carry different skimmers.
|
||||
var rbnNodes = []cluster.ServerConfig{
|
||||
{Name: "RBN CW", Host: "telnet.reversebeacon.net", Port: 7000, Enabled: true},
|
||||
{Name: "RBN FTx", Host: "telnet.reversebeacon.net", Port: 7001, Enabled: true},
|
||||
}
|
||||
|
||||
// BandOpenSettings is the panel's shape.
|
||||
type BandOpenSettings struct {
|
||||
Enabled bool `json:"enabled"`
|
||||
Bands []string `json:"bands"`
|
||||
// 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.
|
||||
Available []string `json:"available"`
|
||||
}
|
||||
|
||||
func (a *App) GetBandOpenSettings() BandOpenSettings {
|
||||
s := BandOpenSettings{
|
||||
Enabled: a.settingOr(keyBandOpenEnabled, "") == "1",
|
||||
Bands: splitCSV(a.settingOr(keyBandOpenBands, "")),
|
||||
Available: pskr.Bands,
|
||||
}
|
||||
// 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
|
||||
// had already enabled the watch kept subscribing to it — paying for a firehose
|
||||
// whose messages the detector then threw away.
|
||||
s.Bands = keepKnownBands(s.Bands)
|
||||
if len(s.Bands) == 0 {
|
||||
s.Bands = append(s.Bands, pskr.Bands...)
|
||||
}
|
||||
return s
|
||||
}
|
||||
|
||||
func keepKnownBands(want []string) []string {
|
||||
ok := make(map[string]bool, len(pskr.Bands))
|
||||
for _, b := range pskr.Bands {
|
||||
ok[b] = true
|
||||
}
|
||||
out := make([]string, 0, len(want))
|
||||
for _, b := range want {
|
||||
if ok[strings.ToLower(strings.TrimSpace(b))] {
|
||||
out = append(out, b)
|
||||
}
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
func (a *App) SaveBandOpenSettings(s BandOpenSettings) error {
|
||||
a.setSetting(keyBandOpenEnabled, map[bool]string{true: "1", false: "0"}[s.Enabled])
|
||||
a.setSetting(keyBandOpenBands, strings.Join(s.Bands, ","))
|
||||
if s.Enabled {
|
||||
a.ensureRBNNodes()
|
||||
}
|
||||
a.startBandOpenFeed()
|
||||
return nil
|
||||
}
|
||||
|
||||
// ensureRBNNodes adds the RBN endpoints when they are absent.
|
||||
//
|
||||
// Matched on host AND port rather than on name: an operator who renamed theirs
|
||||
// "Skimmers CW" has the node, and adding a second one pointed at the same
|
||||
// server would give them every spot twice — which the detector would read as
|
||||
// twice as many stations, i.e. an opening that is not there.
|
||||
func (a *App) ensureRBNNodes() {
|
||||
have, err := a.ListClusterServers()
|
||||
if err != nil {
|
||||
applog.Printf("bandopen: cannot read the cluster nodes (%v) — not adding RBN", err)
|
||||
return
|
||||
}
|
||||
for _, want := range rbnNodes {
|
||||
found := false
|
||||
for _, h := range have {
|
||||
if strings.EqualFold(strings.TrimSpace(h.Host), want.Host) && h.Port == want.Port {
|
||||
found = true
|
||||
break
|
||||
}
|
||||
}
|
||||
if found {
|
||||
continue
|
||||
}
|
||||
if _, err := a.SaveClusterServer(want); err != nil {
|
||||
applog.Printf("bandopen: could not add %s: %v", want.Name, err)
|
||||
continue
|
||||
}
|
||||
applog.Printf("bandopen: added cluster node %s (%s:%d) — the watch needs it",
|
||||
want.Name, want.Host, want.Port)
|
||||
}
|
||||
}
|
||||
|
||||
// startBandOpenFeed brings the PSK Reporter subscription up or down to match
|
||||
// the setting. Called at startup and whenever the setting is saved.
|
||||
func (a *App) startBandOpenFeed() {
|
||||
if a.pskr != nil {
|
||||
a.pskr.Stop()
|
||||
a.pskr = nil
|
||||
}
|
||||
s := a.GetBandOpenSettings()
|
||||
if !s.Enabled {
|
||||
return
|
||||
}
|
||||
// Every spot is measured from the operator's position. Without one there is
|
||||
// nothing to measure, and a detector fed unmeasurable spots reports nothing
|
||||
// while looking like it is working.
|
||||
if !a.opSet {
|
||||
applog.Printf("bandopen: no station grid set — the opening watch needs one to measure a path")
|
||||
return
|
||||
}
|
||||
a.pskr = pskr.New(pskr.Config{
|
||||
Bands: s.Bands,
|
||||
OpLat: a.opLat, OpLon: a.opLon,
|
||||
Geo: func(grid string) (int, int, bool) {
|
||||
lat, lon, ok := gridToLatLon(grid)
|
||||
if !ok {
|
||||
return 0, 0, false
|
||||
}
|
||||
// The same arithmetic the cluster path uses, so one spot cannot be
|
||||
// 2000 km away down one road and 2100 km down the other.
|
||||
d := int(haversineKm(a.opLat, a.opLon, lat, lon) + 0.5)
|
||||
b := int(initialBearingDeg(a.opLat, a.opLon, lat, lon) + 0.5)
|
||||
return d, b, true
|
||||
},
|
||||
OnSpot: a.feedBandOpen,
|
||||
Logf: applog.Printf,
|
||||
})
|
||||
if err := a.pskr.Start(); err != nil {
|
||||
applog.Printf("bandopen: PSK Reporter feed did not start: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
// feedBandOpen hands one PSK Reporter decode to the detector.
|
||||
//
|
||||
// Called from the MQTT goroutine at up to thousands a minute when 6 m is open,
|
||||
// so it does the least possible: the detector's own window and de-duplication
|
||||
// by callsign are what turn that flood into one announcement.
|
||||
func (a *App) feedBandOpen(s pskr.Spot) {
|
||||
if !bandopen.Watched(s.Band) {
|
||||
return
|
||||
}
|
||||
a.bandOpen.mu.Lock()
|
||||
if a.bandOpen.det == nil {
|
||||
a.bandOpen.det = bandopen.New(bandopen.DefaultConfig())
|
||||
}
|
||||
op := a.bandOpen.det.Add(bandopen.Spot{
|
||||
Call: s.Call, Band: s.Band, DistKm: s.DistKm, Bearing: s.Bearing, At: s.At,
|
||||
}, a.opLat)
|
||||
if op != nil {
|
||||
a.rememberOpening(*op)
|
||||
}
|
||||
if s.DistKm >= bandopen.DefaultConfig().MinKm {
|
||||
a.markBandAlive(s.Band, s.At)
|
||||
}
|
||||
a.bandOpen.mu.Unlock()
|
||||
if op != nil {
|
||||
a.announceOpening(*op)
|
||||
}
|
||||
}
|
||||
|
||||
// GetPSKReporterStatus is what the settings panel polls.
|
||||
func (a *App) GetPSKReporterStatus() pskr.Status {
|
||||
if a.pskr == nil {
|
||||
return pskr.Status{Bands: pskr.Bands}
|
||||
}
|
||||
return a.pskr.Status()
|
||||
}
|
||||
|
||||
// settingOr reads one key, falling back when the store is not up yet or the
|
||||
// value is blank. The settings store is a plain string key/value and every
|
||||
// caller does this by hand; two of them here earn the helper.
|
||||
func (a *App) settingOr(key, def string) string {
|
||||
if a.settings == nil {
|
||||
return def
|
||||
}
|
||||
v, _ := a.settings.Get(a.ctx, key)
|
||||
if strings.TrimSpace(v) == "" {
|
||||
return def
|
||||
}
|
||||
return v
|
||||
}
|
||||
|
||||
func splitCSV(s string) []string {
|
||||
var out []string
|
||||
for _, p := range strings.Split(s, ",") {
|
||||
if p = strings.TrimSpace(p); p != "" {
|
||||
out = append(out, p)
|
||||
}
|
||||
}
|
||||
return out
|
||||
}
|
||||
+155
@@ -0,0 +1,155 @@
|
||||
package main
|
||||
|
||||
// Band-opening announcements — the app-side glue for internal/bandopen.
|
||||
//
|
||||
// The detector needs nothing OpsLog does not already compute: the cluster event
|
||||
// worker enriches every spot with the great-circle distance and bearing from
|
||||
// the operator's grid before this is called. So watching for sporadic E costs
|
||||
// one function call per spot and no new data source.
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"hamlog/internal/applog"
|
||||
"hamlog/internal/bandopen"
|
||||
"hamlog/internal/cluster"
|
||||
|
||||
wruntime "github.com/wailsapp/wails/v2/pkg/runtime"
|
||||
)
|
||||
|
||||
type bandOpenState struct {
|
||||
mu sync.Mutex
|
||||
det *bandopen.Detector
|
||||
last []bandopen.Opening // most recent first, for the UI
|
||||
// live holds the announced openings that are still going, keyed by band, and
|
||||
// aliveUntil says when each stops counting as current.
|
||||
//
|
||||
// The detector announces an opening ONCE and then goes quiet for 45 minutes,
|
||||
// which is right for a message but useless for a badge that has to stay lit
|
||||
// while the band is open and go out when it closes. Nothing tells us an
|
||||
// opening ended, so it is inferred: every qualifying spot on that band pushes
|
||||
// the deadline out, and when they stop arriving the badge fades by itself.
|
||||
live map[string]bandopen.Opening
|
||||
aliveUntil map[string]time.Time
|
||||
}
|
||||
|
||||
// openingIdle is how long a band may go without a qualifying spot before its
|
||||
// badge goes out. Longer than the detector's own 12-minute window, so a quiet
|
||||
// couple of minutes mid-opening does not blink the badge off and on again.
|
||||
const openingIdle = 15 * time.Minute
|
||||
|
||||
const maxRememberedOpenings = 20
|
||||
|
||||
// detectBandOpening feeds one spot to the detector and announces a hit.
|
||||
func (a *App) detectBandOpening(s cluster.Spot) {
|
||||
// No operator grid = no distance and no bearing on the spot, and the whole
|
||||
// detection rests on those two. Say nothing rather than guess.
|
||||
if !a.opSet || s.DistanceKm <= 0 || !bandopen.Watched(s.Band) {
|
||||
return
|
||||
}
|
||||
a.bandOpen.mu.Lock()
|
||||
if a.bandOpen.det == nil {
|
||||
a.bandOpen.det = bandopen.New(bandopen.DefaultConfig())
|
||||
}
|
||||
op := a.bandOpen.det.Add(bandopen.Spot{
|
||||
Call: s.DXCall, Band: s.Band, DistKm: s.DistanceKm,
|
||||
Bearing: s.ShortPath, At: s.ReceivedAt,
|
||||
}, a.opLat)
|
||||
if op != nil {
|
||||
a.rememberOpening(*op)
|
||||
}
|
||||
// Keeps a lit badge lit. Gated on the same floor the detector uses, or a
|
||||
// band busy with short-range tropo would hold an Es badge on for ever.
|
||||
if s.DistanceKm >= bandopen.DefaultConfig().MinKm {
|
||||
a.markBandAlive(s.Band, s.ReceivedAt)
|
||||
}
|
||||
a.bandOpen.mu.Unlock()
|
||||
if op != nil {
|
||||
a.announceOpening(*op)
|
||||
}
|
||||
}
|
||||
|
||||
// markBandAlive pushes a band's badge deadline out. Called for every spot the
|
||||
// detector accepted, from either feed. Cheap on purpose: this runs on the MQTT
|
||||
// goroutine at thousands a minute when 6 m is open.
|
||||
//
|
||||
// Caller holds bandOpen.mu.
|
||||
func (a *App) markBandAlive(band string, at time.Time) {
|
||||
if _, lit := a.bandOpen.live[strings.ToLower(band)]; !lit {
|
||||
return // nothing announced for this band, nothing to keep alive
|
||||
}
|
||||
if a.bandOpen.aliveUntil == nil {
|
||||
a.bandOpen.aliveUntil = map[string]time.Time{}
|
||||
}
|
||||
a.bandOpen.aliveUntil[strings.ToLower(band)] = at.Add(openingIdle)
|
||||
}
|
||||
|
||||
// rememberOpening files a detection and lights its badge. Caller holds the mutex.
|
||||
func (a *App) rememberOpening(op bandopen.Opening) {
|
||||
a.bandOpen.last = append([]bandopen.Opening{op}, a.bandOpen.last...)
|
||||
if len(a.bandOpen.last) > maxRememberedOpenings {
|
||||
a.bandOpen.last = a.bandOpen.last[:maxRememberedOpenings]
|
||||
}
|
||||
if a.bandOpen.live == nil {
|
||||
a.bandOpen.live = map[string]bandopen.Opening{}
|
||||
a.bandOpen.aliveUntil = map[string]time.Time{}
|
||||
}
|
||||
b := strings.ToLower(op.Band)
|
||||
a.bandOpen.live[b] = op
|
||||
a.bandOpen.aliveUntil[b] = op.At.Add(openingIdle)
|
||||
}
|
||||
|
||||
// GetLiveOpenings returns the openings still under way, for the status-bar
|
||||
// badge. Expired ones are dropped as they are noticed — there is no janitor for
|
||||
// something that holds at most five entries.
|
||||
func (a *App) GetLiveOpenings() []bandopen.Opening {
|
||||
now := time.Now()
|
||||
a.bandOpen.mu.Lock()
|
||||
defer a.bandOpen.mu.Unlock()
|
||||
out := make([]bandopen.Opening, 0, len(a.bandOpen.live))
|
||||
for b, op := range a.bandOpen.live {
|
||||
if until, ok := a.bandOpen.aliveUntil[b]; !ok || now.After(until) {
|
||||
delete(a.bandOpen.live, b)
|
||||
delete(a.bandOpen.aliveUntil, b)
|
||||
applog.Printf("bandopen: %s opening has gone quiet", strings.ToUpper(b))
|
||||
continue
|
||||
}
|
||||
out = append(out, op)
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// announceOpening logs and pushes one detection. Shared by both feeds — the
|
||||
// cluster path here and the PSK Reporter path in bandopen_sources.go — so an
|
||||
// opening reads the same however it was noticed.
|
||||
func (a *App) announceOpening(op bandopen.Opening) {
|
||||
applog.Printf("bandopen: %s opening — %d stations, ~%d km, %s%s (%s)",
|
||||
op.Band, op.Calls, op.MedianKm, op.Sector(),
|
||||
map[bool]string{true: "", false: " — UNUSUAL for the season"}[op.InSeason],
|
||||
strings.Join(op.Examples, " "))
|
||||
if a.ctx != nil {
|
||||
wruntime.EventsEmit(a.ctx, "bandopen:detected", op)
|
||||
}
|
||||
}
|
||||
|
||||
// GetBandOpenings returns the openings seen this session, newest first. The UI
|
||||
// polls this so a detection is still visible after its toast has gone.
|
||||
func (a *App) GetBandOpenings() []bandopen.Opening {
|
||||
a.bandOpen.mu.Lock()
|
||||
defer a.bandOpen.mu.Unlock()
|
||||
out := make([]bandopen.Opening, len(a.bandOpen.last))
|
||||
copy(out, a.bandOpen.last)
|
||||
return out
|
||||
}
|
||||
|
||||
// BandOpeningSummary is the one-line form used in the toast and the log.
|
||||
func BandOpeningSummary(o bandopen.Opening) string {
|
||||
s := fmt.Sprintf("%s open — %d stations ~%d km, %s", strings.ToUpper(o.Band), o.Calls, o.MedianKm, o.Sector())
|
||||
if !o.InSeason {
|
||||
s += " (unusual for the season)"
|
||||
}
|
||||
return s
|
||||
}
|
||||
+18902
File diff suppressed because it is too large
Load Diff
+278
@@ -1,4 +1,282 @@
|
||||
[
|
||||
{
|
||||
"version": "0.24.5",
|
||||
"date": "",
|
||||
"en": [
|
||||
"Digital decodes: a station's grid square could be logged as its callsign when the message text was unusual. A grid in the callsign position is now refused.",
|
||||
"CW over CAT now works on a Kenwood. The KY command was sent in Elecraft's variable-length form; a Kenwood needs exactly 24 characters, so every message was refused.",
|
||||
"Shared CAT is steadier and now diagnoses itself. It survives a rig answering \"busy\" just after transmit instead of dropping the link, stops repeating a PTT state the client never changed, and logs a plain explanation when another program has taken its port or when a client is set to a rig model instead of Hamlib NET rigctl. It also answers the lock-mode and stop-morse commands some clients send around every transmit, instead of refusing them.",
|
||||
"Web publishing now offers every field a QSO carries, awards included — 123 instead of 23 — from a searchable dropdown, with the chosen columns listed above it in publication order. Choose carefully: the page is public and the list includes addresses and e-mail.",
|
||||
"Band-opening detection now works on the bands it was meant for. Switching on \"Watch for band openings\" (Settings › DX Cluster) subscribes to the PSK Reporter feed and adds the two RBN nodes it needs — it was reading a handful of VHF cluster spots while thousands of stations were reporting. It watches 10, 6, 4 and 2 m, counts only reports collected within 300 km of you so an opening means an opening HERE, no longer throws away paths beyond 2400 km, and looks for the busiest direction instead of demanding that every station heard sit in one sector. An opening under way shows as a blinking badge beside the clock the moment it is found — band, direction and typical distance, with a mark when it is unusual for the season — and stays until the band goes quiet, and the direction it names is right — a sector crossing north used to be announced as its opposite.",
|
||||
"Test connection now actually tests. Club Log checked that the three fields were not empty and reported success without contacting anyone, so a wrong password looked exactly like a right one; it now signs in for real, through the read-only endpoint so a test can never add a record. LoTW reports its two credentials separately: TQSL signs uploads and never uses the website password, so a wrong one used to break nothing until the day confirmations were downloaded.",
|
||||
"The Ultrabeam / SteppIR widget in Station Control can now drive the antenna, not just describe it: a button per configured band tunes it there, up and down move it 25 kHz at a time, and tracking can be switched on or off with its 25 / 50 / 100 kHz threshold beside it. The band you are on lights up, and the commanded frequency is shown in the header.",
|
||||
"The QSO filter can express a real question. Every condition was joined by one global AND or OR, so \"2 m or 70 cm, in FT8, since January\" had no form: AND killed the two bands, OR let every FT8 QSO through. Two operators — is one of / is none of — take a comma-separated list, so the OR sits inside one condition and the rest keeps ANDing.",
|
||||
"Split works properly on a Kenwood. Split Operating: Rig in WSJT-X and JTDX did nothing at all through the shared CAT — OpsLog answered \"done\" to both split commands and left the radio on the receive frequency, so on a pileup you transmitted straight onto the DX while the software showed exactly what you had asked for. A radio whose backend cannot set split now refuses, so WSJT-X says so and you can switch to Fake It. And the two frequencies no longer swap the moment you key up: the rig reports the VFO in use, which is the receive one on receive and the transmit one on transmit, and that decided which frequency a split QSO was logged on."
|
||||
],
|
||||
"fr": [
|
||||
"Décodes digitaux : le carré locator d une station pouvait être enregistré comme son indicatif quand le texte du message sortait de l ordinaire. Un grid à la place de l indicatif est maintenant refusé.",
|
||||
"Le CW par CAT fonctionne sur Kenwood. La commande KY partait sous la forme Elecraft à longueur libre ; un Kenwood exige exactement 24 caractères, donc chaque message était refusé.",
|
||||
"Le CAT partagé est plus solide et se diagnostique tout seul. Il survit à un rig qui répond « occupé » juste après une émission au lieu de lâcher le lien, cesse de répéter un état PTT que le client n a pas changé, et écrit une explication claire quand un autre programme lui a pris son port ou qu un client est réglé sur un modèle de rig au lieu de Hamlib NET rigctl. Il répond aussi aux commandes de verrouillage et d arrêt du morse que certains logiciels envoient à chaque émission, au lieu de les refuser.",
|
||||
"La publication web propose désormais tous les champs d un QSO, awards compris — 123 au lieu de 23 — depuis une liste déroulante cherchable, les colonnes choisies étant listées au-dessus dans l ordre de publication. À choisir avec soin : la page est publique et la liste contient adresses et e-mails.",
|
||||
"La détection d ouverture de bande fonctionne enfin sur les bandes visées. Activer « Surveiller les ouvertures de bande » (Paramètres › Cluster DX) souscrit au flux PSK Reporter et ajoute les deux nœuds RBN nécessaires — elle lisait quelques spots VHF du cluster alors que des milliers de stations rapportaient. Elle surveille le 10, 6, 4 et 2 m, ne retient que les reports collectés à moins de 300 km de toi pour qu une ouverture veuille dire une ouverture ICI, ne jette plus les chemins au-delà de 2400 km, et cherche la direction la plus dense au lieu d exiger que toutes les stations entendues soient dans un même secteur. Une ouverture en cours s affiche en pastille clignotante à côté de l heure dès qu elle est détectée — bande, direction et distance typique, avec une marque si elle est inhabituelle pour la saison — et y reste jusqu à ce que la bande se taise, et la direction annoncée est juste — un secteur traversant le nord était auparavant annoncé à l opposé.",
|
||||
"Le bouton Tester la connexion teste vraiment. Club Log vérifiait que les trois champs n étaient pas vides et annonçait la réussite sans contacter personne : un mauvais mot de passe ressemblait exactement à un bon. Il s authentifie maintenant pour de vrai, via le point d accès en lecture seule pour qu un test ne puisse jamais ajouter un enregistrement. LoTW annonce ses deux identifiants séparément : TQSL signe les envois et n utilise jamais le mot de passe du site, donc un mauvais ne cassait rien jusqu au jour du téléchargement des confirmations.",
|
||||
"Le widget Ultrabeam / SteppIR de Station Control pilote enfin l antenne au lieu de seulement la décrire : un bouton par bande configurée l accorde dessus, haut et bas la déplacent par pas de 25 kHz, et le suivi s active ou se coupe avec son seuil de 25 / 50 / 100 kHz à côté. La bande courante s allume, et la fréquence commandée s affiche dans l en-tête.",
|
||||
"Le filtre des QSO sait exprimer une vraie question. Toutes les conditions étaient jointes par un seul ET ou OU global, donc « 2 m ou 70 cm, en FT8, depuis janvier » n avait aucune forme : le ET tuait les deux bandes, le OU laissait passer tous les QSO FT8. Deux opérateurs — est parmi / n est pas parmi — acceptent une liste séparée par des virgules, le OU tient donc dans une seule condition et le reste continue de se combiner en ET.",
|
||||
"Le split fonctionne correctement sur Kenwood. Split Operating: Rig dans WSJT-X et JTDX ne faisait rien du tout via le CAT partagé — OpsLog répondait « fait » aux deux commandes et laissait la radio sur la fréquence de réception, donc sur un pileup tu émettais en plein sur le DX pendant que le logiciel affichait exactement ce que tu avais demandé. Une radio dont le backend ne sait pas régler le split refuse désormais, WSJT-X le dit et tu peux passer en Fake It. Et les deux fréquences ne s inversent plus dès le passage en émission : le rig annonce le VFO en service, celui de réception à l écoute et celui d émission en émission, ce qui décidait sur quelle fréquence un QSO en split était enregistré."
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "0.24.4",
|
||||
"date": "",
|
||||
"en": [
|
||||
"DX cluster: an L badge next to a callsign marks a station that uploads to LoTW, with a matching LoTW users only filter, and a Spotter continent filter narrows the list by where the spot came FROM — a JA report on 20 m tells a European little about their own path. The filter panel has been tidied along one rule: a switch is a behaviour you turn on or off, chips pick any number from a set. Nothing appears in both shapes any more, the Lock buttons sit in the heading of the section they lock, every section can be cleared the same way, and the whole panel is finally translated.",
|
||||
"DX cluster: the Spotter continent filter now actually matches. RBN skimmers report as VU2OY-# and cluster nodes as DL1ABC-2, and the suffix was passed straight to the prefix lookup, so every spot came back with no continent and the filter silently selected nothing.",
|
||||
"A spot now stops being NEW the moment you log it. Logging announced the QSO but never dropped the cluster worked-index snapshot, so the refresh that follows re-read the answer computed BEFORE the contact — a station stayed yellow on the band map and in the cluster with the QSO plainly in the log, until something else happened to rebuild the index.",
|
||||
"Station information gains an IOTA field (ADIF MY_IOTA, e.g. EU-005), stamped on every QSO like the SOTA and POTA references beside it. The QSO table has carried the field since the first release and both ADIF import and export already handled it — only the station profile could not supply it, so an island activation meant typing the reference on every contact.",
|
||||
"PowerGenius XL: fixed the amplifier link dropping and reconnecting every few seconds, and the stall while transmitting. The amp pushes status frames on the same socket it answers commands on, and it pushes them constantly once in OPERATE; OpsLog read one line per command and took whatever arrived first as its answer, so the stream slipped permanently one reply behind until a command timed out and the connection was dropped. Replies are now matched to the command that asked for them. Only ever visible over a remote link with the amplifier in OPERATE.",
|
||||
"No colour on worked stations now does only that: it removes the blue already-worked mark and leaves everything else alone. It used to blank the spot status as well, and the status is what dims a quiet row — so turning the option on made every grey row bright white, which is the opposite of what it is for.",
|
||||
"Grid squares in the cluster. Every CQ decoded over the WSJT-X UDP link carries the sender grid, and OpsLog now keeps it: a Grid column shows the square and NEW GRID flags one never worked, as a badge, a filled cell and a filter of its own. Whether a grid counts as new follows the group digital modes setting — with it on, a square worked on FT8 is no longer new on FT4; with it off the two are separate. Only stations your own receiver decodes have a grid: a cluster line carries the spotter grid at best, never the DX one. Turn the column on in Columns."
|
||||
],
|
||||
"fr": [
|
||||
"Cluster DX : un badge L à côté de l indicatif signale une station qui utilise LoTW, avec le filtre Utilisateurs LoTW seulement qui va avec, et un filtre Continent du spotter restreint selon l origine du spot — un report JA sur 20 m dit peu de chose à un Européen sur son propre chemin. Le panneau de filtres a été remis d aplomb selon une seule règle : un interrupteur est un comportement qu on active ou non, les pastilles choisissent dans un ensemble. Plus rien n existe sous les deux formes, les boutons de verrouillage sont dans le titre de la section qu ils verrouillent, chaque section s efface de la même façon, et le panneau est enfin traduit.",
|
||||
"Cluster DX : le filtre Continent du spotter fonctionne enfin. Les skimmers RBN s annoncent en VU2OY-# et les nœuds cluster en DL1ABC-2, et ce suffixe partait tel quel dans la recherche de préfixe — tous les spots revenaient sans continent et le filtre ne sélectionnait rien.",
|
||||
"Un spot cesse enfin d être NOUVEAU dès que tu l enregistres. La journalisation annonçait le QSO mais ne vidait jamais l instantané de l index des contacts, donc le rafraîchissement qui suit relisait la réponse calculée AVANT le contact — une station restait jaune sur le bandmap et dans le cluster alors que le QSO était bien au log, jusqu à ce qu autre chose reconstruise l index.",
|
||||
"Les informations station gagnent un champ IOTA (MY_IOTA en ADIF, par exemple EU-005), estampillé sur chaque QSO comme les références SOTA et POTA à côté. La table des QSO portait le champ depuis la première version et l import comme l export ADIF le géraient déjà — seul le profil station ne savait pas le fournir, donc une activation d île obligeait à retaper la référence à chaque contact.",
|
||||
"PowerGenius XL : corrigé le lien avec l ampli qui tombait et se reconnectait toutes les quelques secondes, et le blocage en émission. L ampli pousse des trames d état sur la socket même où il répond aux commandes, et il en pousse en permanence dès qu il est en OPERATE ; OpsLog lisait une ligne par commande et prenait la première arrivée pour sa réponse, donc le flux glissait définitivement d une réponse de retard jusqu à expiration et fermeture du lien. Les réponses sont désormais appariées à la commande qui les a demandées. Visible uniquement en liaison distante avec l ampli en OPERATE.",
|
||||
"Aucune couleur sur les stations déjà contactées ne fait plus que ça : la marque bleue disparaît, le reste ne bouge pas. L option vidait aussi le statut du spot, or c est le statut qui estompe une ligne sans intérêt — l activer rendait donc toutes les lignes grises blanches et éclatantes, soit l inverse du but recherché.",
|
||||
"Les carrés locator dans le cluster. Chaque CQ décodé sur le lien UDP WSJT-X porte le grid de l émetteur, et OpsLog le conserve désormais : une colonne Grid affiche le carré et NOUV GRID signale celui jamais contacté, en badge, en cellule remplie et avec son propre filtre. Ce qui compte comme nouveau suit le réglage de regroupement des modes digitaux — activé, un carré fait en FT8 n est plus neuf en FT4 ; désactivé, les deux sont distincts. Seules les stations décodées par ton propre récepteur ont un grid : une ligne de cluster porte le grid du spotter au mieux, jamais celui du DX. Colonne à activer dans Colonnes."
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "0.24.3",
|
||||
"date": "",
|
||||
"en": [
|
||||
"Band openings: OpsLog now tells you when 6, 4 or 2 m opens. It watches the spots already arriving from your clusters and RBN — several different stations appearing at single-hop range (500–2400 km) in the same bearing sector within a few minutes is the signature of sporadic E, and nothing else looks like it. You get one message per band per opening, naming the sector and the typical distance. An opening outside the usual season is still announced, and flagged as unusual: those are the ones worth knowing about. Nothing to configure — but the quality depends on having a cluster or RBN feed carrying VHF spots, and 2 m openings are often worked without ever being spotted.",
|
||||
"DX cluster, two display options (Settings › DX cluster). The first drops the colour and the badges on stations you have already worked: they stay in the list, they simply stop competing for your attention. The second colours every callsign you have not worked on this band and this mode, even when the entity itself is long since confirmed — the view for filling slots rather than chasing new ones. Both apply to the cluster list and to the band map, so the two panels always agree.",
|
||||
"DX cluster, clearer at a glance. A novelty now FILLS the cell that carries it — a filled Band cell means new band, a filled Pfx cell means new prefix, a filled County cell means new county — instead of only tinting the text. A US County column joins the list, resolved offline from the ULS database. The station-not-worked-here highlight is its own NEW CALL status with its own filter chip, no longer borrowed from NEW SLOT, which means something narrower. The two display options moved from Preferences into the cluster filter panel, next to Hide worked. The Locator column is now labelled Spotter locator, because that is what a cluster line actually carries.",
|
||||
"Web publishing: the published page sorts properly. The Date column would not sort at all, and neither would callsigns starting with a digit — the script read a number from the front of the text, so every date in the same year counted as equal. A third click on a header now puts the table back in the order it was published in, and an arrow shows which way a column is pointing."
|
||||
],
|
||||
"fr": [
|
||||
"Ouvertures de bande : OpsLog te signale désormais l ouverture du 6, du 4 ou du 2 m. Il surveille les spots qui arrivent déjà de tes clusters et du RBN — plusieurs stations différentes apparaissant à distance de saut simple (500–2400 km) dans le même secteur d azimut en quelques minutes, c est la signature de l Es, et rien d autre n y ressemble. Un message par bande et par ouverture, avec le secteur et la distance typique. Une ouverture hors saison est annoncée quand même, et signalée comme inhabituelle : ce sont celles qu il ne faut surtout pas manquer. Rien à configurer — mais la qualité dépend d avoir un flux cluster ou RBN qui porte des spots VHF, et les ouvertures 2 m sont souvent travaillées sans jamais être spottées.",
|
||||
"Cluster DX, deux options d affichage (Paramètres › Cluster DX). La première enlève la couleur et les badges sur les stations déjà contactées : elles restent dans la liste, elles cessent simplement d attirer l œil. La seconde colore tout indicatif non contacté sur cette bande et ce mode, même si l entité est confirmée depuis longtemps — la vue pour remplir des slots plutôt que pour chasser du nouveau. Les deux s appliquent à la liste cluster et au bandmap, les deux panneaux restent donc cohérents.",
|
||||
"Cluster DX, plus lisible d un coup d œil. Une nouveauté REMPLIT désormais la cellule qui la porte — cellule Bande remplie = nouvelle bande, cellule Préf. remplie = nouveau préfixe, cellule Comté remplie = nouveau comté — au lieu de seulement colorer le texte. Une colonne Comté US rejoint la liste, résolue hors ligne depuis la base ULS. La mise en couleur des stations non contactées ici devient un statut CALL NEUF à part entière, avec sa propre puce de filtre, au lieu d emprunter NOUV SLOT qui veut dire autre chose. Les deux options d affichage passent des Préférences au panneau de filtres du cluster, à côté de Hide worked. La colonne Locator s appelle maintenant Locator du spotter, puisque c est ce qu une ligne de cluster porte réellement.",
|
||||
"Publication web : la page publiée se trie correctement. La colonne Date ne se triait pas du tout, ni les indicatifs commençant par un chiffre — le script lisait un nombre au début du texte, donc toutes les dates d une même année se valaient. Un troisième clic sur un en-tête remet le tableau dans l ordre de publication, et une flèche indique le sens du tri."
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "0.24.2",
|
||||
"date": "",
|
||||
"en": [
|
||||
"Web publishing: OpsLog can now write your log to a file for a website — a standalone HTML page (sortable, dark/light, no external request of any kind) or a CSV. You pick the columns and how many QSOs, it refreshes when you log and, if you want, on a timer, and it can upload the result by FTP or FTPS. The file is always written locally first, so a network failure leaves a good file on disk instead of a truncated one on the server. Settings → Web publishing.",
|
||||
"Icom console: an IC-9700 gets the bands it actually has. The band row was hardwired to 160–6 m, so the one radio in the range with no HF at all showed ten dead buttons and none of 2 m, 70 cm or 23 cm. The row now follows the model, as the attenuator steps already did — an IC-705 gains 2 m and 70 cm, an IC-9100 those plus 23 cm.",
|
||||
"Maps: the tiles are back. OpenStreetMap blocked OpsLog on its volunteer-run tile servers and every map filled with \"Access blocked\" squares. Their policy requires an application to identify itself with its own User-Agent on each request — something a program drawing maps inside a web view cannot do, the browser sets that header itself. So the two layers that still used those servers, the Street basemap and the locator map, have moved to services whose terms do cover a distributed application: Esri for Street, Carto for the locator map. OpenStreetMap is still credited — Carto's tiles are built from its data — and the locator map now throttles its tile requests like the world map already did.",
|
||||
"Band map: a station you have just worked stops showing as NEW. After each QSO the spot colours are refreshed, but only when the DX-cluster list was on screen — the band map was left out, so working a station with the usual layout (Recent QSOs on the left, band map on the right) left its pill orange until you happened to open the cluster tab. The band map, docked or in its own tab, now counts as on screen like the cluster does.",
|
||||
"Band map: new POTA, new county and already-worked callsign are shown at last. The band map only ever coloured the entity status — new DXCC, new band, new slot, worked — and ignored the other three markers, even though it was already receiving them: a new park on an entity you have worked looked like any other worked spot. They now appear on the pill's left strip, in the same colours the DX-cluster list uses, so a fact is not blue in one panel and green in the next. They stack rather than replace: a worked entity that is also a new park shows both, the way the cluster list already spells them out side by side. A new county is now violet instead of sharing green with a new park — in BOTH panels, since the two would otherwise disagree; the marker colours moved to one shared table, which is also what a per-marker colour setting will drive."
|
||||
],
|
||||
"fr": [
|
||||
"Publication web : OpsLog peut désormais écrire ton journal dans un fichier destiné à un site — une page HTML autonome (triable, claire ou sombre, sans aucune requête externe) ou un CSV. Tu choisis les colonnes et le nombre de QSO, il se rafraîchit à chaque enregistrement et, si tu veux, périodiquement, et il peut envoyer le résultat par FTP ou FTPS. Le fichier est toujours écrit en local d abord : une panne réseau laisse donc un bon fichier sur le disque plutôt qu un fichier tronqué sur le serveur. Réglages → Publication web.",
|
||||
"Console Icom : un IC-9700 reçoit enfin les bandes qu il possède. La rangée de bandes était figée sur 160–6 m, si bien que la seule radio de la gamme sans aucune HF affichait dix boutons morts et aucune de ses bandes 2 m, 70 cm et 23 cm. La rangée suit maintenant le modèle, comme le faisaient déjà les pas d atténuateur — un IC-705 gagne le 2 m et le 70 cm, un IC-9100 ceux-là plus le 23 cm.",
|
||||
"Cartes : les tuiles sont de retour. OpenStreetMap a bloqué OpsLog sur ses serveurs de tuiles bénévoles et toutes les cartes se sont remplies de carrés « Access blocked ». Leur politique exige qu'une application s'identifie par son propre User-Agent à chaque requête — ce qu'un programme qui dessine ses cartes dans une vue web ne peut pas faire, c'est le navigateur qui pose cet en-tête. Les deux couches qui utilisaient encore ces serveurs, le fond Street et la carte des locators, passent donc sur des services dont les conditions couvrent une application distribuée : Esri pour Street, Carto pour les locators. OpenStreetMap reste crédité — les tuiles Carto sont construites à partir de ses données — et la carte des locators limite désormais son débit de requêtes comme le faisait déjà la carte du monde.",
|
||||
"Band map : une station que tu viens de contacter cesse d'apparaître en NEW. Après chaque QSO, les couleurs des spots sont rafraîchies, mais seulement quand la liste du cluster DX était à l'écran — la band map avait été oubliée. Contacter une station dans la disposition habituelle (QSO récents à gauche, band map à droite) laissait donc sa pastille en orange jusqu'à ce qu'on ouvre l'onglet cluster. La band map, ancrée ou dans son onglet, compte désormais comme visible au même titre que le cluster.",
|
||||
"Band map : nouveau POTA, nouveau comté et indicatif déjà contacté sont enfin visibles. La band map ne colorait que le statut d'entité — nouveau DXCC, nouvelle bande, nouveau créneau, contacté — et ignorait les trois autres marqueurs alors qu'elle les recevait déjà : un nouveau parc sur une entité déjà travaillée ressemblait à n'importe quel spot contacté. Ils apparaissent désormais sur la bande latérale de la pastille, dans les couleurs de la liste du cluster DX, pour qu'un même fait ne soit pas bleu dans un panneau et vert dans l'autre. Ils s'empilent au lieu de se remplacer : une entité contactée qui est aussi un nouveau parc affiche les deux, comme la liste du cluster les énumère déjà côte à côte. Un nouveau comté passe en violet au lieu de partager le vert avec un nouveau parc — dans les DEUX panneaux, sinon ils se contrediraient ; les couleurs des marqueurs sont désormais dans une table unique, celle-là même que pilotera l'option de couleur à venir."
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "0.24.1",
|
||||
"date": "",
|
||||
"en": [
|
||||
"Recent QSOs: the Max box can be lowered again. It could not be emptied — clearing it put the old number straight back — so going from a large figure down to a small one was a fight against the field, and looked like the setting refusing to stick. Type freely now and press Enter (or click away) to apply. The value was already saved and travels with your data folder; only the box was in the way.",
|
||||
"Memory: the awards cache is given back once you stop using it. Opening the Awards panel loads the whole logbook into memory and kept it there for the rest of the session — a few tens of megabytes on a small log, but several hundred on a large one, and it was never released because the cache only expired when the logbook changed. It is now dropped after fifteen minutes without use, and the memory returned to Windows. Fifteen minutes on purpose: working through your awards keeps it warm, since reloading a large log takes seconds. The log also records the heap size each time the cache is built or released, so a memory report can be answered with a figure instead of a guess.",
|
||||
"Performance: the DX-cluster console no longer drags the whole interface down. Every line of traffic — spots, MOTD, everything — was applied to the screen one at a time, and an RBN feed alone sends hundreds a second: that meant two copies of a 2000-line buffer and a redraw for each one, whether the console was open or not. Lines are now grouped and applied five times a second. The difference is most visible on an older PC, where this alone could make the app crawl.",
|
||||
"Update: \"stage current exe: … Accès refusé\" is fixed. Two causes, both handled. The previous build was always staged under the same name, so one leftover that could not be deleted — an antivirus holding it open is the usual reason — blocked every later update, permanently, with no way out but deleting the file by hand; the staging name is now unique. And when the running program cannot be renamed at all, which some endpoint protection deliberately prevents, OpsLog no longer gives up: it leaves the new build beside the old one and swaps them after closing, when its own file is an ordinary file again. If even that fails, OpsLog restarts on the current version rather than leaving you with nothing, and the download is kept for the next attempt.",
|
||||
"Band map: the width can be dragged. Both the map docked beside the tables and the per-band cards in the Band map tab were locked at a fixed width, so an operator watching a busy band could not give the map more room — nor take it back for the log. Grab the edge to resize, double-click it to go back to the default. The width is remembered and travels with your data folder, like the other layout settings. In the tab, one width applies to every card: they sit side by side, and columns of different widths read as a mistake."
|
||||
],
|
||||
"fr": [
|
||||
"QSO récents : la case Max se laisse enfin baisser. Impossible de la vider — l'effacer y remettait aussitôt l'ancien nombre — donc passer d'un grand chiffre à un petit était un combat contre le champ, et donnait l'impression que le réglage ne tenait pas. Tape librement puis Entrée (ou clique ailleurs) pour appliquer. La valeur était déjà enregistrée et voyage avec ton dossier de données ; c'était la case qui bloquait.",
|
||||
"Mémoire : le cache des diplômes est rendu quand tu ne t'en sers plus. Ouvrir le panneau Diplômes charge tout le journal en mémoire et l'y gardait jusqu'à la fermeture — quelques dizaines de Mo sur un petit journal, plusieurs centaines sur un gros, et jamais libérés puisque le cache n'expirait qu'au changement du journal. Il est désormais abandonné après quinze minutes sans usage, et la mémoire rendue à Windows. Quinze minutes volontairement : parcourir tes diplômes le garde chaud, recharger un gros journal coûtant plusieurs secondes. Le journal technique note aussi la taille du tas à chaque construction ou libération, pour qu'un signalement de mémoire se réponde avec un chiffre plutôt qu'une supposition.",
|
||||
"Performance : la console du cluster DX ne plombe plus toute l'interface. Chaque ligne de trafic — spots, MOTD, tout — était appliquée à l'écran une par une, et un flux RBN en envoie à lui seul des centaines par seconde : cela faisait deux copies d'un tampon de 2000 lignes et un redessin pour chacune, que la console soit ouverte ou non. Les lignes sont désormais groupées et appliquées cinq fois par seconde. La différence se voit surtout sur un PC ancien, où cela suffisait à faire ramer l'application.",
|
||||
"Mise à jour : le « stage current exe : … Accès refusé » est corrigé. Deux causes, traitées toutes les deux. L'ancienne version était toujours mise de côté sous le même nom : un seul reliquat impossible à supprimer — un antivirus qui le garde ouvert, le plus souvent — bloquait définitivement toutes les mises à jour suivantes, sans autre issue que d'effacer le fichier à la main ; ce nom est désormais unique. Et quand le programme en cours d'exécution ne peut pas être renommé du tout, ce que certaines protections empêchent volontairement, OpsLog n'abandonne plus : il laisse la nouvelle version à côté de l'ancienne et les échange après sa fermeture, quand son propre fichier redevient un fichier ordinaire. Si même cela échoue, OpsLog redémarre sur la version actuelle plutôt que de te laisser sans rien, et le téléchargement est conservé pour la prochaine tentative.",
|
||||
"Band map : la largeur se règle à la souris. La carte ancrée à côté des tableaux et les cartes par bande de l'onglet Band map étaient figées à une largeur fixe : impossible de donner plus de place à la carte sur une bande chargée, ni de la reprendre pour le journal. Attrape le bord pour redimensionner, double-clic pour revenir au défaut. La largeur est mémorisée et voyage avec ton dossier de données, comme les autres réglages de disposition. Dans l'onglet, une seule largeur vaut pour toutes les cartes : elles sont côte à côte, et des colonnes de largeurs différentes se lisent comme une erreur."
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "0.24.0",
|
||||
"date": "",
|
||||
"en": [
|
||||
"Worked before: an operator's portable callsigns now count as the same station. Typing RK3DWA finds the RK3DWA/3, /P and /MM contacts too, and the other way round — before, the history only appeared if you typed the exact form. Can be turned off in Settings → General; contest dupe checking is unaffected and stays exact.",
|
||||
"QSO editor: the OpsLog card now appears with the other confirmations. It has its own Sent / Received row in the QSL Info table, next to QSL, LoTW, eQSL and the rest, and the \"QSL received\" tick moved there from Contact's details — with its PSE QSL / TNX indicator, which is unchanged. Sent stays read-only: OpsLog stamps it when the card actually goes out.",
|
||||
"QSL card: the {qso.pse_tnx} stamp now prints \"TNX QSL\" instead of just \"TNX\", to read as the counterpart of \"PSE QSL\".",
|
||||
"Four new themes, with real colour this time: Indigo (deep blue-violet, electric accent), Ocean (deep teal, cyan), Plum (aubergine, magenta) and Nordic light (crisp cool white, indigo). The seven existing ones were all neutral — beige, slate, graphite, black — with an orange accent, so picking a theme only ever changed the shade of grey. Each new one colours the surfaces, not just the accent, and takes its own primary. The status colours stay exactly where they were: red still means a problem.",
|
||||
"Awards: the Prefix now completes a reference the operator typed without it. A station that puts just \"74\" in State counts for DDFM (codes D01…D95) with match-by \"code\" and Prefix \"D\" — before, that found nothing and the only way through was to write a regex, in a mode where you had chosen \"code\" and not \"pattern\". The prefix was applied after the reference lookup, that is, after the step that had already failed. A field that already holds the whole code is no longer prefixed twice either (\"D74\" used to become \"DD74\" as soon as a prefix was set).",
|
||||
"UDP: WSJT-X traffic arriving through a relay is read again. A forwarder such as W&P prepends the origin as text — \"127.0.0.1:2237|\" — in front of the packet it re-broadcasts, which pushed the WSJT-X signature 15 bytes in and made every datagram fail. That header is now skipped, so MSHV / WSJT-X / JTDX behind a relay work on the ordinary \"WSJT-X / JTDX / MSHV\" service: no new setting, nothing to reconfigure.",
|
||||
"UDP: an unreadable packet now says who sent it and what it contained — the sender's address, the size, a text preview and a hex dump — instead of just a magic number. And it stops after five: a port receiving the wrong traffic was writing that line a hundred times a second, filling the log and burying everything else. A closing line points at the two things to check, the sender and the service type.",
|
||||
"Awards: the QRZ.com and Custom confirmation sources actually work now. Both were offered in the award editor but neither was implemented, so ticking one marked no QSO as confirmed — silently. QRZ.com reads the download status (them confirming back, not our upload). Custom reads any QSO field or ADIF tag you name, with an optional list of values that count: point it at APP_OPSLOG_QSL_RCVD for a card received through OpsLog, or at a tag stamped by a club list you imported. Leave the value empty and any non-empty content confirms. A Custom source naming no field confirms nothing.",
|
||||
"Window: closing OpsLog while it is minimised no longer loses its size and position. Windows parks a minimised window at -32000,-32000 with a stub size, and that was what got saved — so the next launch found geometry no screen could hold, discarded it, and reopened at the default place. The stored geometry is now kept instead; it repairs itself the first time you close a window that is on screen."
|
||||
],
|
||||
"fr": [
|
||||
"Déjà contacté : les indicatifs portables d'un opérateur comptent désormais comme la même station. Taper RK3DWA retrouve aussi les QSO en RK3DWA/3, /P et /MM, et inversement — avant, l'historique n'apparaissait que si tu tapais la forme exacte. Désactivable dans Réglages → Général ; le contrôle de doublon en concours n'est pas touché et reste strict.",
|
||||
"Éditeur de QSO : la carte OpsLog rejoint les autres confirmations. Elle a sa propre ligne Envoyée / Reçue dans le tableau de l'onglet QSL Info, à côté de QSL, LoTW, eQSL et les autres, et la case « QSL reçue » y a été déplacée depuis Détails du contact — avec son indicateur PSE QSL / TNX, inchangé. « Envoyée » reste en lecture seule : OpsLog l'inscrit quand la carte part réellement.",
|
||||
"Carte QSL : le tampon {qso.pse_tnx} imprime désormais « TNX QSL » et non plus « TNX » seul, pour répondre à « PSE QSL ».",
|
||||
"Quatre nouveaux thèmes, avec de la vraie couleur cette fois : Indigo (bleu-violet profond, accent électrique), Océan (turquoise profond, cyan), Prune (aubergine, magenta) et Clair nordique (blanc froid net, indigo). Les sept existants étaient tous neutres — beige, ardoise, graphite, noir — avec un accent orange : choisir un thème ne changeait que la nuance de gris. Les nouveaux colorent les surfaces, pas seulement l'accent, et ont chacun leur couleur principale. Les couleurs de statut ne bougent pas : le rouge veut toujours dire un problème.",
|
||||
"Diplômes : le Préfixe complète désormais une référence saisie sans lui. Une station qui met simplement « 74 » dans State compte pour le DDFM (codes D01…D95) avec correspondance « code » et Préfixe « D » — avant, cela ne trouvait rien et le seul recours était d'écrire une regex, dans un mode où tu avais justement choisi « code » et pas « pattern ». Le préfixe était appliqué après la recherche de la référence, c'est-à-dire après l'étape qui venait d'échouer. Un champ contenant déjà le code complet n'est plus préfixé deux fois non plus (« D74 » devenait « DD74 » dès qu'un préfixe était réglé).",
|
||||
"UDP : le trafic WSJT-X qui arrive via un relais est de nouveau lu. Un réexpéditeur comme W&P place l'origine en texte — « 127.0.0.1:2237| » — devant le paquet qu'il rediffuse, ce qui décalait la signature WSJT-X de 15 octets et faisait échouer chaque datagramme. Cet en-tête est désormais ignoré : MSHV / WSJT-X / JTDX derrière un relais fonctionnent avec le service « WSJT-X / JTDX / MSHV » habituel, sans nouveau réglage ni reconfiguration.",
|
||||
"UDP : un paquet illisible indique désormais qui l'a envoyé et ce qu'il contenait — adresse de l'émetteur, taille, aperçu en texte et vidage hexadécimal — au lieu d'un simple nombre magique. Et il s'arrête après cinq : un port recevant le mauvais trafic écrivait cette ligne cent fois par seconde, saturant le journal et enterrant tout le reste. Une ligne finale rappelle les deux choses à vérifier, l'émetteur et le type de service.",
|
||||
"Diplômes : les sources de confirmation QRZ.com et Custom fonctionnent enfin. Les deux étaient proposées dans l'éditeur de diplômes sans être implémentées : cocher l'une ou l'autre ne confirmait aucun QSO, en silence. QRZ.com lit le statut de téléchargement (leur confirmation en retour, pas notre envoi). Custom lit n'importe quel champ de QSO ou balise ADIF que tu désignes, avec une liste facultative de valeurs qui comptent : pointe-la sur APP_OPSLOG_QSL_RCVD pour une carte reçue via OpsLog, ou sur une balise inscrite à l'import d'une liste de club. Laisse la valeur vide et tout contenu non vide confirme. Une source Custom sans champ ne confirme rien.",
|
||||
"Fenêtre : fermer OpsLog alors qu'il est réduit ne fait plus perdre sa taille et sa position. Windows range une fenêtre réduite en -32000,-32000 avec une taille factice, et c'est cela qui était enregistré — au lancement suivant, OpsLog trouvait une géométrie qu'aucun écran ne peut contenir, la rejetait et rouvrait à l'emplacement par défaut. La géométrie déjà enregistrée est désormais conservée ; cela se répare tout seul à la première fermeture d'une fenêtre visible à l'écran."
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "0.23.9",
|
||||
"date": "",
|
||||
"en": [
|
||||
"Backup: new \"Back up on every exit\" option (Settings → Backup). With it on, OpsLog backs up the database each time you quit instead of only the first time of the day — so a second session's QSOs are always captured.",
|
||||
"Cluster details (My station): removed the example placeholders in My rig / My antenna (and the satellite name/mode) — they looked like real values, so an empty field read as already filled.",
|
||||
"QSL: new \"OpsLog QSL received\" marker on the QSO edit window (next to QSL Message), with a live PSE QSL / TNX indicator. When a QSL was received the card prints TNX (thanks), otherwise PSE QSL (please send one) — automatic. The stamp uses the {qso.pse_tnx} token (in the default card footer; placeable anywhere in the designer). A \"QSL received\" column was added to Recent QSOs.",
|
||||
"QSL: a default QSL message (Settings → E-mail, under the QSL card e-mail) now prints on the card when a QSO has no QSL Message of its own — a QSO's own QSL Message always takes precedence.",
|
||||
"UDP outbound: a QSO logged from WSJT-X / JTDX / MSHV (via the inbound UDP listener) is now forwarded to the outbound ADIF integrations too — previously only QSOs typed directly into OpsLog were re-emitted.",
|
||||
"Backup: with \"back up on every exit\", a new \"Keep every backup\" sub-option writes a distinct time-stamped file per exit (opslog-YYYY-MM-DD-HHMMSS.db) instead of overwriting the day's file. Rotation still keeps the newest N — raise it for more history.",
|
||||
"Awards editor: the PRIMARY QSOFIELDS search now has a Prefix field too (prepended to each found reference, e.g. captured 01 → D01) — previously only the OR fallback searches could add a prefix, so a DOK-style award couldn't match on its main rule.",
|
||||
"CAT: new Elecraft K3/K4 backend in the rig list. Select it (it reuses the Kenwood USB/network settings) and digital modes automatically use DATA A (MD6+DT0) — the sub-mode FT8 audio needs, so the K3 no longer keys the transmitter without modulating.",
|
||||
"Settings database: the New / Open existing / Save a copy / Rename / Reset buttons are back (Settings → Database). Only \"Open folder\" was left, which opens Windows Explorer — where a .db can't be selected, it just asks which program should open it. Picking a database now uses a proper file dialog and offers a one-click restart.",
|
||||
"Recent QSOs: a column dragged to sit AFTER an award column now stays there. Award columns were left out of the saved layout, so on reload they were pushed to the far right and jumped back in front of the column you had placed after them.",
|
||||
"Entry form and QSO editor: Name and QTH are capitalised word by word (\"JEAN-PIERRE\" → \"Jean-Pierre\"), Comment and Note get a capital first letter. Applied when you leave the field, so typing is never interrupted; the rest of a comment is left alone, since it usually holds callsigns and modes.",
|
||||
"Recent QSOs: the search box only ever takes callsigns, so it now upper-cases as you type and carries a small clear button.",
|
||||
"CAT Elecraft K3/K4: the rig's mode is read back correctly. MD6 is DATA on a K3 but FSK on a Kenwood, and OpsLog decoded it as RTTY — so a K3 running FT8 showed RTTY, logged its QSOs as RTTY, and told WSJT-X/JTDX over the shared CAT link that the rig was in RTTY while they had asked for a data mode. Applies to the Elecraft K3/K4 backend and to the \"DATA A — MD6\" option; a plain Kenwood still reads MD6 as RTTY.",
|
||||
"CAT sharing: the transmitter is dropped when the program keying it goes away. If WSJT-X/JTDX crashed, was closed, or simply had its connection cut — which is what saving the settings does, since the sharing server is rebuilt — the rig stayed on air with nobody watching: the Kenwood/Elecraft link stops polling while PTT is held, so nothing noticed. A K3 was seen transmitting for 29 seconds.",
|
||||
"DX cluster: new \"Self-spot while I log\" option (Settings → DX Cluster). When you log a QSO, OpsLog announces YOU on the master cluster — your station callsign as the DX, on the frequency you just worked — so callers find you without waiting for someone else to spot you. It fires on the first QSO of a frequency, then no more often than the interval you set; five minutes is the minimum, since a self-spot is traffic every user of the node sees."
|
||||
],
|
||||
"fr": [
|
||||
"Sauvegarde : nouvelle option \"Sauvegarder à chaque fermeture\" (Réglages → Sauvegarde). Activée, OpsLog sauvegarde la base à chaque fois que tu quittes au lieu d'une seule fois par jour — les QSO d'une seconde session sont ainsi toujours pris.",
|
||||
"Détails cluster (Ma station) : suppression des exemples en filigrane dans Mon rig / Mon antenne (et nom/mode satellite) — ils ressemblaient à de vraies valeurs, faisant croire qu'un champ vide était déjà rempli.",
|
||||
"QSL : nouveau marqueur \"QSL OpsLog reçue\" dans la fenêtre d'édition du QSO (à côté du Message QSL), avec un indicateur PSE QSL / TNX en direct. Si une QSL a été reçue, la carte imprime TNX (merci), sinon PSE QSL (envoie-moi une carte) — automatique. Le tampon utilise le token {qso.pse_tnx} (dans le pied de carte par défaut ; plaçable où tu veux dans le designer). Une colonne \"QSL reçue\" a été ajoutée aux QSO récents.",
|
||||
"QSL : un message QSL par défaut (Réglages → E-mail, sous l'e-mail de carte QSL) s'imprime désormais sur la carte quand un QSO n'a pas son propre Message QSL — le Message QSL du QSO l'emporte toujours.",
|
||||
"UDP sortant : un QSO enregistré depuis WSJT-X / JTDX / MSHV (via l'écouteur UDP entrant) est désormais aussi transmis aux intégrations ADIF sortantes — avant, seuls les QSO saisis directement dans OpsLog étaient réémis.",
|
||||
"Sauvegarde : avec \"sauvegarder à chaque fermeture\", une nouvelle sous-option \"Garder chaque sauvegarde\" écrit un fichier horodaté distinct par fermeture (opslog-AAAA-MM-JJ-HHMMSS.db) au lieu d'écraser le fichier du jour. La rotation garde les N plus récents — augmente-la pour plus d'historique.",
|
||||
"Éditeur de diplômes : la recherche PRINCIPALE QSOFIELDS a aussi un champ Préfixe (ajouté devant chaque référence trouvée, ex. 01 capturé → D01) — avant, seules les recherches OR de repli pouvaient ajouter un préfixe, empêchant un diplôme type DOK de matcher sur sa règle principale.",
|
||||
"CAT : nouveau backend Elecraft K3/K4 dans la liste des rigs. Sélectionne-le (il réutilise les réglages USB/réseau Kenwood) et les modes numériques passent automatiquement en DATA A (MD6+DT0) — le sous-mode dont l'audio FT8 a besoin, donc le K3 ne passe plus en émission sans moduler.",
|
||||
"Base de réglages : les boutons Nouvelle base / Ouvrir existante / Enregistrer une copie / Renommer / Réinitialiser sont de retour (Réglages → Base de données). Il ne restait que \"Ouvrir le dossier\", qui lance l'Explorateur Windows — où un .db n'est pas sélectionnable, il demande juste avec quel logiciel l'ouvrir. Choisir une base passe désormais par un vrai sélecteur de fichier, avec redémarrage en un clic.",
|
||||
"QSO récents : une colonne déplacée APRÈS une colonne de diplôme y reste. Les colonnes de diplômes étaient exclues de la disposition enregistrée, donc au rechargement elles étaient repoussées tout à droite et repassaient devant la colonne que tu avais placée après elles.",
|
||||
"Saisie et éditeur de QSO : Name et QTH sont capitalisés mot par mot (« JEAN-PIERRE » → « Jean-Pierre »), Comment et Note prennent une majuscule en première lettre. Appliqué quand tu quittes le champ, donc la frappe n'est jamais perturbée ; la suite d'un commentaire est laissée telle quelle, puisqu'elle contient souvent des indicatifs et des modes.",
|
||||
"QSO récents : le champ de recherche ne prend que des indicatifs — il passe donc en majuscules à la frappe et reçoit un petit bouton d'effacement.",
|
||||
"CAT Elecraft K3/K4 : le mode de la radio est relu correctement. MD6 vaut DATA sur un K3 mais FSK sur un Kenwood, et OpsLog le décodait en RTTY — un K3 en FT8 affichait donc RTTY, enregistrait ses QSO en RTTY, et annonçait RTTY à WSJT-X/JTDX via le partage CAT alors qu'ils avaient demandé un mode data. Vaut pour le backend Elecraft K3/K4 et pour l'option « DATA A — MD6 » ; un Kenwood classique lit toujours MD6 comme RTTY.",
|
||||
"Partage CAT : l'émission est coupée quand le logiciel qui la commandait disparaît. Si WSJT-X/JTDX plantait, était fermé, ou voyait simplement sa connexion coupée — ce que fait un enregistrement des réglages, puisque le serveur de partage est reconstruit — la radio restait en émission sans surveillance : la liaison Kenwood/Elecraft cesse d'interroger le poste tant que le PTT est tenu, donc rien ne s'en apercevait. Un K3 a été vu en émission pendant 29 secondes.",
|
||||
"Cluster DX : nouvelle option « M'auto-spotter quand j'enregistre » (Réglages → DX Cluster). À chaque QSO enregistré, OpsLog t'annonce sur le cluster maître — ton indicatif de station en DX, sur la fréquence que tu viens de travailler — pour qu'on te trouve sans attendre que quelqu'un te spotte. Déclenché au premier QSO d'une fréquence, puis pas plus souvent que l'intervalle choisi ; cinq minutes est le minimum, un auto-spot étant du trafic que voient tous les utilisateurs du nœud."
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "0.23.8",
|
||||
"date": "",
|
||||
"en": [
|
||||
"E-mail: the QSO recording e-mail (subject and body) is now editable in Settings → E-mail, like the QSL card e-mail — with the {CALL} {DATE} {BAND} {MODE} {MYCALL} variables.",
|
||||
"Backup fix: the backup now saves your CONTACTS (the logbook), not just the settings. Once the logbook was split into its own file, the backup kept snapshotting the settings database and silently missed the QSOs. It now writes the log to opslog-*.db and the configuration separately to opslogcfg-*.db (MySQL logs still export to ADIF).",
|
||||
"Performance: much lower CPU and memory on a busy cluster (RBN and other high-volume feeds). The Cluster tab was re-scanning the entire logbook for every batch of spots (~20×/second) and its spot-status cache grew without limit — on a firehose that could climb to gigabytes of RAM and peg a CPU. The worked-index is now cached (rebuilt only when you log a QSO) and the status cache is bounded to the spots actually shown."
|
||||
],
|
||||
"fr": [
|
||||
"E-mail : le texte de l'e-mail d'enregistrement QSO (objet et corps) est désormais modifiable dans Réglages → E-mail, comme l'e-mail de carte QSL — avec les variables {CALL} {DATE} {BAND} {MODE} {MYCALL}.",
|
||||
"Correction sauvegarde : la sauvegarde enregistre désormais tes CONTACTS (le journal), et plus seulement les réglages. Depuis que le journal a été séparé dans son propre fichier, la sauvegarde continuait à copier la base des réglages et oubliait les QSO. Elle écrit maintenant le log dans opslog-*.db et la configuration à part dans opslogcfg-*.db (les logs MySQL restent exportés en ADIF).",
|
||||
"Performances : CPU et mémoire nettement réduits sur un cluster chargé (RBN et autres flux à fort volume). L'onglet Cluster rescannait tout le journal à chaque lot de spots (~20×/seconde) et son cache de statuts grossissait sans limite — sur un flux intense cela pouvait atteindre des gigaoctets de RAM et saturer un cœur. L'index des contacts est désormais mis en cache (reconstruit seulement quand tu logues un QSO) et le cache de statuts est borné aux spots réellement affichés."
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "0.23.7",
|
||||
"date": "",
|
||||
"en": [
|
||||
"QSO edit: added the QRZ ↗ button next to the callsign, like the main entry form — one click opens that station's qrz.com profile.",
|
||||
"PowerGenius XL: the fan mode (Standard / Contest / Broadcast) changes on the amp again. A previous fix dropped the \"setup\" prefix the amp requires (\"setup fanmode=…\"), so the amp rejected the command and the mode snapped straight back. The correct command is restored.",
|
||||
"Performance: fixed a slowdown introduced in 0.23.6. To dim the \"represents nothing\" spots, the DX Cluster grid was redrawing EVERY row on each spot-status update, which pegged the CPU on a busy cluster (some PCs became sluggish). The dimming now updates with a light per-cell refresh instead — same look, no more churn.",
|
||||
"DX Cluster: after you log a QSO, the spots update — a callsign, entity, POTA, prefix or band/mode slot you just worked stops showing its NEW badge, instead of staying \"new\" until a restart. Kept fast: it re-evaluates only while the cluster is actually on screen (nothing runs otherwise — a QSO logged while it's hidden refreshes once when you next open it), and it's debounced so a quick run doesn't re-scan on every QSO.",
|
||||
"Station Control relays (WebSwitch / KMTronic / Dingtian): the Host field now accepts a full URL, so you can reach a network relay board through an HTTPS reverse proxy — e.g. https://relay.yourdomain.com.",
|
||||
"Stats slot drill-down: the pop-up listing the QSOs behind a band/mode square looks tidier (banded rows, cleaner header), and you can now click a callsign in it to open that QSO for editing.",
|
||||
"DCU-1 rotor support: OpsLog can now steer controllers that speak the Hy-Gain DCU-1 protocol (RotorCard DXA for Yaesu DXA rotors, Idiom Press Rotor-EZ, Green Heron) over their COM port or a serial-over-IP bridge.",
|
||||
"Motorized antenna: Settings → Antenna now has a Covered bands selector (40 m–6 m) instead of a min/max range, for both the Ultrabeam and the SteppIR. Tick only the bands your antenna does — untick one you can't (e.g. 30 m without its extension) while keeping the rest — and OpsLog leaves the antenna put on every other band. This overrides an unreliable controller, so 80 m no longer clamps the elements down to 30 m. Existing range settings migrate automatically.",
|
||||
"Motorized antenna: on a band you did not tick in Covered bands, OpsLog no longer inhibits FlexRadio transmit for \"antenna moving\". Un-ticking a band now means hands off completely — no tuning and no TX block — so working it on another antenna is never gagged.",
|
||||
"Awards: a new Settings → Awards picker (under User configuration) lets you choose which awards to follow — a two-column list, all awards on the left, the ones you track on the right. The Awards tab then shows only those you follow (per profile; leave the right side empty to show them all).",
|
||||
"Kenwood/Elecraft CAT: the link no longer drops while the rig is transmitting. A K3 (and other Kenwood-dialect rigs) answers \"?;\" to a status poll during transmit; OpsLog used to read that as \"rig doesn't support IF\" and disconnect — which tore down the shared CAT that WSJT-X / JTDX key through, so the radio wouldn't transmit properly. OpsLog now pauses status polling while PTT is held and keeps the link up.",
|
||||
"New award: Russian District Award (RDA) — tracks the 2660 Russian districts, worked and confirmed per band."
|
||||
],
|
||||
"fr": [
|
||||
"Édition de QSO : ajout du bouton QRZ ↗ à côté de l'indicatif, comme dans le formulaire de saisie — un clic ouvre le profil qrz.com de la station.",
|
||||
"PowerGenius XL : le mode ventilateur (Standard / Contest / Broadcast) change de nouveau sur l'ampli. Un correctif précédent avait retiré le préfixe « setup » exigé par l'ampli (« setup fanmode=… »), qui rejetait donc la commande et le mode revenait aussitôt en arrière. La bonne commande est rétablie.",
|
||||
"Performance : correction d'un ralentissement apparu en 0.23.6. Pour atténuer les spots « qui ne représentent rien », la grille du DX Cluster redessinait TOUTES les lignes à chaque mise à jour de statut, ce qui saturait le CPU sur un cluster actif (des PC devenaient lents). L'atténuation se met désormais à jour via un rafraîchissement léger par cellule — même rendu, sans le brassage.",
|
||||
"DX Cluster : après avoir loggué un QSO, les spots se mettent à jour — un indicatif, une entité, un POTA, un préfixe ou un slot bande/mode que vous venez de contacter cesse d'afficher son badge NEW, au lieu de rester « new » jusqu'au redémarrage. Reste rapide : la réévaluation n'a lieu que si le cluster est affiché (sinon rien ne tourne — un QSO loggué cluster caché se rafraîchit une fois à sa réouverture), et c'est débouncé pour ne pas re-scanner à chaque QSO en série.",
|
||||
"Relais du Contrôle station (WebSwitch / KMTronic / Dingtian) : le champ Hôte accepte désormais une URL complète ex. https://relais.tondomaine.com derrière Nginx Proxy Manager. Avant, OpsLog forçait http://<hôte>, donc une carte sur le LAN derrière un proxy (quand vos 80/443 vont déjà ailleurs) était injoignable de l'extérieur.",
|
||||
"Détail d’un slot Stats : la fenêtre listant les QSO derrière une case bande/mode est plus soignée (lignes alternées, en-tête plus propre), et vous pouvez maintenant cliquer un indicatif pour ouvrir ce QSO en édition.",
|
||||
"Prise en charge des rotors DCU-1 : OpsLog pilote désormais les contrôleurs parlant le protocole Hy-Gain DCU-1 (RotorCard DXA pour rotors Yaesu DXA, Idiom Press Rotor-EZ, Green Heron) via leur port COM ou un pont série-sur-IP.",
|
||||
"Antenne motorisée : Réglages → Antenne propose désormais un sélecteur Bandes couvertes (40 m–6 m) au lieu d'une plage min/max, pour l'Ultrabeam comme pour la SteppIR. Coche seulement les bandes que fait ton antenne — décoche celle que tu ne fais pas (p. ex. le 30 m sans son extension) en gardant les autres — et OpsLog laisse l'antenne en place sur toutes les autres. Ceci prime sur un contrôleur peu fiable : le 80 m ne replie plus les éléments sur le 30 m. Les anciens réglages de plage sont migrés automatiquement.",
|
||||
"Antenne motorisée : sur une bande non cochée dans Bandes couvertes, OpsLog n'inhibe plus l'émission du FlexRadio pour « antenne en mouvement ». Décocher une bande signifie désormais ne plus y toucher du tout — ni accord ni blocage TX — pour ne jamais couper le trafic sur une autre antenne.",
|
||||
"Diplômes : un nouveau sélecteur Réglages → Diplômes (dans Configuration utilisateur) permet de choisir les diplômes à suivre — une liste à deux colonnes, tous les diplômes à gauche, ceux que tu suis à droite. L'onglet Awards n'affiche alors que ceux-là (par profil ; laisse la colonne de droite vide pour tous les afficher).",
|
||||
"CAT Kenwood/Elecraft : le lien ne tombe plus pendant que le rig émet. Un K3 (et d'autres rigs en dialecte Kenwood) répond \"?;\" à une interrogation d'état pendant l'émission ; OpsLog le prenait pour \"le rig ne supporte pas IF\" et se déconnectait — ce qui cassait le CAT partagé que WSJT-X / JTDX utilisent pour passer en émission, d'où l'absence d'émission. OpsLog suspend désormais l'interrogation d'état tant que le PTT est actif et garde le lien.",
|
||||
"Nouveau diplôme : Russian District Award (RDA) — suit les 2660 districts russes, travaillés et confirmés par bande."
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "0.23.6",
|
||||
"date": "",
|
||||
"en": [
|
||||
"Log viewer: the window now keeps twice as much history (512 KB instead of 256 KB, ~3200 lines). During a busy trace the oldest lines used to scroll out of the buffer while you were still reading them; the larger window holds them.",
|
||||
"Ultrabeam over a remote link: fixed intermittent connection drops, phantom frequency jumps and wrong element-length readings. On a slow link a command that timed out left its late reply in the stream, and the next command read it as its own — crossing a status query with an element-length one, for instance. The stream is now flushed of any stale reply before each command, keeping the exchange in step.",
|
||||
"Ultrabeam: the 'moving' indicator and the Flex TX-inhibit now react the instant you click a band or pattern, instead of up to a status poll (~2 s) later. A commanded move reports motion immediately; the real motor state takes over once the next poll reads it.",
|
||||
"CAT sharing (FT8): JTDX/WSJT-X transmit correctly again through OpsLog's shared rig. get_ptt now echoes the PTT state the client last commanded — clients poll it DURING transmit to confirm the rig is keyed, and OpsLog always answering 'receiving' made them give up and drop the over after a second or two. The 0.23.5 'Fake It' anti-drift tweak was also reverted (it had made this total — no transmit at all); the small dial creep in 'Fake It' split can return, and JTDX's 'Split Operation: None' avoids it.",
|
||||
"CAT settings: trimmed the long help text under the Kenwood and CAT-sharing fields down to the essentials — less clutter.",
|
||||
"Entry form: fixed two ways a stray QSO could sneak in. Pressing Enter in the TX/RX frequency field now only tunes the radio — it was also submitting the contact. And a bare number with no letter (JTDX/WSJT-X sometimes broadcasts \"1\" as the DX call) is no longer accepted into the callsign field, where it could get logged as callsign \"1\".",
|
||||
"SPE amplifier: switching the amp off in OpsLog now shows \"off\" straight away and lets you switch it back on without restarting. The already-open connection kept reading as connected after the off keystroke, so the panel stayed \"on\" and the ON button did nothing until a restart. OpsLog now drops the link on power-off, exactly as a fresh start would — the ON button's RTS/DTR wake then works.",
|
||||
"Alt+W clears the QSO entry, the shortcut used by most other loggers. Unlike Esc it always works, even when the CW keyer has Esc reserved.",
|
||||
"The Grid box no longer pops outside the QSO entry panel when the window is narrowed — it wraps to its own line instead.",
|
||||
"Selecting a QSO in the Recent QSOs list now shows that station in the Stats (F1) matrix, instead of leaving it blank.",
|
||||
"Stats (F1): click any coloured band/mode square to list the contacts behind it.",
|
||||
"Awards: the DXCC list now shows each entity’s main prefix (XE, DL, F…) in its own sortable, searchable column.",
|
||||
"DX Cluster: new option \"Already worked only on the same slot\" (Settings → DX Cluster). With it on, a spot reads \"worked\" only when you worked that callsign on the SAME band and mode — not just anywhere. It respects the digital-mode grouping (Settings → General): grouped, a 20m FT8 contact also marks a 20m FT4 spot as worked; ungrouped, FT8 and FT4 are separate slots.",
|
||||
"DX Cluster: added a WORKED status-filter chip, so you can show — or, with the other chips off, isolate — already-worked spots, not only hide them with the \"Hide worked\" checkbox.",
|
||||
"DX Cluster: spots that represent nothing — entity/band/mode already worked, the callsign not in your log, no POTA/county/prefix novelty — are now dimmed, so your eye skips them and the spots worth working stand out. What counts as \"nothing\" follows the \"same slot\" option and the digital-mode grouping.",
|
||||
"Ultrabeam: an older controller (seen over an RS232-to-Ethernet bridge) answers with an 11-byte status frame instead of 12. OpsLog rejected it as \"too short\" and reconnect-looped; it now accepts a shorter checksum-valid frame and defaults the missing tail field.",
|
||||
"Fixed a crash (React #300) that could take down the whole window when the rig briefly reported an unusual band — for example a spurious 33 cm reading from an Icom. The Band Map had a keyboard-navigation hook after its early return for unknown bands, so the number of hooks changed between renders. The hook now always runs."
|
||||
],
|
||||
"fr": [
|
||||
"Visionneuse de log : la fenêtre conserve deux fois plus d'historique (512 Ko au lieu de 256 Ko, ~3200 lignes). Lors d'une trace chargée, les plus vieilles lignes défilaient hors du buffer pendant qu'on les lisait encore ; la fenêtre agrandie les garde.",
|
||||
"Ultrabeam en remote : coupures de connexion intermittentes, sauts de fréquence fantômes et longueurs d'éléments erronées corrigés. Sur un lien lent, une commande qui expirait laissait sa réponse tardive dans le flux, et la commande suivante la lisait comme la sienne — croisant par exemple une requête de statut avec une requête de longueurs d'éléments. Le flux est désormais vidé de toute réponse périmée avant chaque commande, gardant l'échange synchronisé.",
|
||||
"Ultrabeam : l'indicateur « en mouvement » et l'inhibition d'émission Flex réagissent désormais dès que vous cliquez sur une bande ou un diagramme, au lieu d'attendre jusqu'à un poll de statut (~2 s). Un mouvement commandé signale le déplacement immédiatement ; l'état réel des moteurs prend le relais dès le poll suivant.",
|
||||
"Partage CAT (FT8) : JTDX/WSJT-X émettent de nouveau correctement via la radio partagée d'OpsLog. get_ptt renvoie désormais l'état PTT commandé en dernier par le client — les clients l'interrogent PENDANT l'émission pour confirmer que la radio est en émission, et comme OpsLog répondait toujours « réception », ils abandonnaient et coupaient l'émission au bout d'une seconde ou deux. L'ajustement anti-drift « Fake It » de la 0.23.5 a aussi été annulé (il rendait le problème total — aucune émission) ; le léger glissement du VFO en split « Fake It » peut réapparaître, et « Split Operation : None » dans JTDX l'évite.",
|
||||
"Réglages CAT : textes d'aide raccourcis sous les champs Kenwood et partage CAT — moins de fouillis.",
|
||||
"Formulaire de saisie : deux façons de logguer un QSO parasite corrigées. Appuyer sur Entrée dans le champ fréquence TX/RX ne fait plus que syntoniser la radio — cela validait aussi le contact. Et un nombre nu sans lettre (JTDX/WSJT-X diffuse parfois « 1 » comme DX call) n'est plus accepté dans le champ indicatif, où il pouvait être loggué comme indicatif « 1 ».",
|
||||
"Ampli SPE : éteindre l'ampli depuis OpsLog affiche désormais « off » tout de suite et permet de le rallumer sans redémarrer. La connexion déjà ouverte continuait d'être vue comme connectée après la touche d'extinction, le panneau restait donc « on » et le bouton ON ne faisait rien jusqu'à un redémarrage. OpsLog largue maintenant le lien à l'extinction, exactement comme un démarrage à neuf — le réveil RTS/DTR du bouton ON fonctionne alors.",
|
||||
"Alt+W efface la saisie du QSO, le raccourci utilisé par la plupart des autres logiciels. Contrairement à Échap, il fonctionne toujours, même quand Échap est réservé au manipulateur CW.",
|
||||
"Le champ Locator ne déborde plus du panneau de saisie quand la fenêtre est rétrécie — il passe à la ligne.",
|
||||
"Sélectionner un QSO dans la liste des QSO récents affiche désormais cette station dans la matrice Stats (F1), au lieu de la laisser vide.",
|
||||
"Stats (F1) : cliquer sur une case bande/mode colorée liste les contacts correspondants.",
|
||||
"Diplômes : la liste DXCC affiche le préfixe principal de chaque entité (XE, DL, F…) dans une colonne triable et cherchable.",
|
||||
"DX Cluster : nouvelle option « Déjà contacté seulement sur le même slot » (Réglages → DX Cluster). Activée, un spot n'affiche « contacté » que si vous avez contacté cet indicatif sur la MÊME bande et le MÊME mode — pas juste n'importe où. Elle respecte le groupage des modes numériques (Réglages → Général) : groupé, un contact 20m FT8 marque aussi un spot 20m FT4 comme contacté ; dégroupé, FT8 et FT4 sont des slots distincts.",
|
||||
"DX Cluster : ajout d'un filtre de statut WORKED, pour afficher — ou, en désactivant les autres, isoler — les spots déjà contactés, pas seulement les masquer avec la case « Masquer les contactés ».",
|
||||
"DX Cluster : les spots qui ne représentent rien — entité/bande/mode déjà faite, indicatif absent du journal, aucune nouveauté POTA/comté/préfixe — sont désormais atténués, pour que l'œil les ignore et que les spots à travailler ressortent. Ce qui compte comme « rien » suit l'option « même slot » et le groupage des modes numériques.",
|
||||
"Ultrabeam : un contrôleur plus ancien (vu derrière un pont RS232-Ethernet) répond avec une trame de statut de 11 octets au lieu de 12. OpsLog la rejetait comme « trop courte » et bouclait en reconnexion ; il accepte désormais une trame valide plus courte et met par défaut le champ de fin manquant.",
|
||||
"Correction d'un plantage (React #300) qui pouvait faire tomber toute la fenêtre quand la radio rapportait brièvement une bande inhabituelle — par exemple une lecture 33 cm parasite d'un Icom. La Band Map avait un hook de navigation clavier après son retour anticipé pour les bandes inconnues, changeant le nombre de hooks entre deux rendus. Le hook est désormais toujours exécuté."
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "0.23.5",
|
||||
"date": "",
|
||||
"en": [
|
||||
"CAT sharing (Hamlib rigctld): fixed a slow frequency drift in FT8. With a digital app (JTDX/WSJT-X) sharing OpsLog's rig in \"Fake It\" split, each transmit crept the dial down and never came back. The app follows the dial by polling, and our reply lagged the last tune by a poll cycle, so right after a transmission it read the still-shifted frequency, took it for a manual QSY and adopted it. Reads now echo the last commanded frequency until the rig confirms it — the dial holds. Applies to every backend, not just Kenwood."
|
||||
],
|
||||
"fr": [
|
||||
"Partage CAT (rigctld Hamlib) : dérive lente de fréquence en FT8 corrigée. Avec une app numérique (JTDX/WSJT-X) partageant la radio d'OpsLog en split « Fake It », chaque passage en émission faisait descendre le VFO sans jamais revenir. L'app suit le VFO en l'interrogeant, et notre réponse était en retard d'un cycle sur la dernière syntonisation : juste après une émission elle lisait la fréquence encore décalée, la prenait pour un QSY manuel et l'adoptait. Les lectures renvoient désormais la dernière fréquence commandée jusqu'à confirmation de la radio — le VFO tient. Vaut pour tous les backends, pas seulement Kenwood."
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "0.23.4",
|
||||
"date": "",
|
||||
"en": [
|
||||
"CW keyer (Kenwood/Elecraft): choosing the Kenwood/Elecraft engine now actually switches to it. A bug left the keyer on WinKeyer even though the setting showed Kenwood/Elecraft, so its CW-over-CAT never ran.",
|
||||
"Kenwood/Elecraft data mode: a new setting (Settings → CAT) chooses what a data mode (FT8/PSK…) sets on the rig — USB (default), DATA mode (MD6, for an Elecraft K3/K4), or leave the rig's mode unchanged (safest for a TS-590SG/TS-990S, whose data mode is a USB modifier set on the radio). There is no single command that fits every rig, so it's now the operator's choice.",
|
||||
"Ultrabeam over a remote link: changing the pattern (Normal / 180° / bidirectional) no longer snaps back to the old one after a few seconds. The commanded pattern is now held while the motors are still moving plus a grace window after they stop, so the slow remote status poll — which lagged behind the antenna — can't revert the display while the change is in flight.",
|
||||
"QSL Manager: closing the window — or starting another download — now cancels the one still in progress, so a slow QRZ sync no longer keeps running in the background and bleeds its log into a freshly started LoTW run. The QRZ download summary also spells out that only confirmed QSOs are acted on (e.g. \"7950 of 26164 are confirmed\") — a full QRZ logbook has many not-yet-confirmed QSOs, so nothing is lost even though the old wording read as if only a fraction came back. (A LoTW \"http 503\" is separate: the ARRL server being down — retry later.)"
|
||||
],
|
||||
"fr": [
|
||||
"Keyer CW (Kenwood/Elecraft) : choisir le moteur Kenwood/Elecraft y bascule désormais réellement. Un bug laissait le keyer sur WinKeyer alors que le réglage affichait Kenwood/Elecraft, son CW-sur-CAT ne démarrait donc jamais.",
|
||||
"Mode data Kenwood/Elecraft : un nouveau réglage (Réglages → CAT) choisit ce qu'un mode data (FT8/PSK…) règle sur la radio — USB (défaut), mode DATA (MD6, pour un Elecraft K3/K4), ou ne pas changer le mode de la radio (le plus sûr pour un TS-590SG/TS-990S dont le mode data est un modificateur d'USB réglé sur la radio). Aucune commande unique ne convient à toutes les radios, c'est donc désormais au choix de l'opérateur.",
|
||||
"Ultrabeam en remote : changer le diagramme (Normal / 180° / bidirectionnel) ne revient plus à l'ancien au bout de quelques secondes. Le diagramme commandé est maintenu tant que les moteurs bougent, plus une fenêtre de grâce après leur arrêt — le poll de statut distant, lent et en retard sur l'antenne, ne peut donc plus faire revenir l'affichage pendant que le changement est en cours.",
|
||||
"QSL Manager : fermer la fenêtre — ou lancer un autre téléchargement — annule désormais celui en cours, une synchro QRZ lente ne continue donc plus en arrière-plan à mélanger son journal à un téléchargement LoTW fraîchement lancé. Le récapitulatif QRZ indique aussi clairement que seuls les QSO confirmés sont traités (ex. « 7950 sur 26164 confirmés ») — un logbook QRZ complet contient beaucoup de QSO pas encore confirmés, rien n'est donc perdu même si l'ancien texte donnait l'impression qu'une fraction seulement était revenue. (Un « http 503 » sur LoTW est un autre sujet : serveur de l'ARRL indisponible — réessayez plus tard.)"
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "0.23.3",
|
||||
"date": "",
|
||||
|
||||
+582
-120
File diff suppressed because it is too large
Load Diff
@@ -34,10 +34,13 @@ export type AwardDef = {
|
||||
url?: string; download_url?: string; ref_url?: string; valid_from?: string; valid_to?: string; alias?: string;
|
||||
ref_display?: string; // grid column shows: ref | name | both
|
||||
type?: string; field: string; match_by?: string; exact_match?: boolean; one_ref_per_qso?: boolean; pattern: string;
|
||||
leading_str?: string; trailing_str?: string; dynamic?: boolean;
|
||||
leading_str?: string; trailing_str?: string; prefix?: string; dynamic?: boolean;
|
||||
or_rules?: AwardOrRule[];
|
||||
dxcc_filter: number[] | null; valid_bands?: string[]; valid_modes?: string[]; emission?: string[];
|
||||
confirm: string[] | null; validate?: string[] | null; grant_codes?: string; export_credit_granted?: boolean;
|
||||
// The "custom" confirmation source: the field it reads and, optionally, the
|
||||
// value(s) that count. Empty value = any non-empty value confirms.
|
||||
confirm_field?: string; confirm_value?: string;
|
||||
total: number; builtin?: boolean; version?: number;
|
||||
};
|
||||
|
||||
@@ -556,9 +559,10 @@ export function AwardEditor({ open, onClose, onSaved }: Props) {
|
||||
<label className="flex items-center gap-2 text-xs cursor-pointer pl-[128px]"><Checkbox checked={!!cur.exact_match} onCheckedChange={(c) => patch({ exact_match: !!c })} /> {t('awed.exactMatch')}</label>
|
||||
<label className="flex items-center gap-2 text-xs cursor-pointer pl-[128px]" title={t('awed.oneRefHint')}><Checkbox checked={!!cur.one_ref_per_qso} onCheckedChange={(c) => patch({ one_ref_per_qso: !!c })} /> {t('awed.oneRef')}</label>
|
||||
<Field2 label={t('awed.patternRegex')}><Input className="h-8 font-mono text-xs" value={cur.pattern} onChange={(e) => patch({ pattern: e.target.value })} placeholder={t('awed.patternPlaceholder')} /></Field2>
|
||||
<div className="grid grid-cols-2 gap-3">
|
||||
<div className="grid grid-cols-3 gap-3">
|
||||
<Field2 label={t('awed.leadingString')}><Input className="h-8 font-mono text-xs" value={cur.leading_str ?? ''} onChange={(e) => patch({ leading_str: e.target.value })} /></Field2>
|
||||
<Field2 label={t('awed.trailingString')}><Input className="h-8 font-mono text-xs" value={cur.trailing_str ?? ''} onChange={(e) => patch({ trailing_str: e.target.value })} /></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>
|
||||
|
||||
{/* Fallback searches: tried in order, only while nothing
|
||||
@@ -621,6 +625,30 @@ export function AwardEditor({ open, onClose, onSaved }: Props) {
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* "Custom" is only meaningful once it names a field, so the
|
||||
inputs appear as soon as it is ticked in either column —
|
||||
and a custom source with no field confirms nothing. */}
|
||||
{((cur.confirm ?? []).includes('custom') || (cur.validate ?? []).includes('custom')) && (
|
||||
<div className="space-y-2 border-t border-border/60 pt-3">
|
||||
<Label className="text-xs font-semibold">{t('awed.customLabel')}</Label>
|
||||
<div className="grid grid-cols-2 gap-3">
|
||||
<div className="space-y-1">
|
||||
<Label className="text-[11px] text-muted-foreground">{t('awed.customField')}</Label>
|
||||
<Input className="h-8 font-mono text-xs" placeholder="APP_OPSLOG_QSL_RCVD"
|
||||
value={(cur as any).confirm_field ?? ''}
|
||||
onChange={(e) => patch({ confirm_field: e.target.value.trim().toUpperCase() } as any)} />
|
||||
</div>
|
||||
<div className="space-y-1">
|
||||
<Label className="text-[11px] text-muted-foreground">{t('awed.customValue')}</Label>
|
||||
<Input className="h-8 font-mono text-xs" placeholder="Y,V"
|
||||
value={(cur as any).confirm_value ?? ''}
|
||||
onChange={(e) => patch({ confirm_value: e.target.value } as any)} />
|
||||
</div>
|
||||
</div>
|
||||
<p className="text-[11px] text-muted-foreground leading-relaxed">{t('awed.customHint')}</p>
|
||||
</div>
|
||||
)}
|
||||
{/* "Grant codes" and "export credit_granted" used to live here. No
|
||||
ADIF export has ever written CREDIT_GRANTED, so both controls
|
||||
did nothing at all. The stored values are kept (see award.Def);
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import { useEffect, useMemo, useState } from 'react';
|
||||
import { Award as AwardIcon, RefreshCw, Loader2, Search, Pencil, X, Grid3x3, List, BarChart3, AlertTriangle, ChevronUp, ChevronDown } from 'lucide-react';
|
||||
import { GetAwardDefs, GetAward, AwardCellQSOs, GetAwardStats, AwardMissingQSOs, ListAwardReferences, AssignAwardRefToQSOs, RescanAwards } from '../../wailsjs/go/main/App';
|
||||
import { GetAwardDefs, GetAward, AwardCellQSOs, GetAwardStats, AwardMissingQSOs, ListAwardReferences, AssignAwardRefToQSOs, RescanAwards, GetTrackedAwards } from '../../wailsjs/go/main/App';
|
||||
import { EventsOn } from '../../wailsjs/runtime/runtime';
|
||||
import { Input } from '@/components/ui/input';
|
||||
import { Button } from '@/components/ui/button';
|
||||
import { Checkbox } from '@/components/ui/checkbox';
|
||||
@@ -137,13 +138,20 @@ export function AwardsPanel({ onEditQSO, onAwardsChanged }: { onEditQSO?: (id: n
|
||||
}
|
||||
}
|
||||
|
||||
// Load the award list (no QSO scan), then compute only the first award.
|
||||
// Load the award list (no QSO scan), then compute only the first award. The
|
||||
// list is narrowed to the awards the operator follows (Settings → Awards); an
|
||||
// empty follow-set means "show them all" so the tab is never blank.
|
||||
async function loadList() {
|
||||
try {
|
||||
const defs = ((await GetAwardDefs()) ?? []) as any[];
|
||||
const list: AwardListItem[] = defs
|
||||
const [defs, tracked] = await Promise.all([
|
||||
GetAwardDefs().then((d) => (d ?? []) as any[]),
|
||||
GetTrackedAwards().then((t) => (t ?? []) as string[]).catch(() => [] as string[]),
|
||||
]);
|
||||
const follow = new Set(tracked);
|
||||
let list: AwardListItem[] = defs
|
||||
.map((d) => ({ code: d.code, name: d.name, valid: d.valid, bands: d.valid_bands ?? [], emission: d.emission ?? [] }))
|
||||
.sort((a, b) => a.code.localeCompare(b.code));
|
||||
if (follow.size > 0) list = list.filter((a) => follow.has(a.code));
|
||||
setAwardList(list);
|
||||
const first = list.find((a) => a.code === selected) ?? list[0];
|
||||
if (first) compute(first.code);
|
||||
@@ -152,6 +160,12 @@ export function AwardsPanel({ onEditQSO, onAwardsChanged }: { onEditQSO?: (id: n
|
||||
}
|
||||
}
|
||||
useEffect(() => { loadList(); }, []);
|
||||
// Re-filter when the operator changes their followed awards in Settings.
|
||||
useEffect(() => {
|
||||
const off = EventsOn('awards:tracked-changed', () => { loadList(); });
|
||||
return () => { off(); };
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
}, []);
|
||||
|
||||
const current = byCode[`${selected}|${modeFilter}`];
|
||||
// Recompute when the mode class changes: the bands, counts and confirmations
|
||||
@@ -211,11 +225,14 @@ export function AwardsPanel({ onEditQSO, onAwardsChanged }: { onEditQSO?: (id: n
|
||||
// Alicante" — which reference order scatters across the whole table.
|
||||
// Remembered through writeUiPref rather than localStorage, so the choice
|
||||
// travels with a copied data/ folder like every other UI preference here.
|
||||
const [refSort, setRefSort] = useState<'ref' | 'name'>(
|
||||
() => (localStorage.getItem('opslog.awardRefSort') === 'name' ? 'name' : 'ref'));
|
||||
const [refSort, setRefSort] = useState<'ref' | 'name' | 'group'>(
|
||||
() => {
|
||||
const v = localStorage.getItem('opslog.awardRefSort');
|
||||
return v === 'name' || v === 'group' ? v : 'ref';
|
||||
});
|
||||
const [refSortDir, setRefSortDir] = useState<'asc' | 'desc'>(
|
||||
() => (localStorage.getItem('opslog.awardRefSortDir') === 'desc' ? 'desc' : 'asc'));
|
||||
const toggleRefSort = (k: 'ref' | 'name') => {
|
||||
const toggleRefSort = (k: 'ref' | 'name' | 'group') => {
|
||||
if (k === refSort) {
|
||||
const d = refSortDir === 'asc' ? 'desc' : 'asc';
|
||||
setRefSortDir(d);
|
||||
@@ -258,10 +275,26 @@ export function AwardsPanel({ onEditQSO, onAwardsChanged }: { onEditQSO?: (id: n
|
||||
if (c !== 0) return c * dir;
|
||||
return a.ref.localeCompare(b.ref) * dir; // stable tie-break
|
||||
}
|
||||
if (refSort === 'group') {
|
||||
// Prefix order (XE, YV, ZL…) — how a DX operator actually thinks about
|
||||
// entities. Blank prefixes sink to the bottom regardless of direction,
|
||||
// so an unresolved entity never heads the list.
|
||||
const ag = a.group ?? '', bg = b.group ?? '';
|
||||
if (!ag !== !bg) return ag ? -1 : 1;
|
||||
const c = ag.localeCompare(bg, undefined, { sensitivity: 'base' });
|
||||
if (c !== 0) return c * dir;
|
||||
return a.ref.localeCompare(b.ref, undefined, { numeric: true }) * dir;
|
||||
}
|
||||
return a.ref.localeCompare(b.ref, undefined, { numeric: true }) * dir;
|
||||
});
|
||||
}, [current, refSearch, refFilter, modeFilter, refSort, refSortDir]);
|
||||
|
||||
// The group column earns its width only when the list actually carries one
|
||||
// (DXCC prefixes, POTA locations); most custom lists have none. For DXCC the
|
||||
// value IS the primary prefix, so it is labelled as such.
|
||||
const hasGroup = useMemo(() => filteredRefs.some((r) => !!r.group), [filteredRefs]);
|
||||
const groupColLabel = current && current.code.toUpperCase() === 'DXCC' ? t('awp.prefixCol') : t('awp.groupCol');
|
||||
|
||||
return (
|
||||
<div className="flex h-full min-h-0">
|
||||
{/* Award list */}
|
||||
@@ -459,6 +492,14 @@ export function AwardsPanel({ onEditQSO, onAwardsChanged }: { onEditQSO?: (id: n
|
||||
{refSort === 'ref' && (refSortDir === 'asc' ? <ChevronUp className="size-3" /> : <ChevronDown className="size-3" />)}
|
||||
</button>
|
||||
</th>
|
||||
{hasGroup && (
|
||||
<th className="text-left py-1.5 pr-3 font-medium border-b border-border w-20">
|
||||
<button type="button" onClick={() => toggleRefSort('group')} className="inline-flex items-center gap-1 hover:text-foreground">
|
||||
{groupColLabel}
|
||||
{refSort === 'group' && (refSortDir === 'asc' ? <ChevronUp className="size-3" /> : <ChevronDown className="size-3" />)}
|
||||
</button>
|
||||
</th>
|
||||
)}
|
||||
<th className="text-left py-1.5 pr-3 font-medium border-b border-border">
|
||||
<button type="button" onClick={() => toggleRefSort('name')} className="inline-flex items-center gap-1 hover:text-foreground">
|
||||
{t('awp.description')}
|
||||
@@ -474,9 +515,10 @@ export function AwardsPanel({ onEditQSO, onAwardsChanged }: { onEditQSO?: (id: n
|
||||
{filteredRefs.map((r) => (
|
||||
<tr key={r.ref} className={cn('hover:bg-accent/20', !r.worked && 'opacity-60')}>
|
||||
<td className="sticky left-0 bg-card hover:bg-accent/20 py-1 pr-2 font-mono font-semibold border-b border-border/30">{r.ref}</td>
|
||||
<td className="py-1 pr-3 text-muted-foreground truncate max-w-[360px] border-b border-border/30">
|
||||
{r.name}{r.group ? <span className="text-muted-foreground/60"> · {r.group}</span> : ''}
|
||||
</td>
|
||||
{hasGroup && (
|
||||
<td className="py-1 pr-3 font-mono font-semibold border-b border-border/30">{r.group}</td>
|
||||
)}
|
||||
<td className="py-1 pr-3 text-muted-foreground truncate max-w-[360px] border-b border-border/30">{r.name}</td>
|
||||
{gridBands.map((b) => {
|
||||
const s = cellStatus(r, b);
|
||||
return (
|
||||
@@ -513,7 +555,12 @@ export function AwardsPanel({ onEditQSO, onAwardsChanged }: { onEditQSO?: (id: n
|
||||
{refSort === 'name' && (refSortDir === 'asc' ? <ChevronUp className="size-3" /> : <ChevronDown className="size-3" />)}
|
||||
</button>
|
||||
</th>
|
||||
<th className="py-1.5 pr-2 font-medium w-40">{t('awp.groupCol')}</th>
|
||||
<th className="py-1.5 pr-2 font-medium w-40">
|
||||
<button type="button" onClick={() => toggleRefSort('group')} className="inline-flex items-center gap-1 hover:text-foreground">
|
||||
{groupColLabel}
|
||||
{refSort === 'group' && (refSortDir === 'asc' ? <ChevronUp className="size-3" /> : <ChevronDown className="size-3" />)}
|
||||
</button>
|
||||
</th>
|
||||
<th className="py-1.5 pr-2 font-medium w-24">{t('awp.status')}</th>
|
||||
<th className="py-1.5 font-medium">{t('awp.bands')}</th>
|
||||
</tr>
|
||||
|
||||
@@ -3,6 +3,8 @@ import { Minus, Plus, Crosshair, X, PanelLeft, PanelRight } from 'lucide-react';
|
||||
import { cn } from '@/lib/utils';
|
||||
import { useI18n } from '@/lib/i18n';
|
||||
import { spotStatusKey, inferSpotMode, spotModeCategory } from '@/lib/spot';
|
||||
import { SPOT_MARKERS, activeMarkers } from '@/lib/spotMarkers';
|
||||
import { applySpotDisplay, readSpotDisplayOptions } from '@/lib/spotDisplay';
|
||||
|
||||
// BandMap — vertical spectrum panel inspired by Log4OM.
|
||||
// - Full band is always visible; zoom changes pixels-per-kHz, scroll
|
||||
@@ -24,7 +26,43 @@ interface Spot {
|
||||
spotter?: string;
|
||||
}
|
||||
|
||||
type SpotStatusEntry = { status: string; country?: string };
|
||||
// The FULL status entry, not the two fields the map used to declare. The extra
|
||||
// markers were already arriving in this object — the local type simply never
|
||||
// mentioned them, so they could not be drawn.
|
||||
type SpotStatusEntry = {
|
||||
status?: string;
|
||||
country?: string;
|
||||
worked_call?: boolean;
|
||||
// worked_slot: this exact callsign already worked on THIS band and mode.
|
||||
worked_slot?: boolean;
|
||||
new_county?: boolean;
|
||||
new_pota?: boolean;
|
||||
new_pfx?: boolean;
|
||||
};
|
||||
|
||||
// The extra markers are ORTHOGONAL to the entity status: a spot can be a worked
|
||||
// entity AND a new park. The cluster list stacks them as separate badges instead
|
||||
// of letting one replace another, so the map stacks them too — as segments of
|
||||
// the pill's left accent bar, which until now only repeated the pill's own
|
||||
// colour and carried no information of its own.
|
||||
//
|
||||
// Their colours come from lib/spotMarkers, shared with the cluster list: the
|
||||
// same fact must not be violet in one panel and green in the next.
|
||||
// The map shows three of the five. A new PREFIX and a new GRID are left to the
|
||||
// cluster list, which has the width to name them: the
|
||||
// pill is 22 px tall, and a fourth segment turns the strip into a colour code
|
||||
// nobody can read at a glance. Add it here the day the strip earns more room.
|
||||
const BMP_MARKERS = SPOT_MARKERS.filter((m) => m.key !== 'new_pfx' && m.key !== 'new_grid');
|
||||
const markersFor = (e: SpotStatusEntry | undefined) =>
|
||||
activeMarkers(e).filter((m) => m.key !== 'new_pfx' && m.key !== 'new_grid');
|
||||
|
||||
// The legend spells the markers out; the cluster list's badges are abbreviated
|
||||
// ("NEW CTY") because they sit in a narrow cell, and there is room here.
|
||||
const BMP_MARKER_LABEL: Record<string, string> = {
|
||||
new_pota: 'bmp.legendNewPota',
|
||||
new_county: 'bmp.legendNewCounty',
|
||||
worked_call: 'bmp.legendWorkedCall',
|
||||
};
|
||||
|
||||
interface Props {
|
||||
band: string;
|
||||
@@ -116,12 +154,26 @@ function statusLabel(s: string, t: (k: string) => string): string {
|
||||
switch (s) {
|
||||
case 'new': return t('bmp.statusNew');
|
||||
case 'new-band': return t('bmp.statusNewBand');
|
||||
case 'new-mode': return t('bmp.statusNewMode');
|
||||
case 'new-slot': return t('bmp.statusNewSlot');
|
||||
case 'new-call': return t('bmp.statusNewCall');
|
||||
case 'worked': return t('bmp.statusWorked');
|
||||
// An empty status means the entity could not be resolved. Nothing else
|
||||
// empties it: the mute option leaves the status alone and takes only the
|
||||
// already-worked-callsign mark.
|
||||
default: return t('bmp.statusUnresolved');
|
||||
}
|
||||
}
|
||||
|
||||
// QUIET: no status colour at all. The pill keeps the card background and the
|
||||
// accent drops to a plain border grey, so the spot is present but says nothing.
|
||||
const QUIET_STYLE = {
|
||||
pill: 'bg-card text-muted-foreground border-border/60 hover:bg-muted/50',
|
||||
bar: 'bg-muted-foreground/30',
|
||||
line: 'stroke-border',
|
||||
dot: 'fill-border',
|
||||
};
|
||||
|
||||
function statusStyle(s: string): { pill: string; bar: string; line: string; dot: string } {
|
||||
// pill = full pill background+text+border
|
||||
// bar = thick left accent inside the pill
|
||||
@@ -140,18 +192,14 @@ function statusStyle(s: string): { pill: string; bar: string; line: string; dot:
|
||||
line: 'stroke-warning',
|
||||
dot: 'fill-warning',
|
||||
};
|
||||
case 'new-call':
|
||||
case 'new-slot': return {
|
||||
pill: 'bg-caution-muted text-caution-muted-foreground border-caution-border hover:bg-caution-muted',
|
||||
bar: 'bg-caution',
|
||||
line: 'stroke-caution',
|
||||
dot: 'fill-caution',
|
||||
};
|
||||
case 'worked': return {
|
||||
pill: 'bg-card text-muted-foreground border-border/60 hover:bg-muted/50',
|
||||
bar: 'bg-muted-foreground/30',
|
||||
line: 'stroke-border',
|
||||
dot: 'fill-border',
|
||||
};
|
||||
case 'worked': return QUIET_STYLE;
|
||||
default: return {
|
||||
pill: 'bg-card text-foreground border-border hover:bg-accent/40',
|
||||
bar: 'bg-primary/60',
|
||||
@@ -179,8 +227,24 @@ const BOT_PAD = 14; // the top-most freq label isn't clipped at y=0
|
||||
// last; ties broken by closeness to the rig freq).
|
||||
const MAX_VISIBLE_SPOTS = 30;
|
||||
|
||||
export function BandMap({ band, spots, spotStatus, currentFreqHz, onSpotClick, onClose, side = 'right', onToggleSide, hideDigital = false, fitToBand = false, keyNav = false }: Props) {
|
||||
export function BandMap({ band, spots, spotStatus: spotStatusRaw, currentFreqHz, onSpotClick, onClose, side = 'right', onToggleSide, hideDigital = false, fitToBand = false, keyNav = false }: Props) {
|
||||
const { t } = useI18n();
|
||||
|
||||
// The two display options are applied ONCE here, on the whole map, so the
|
||||
// leader lines, the dots, the pills and the badges can never disagree — and so
|
||||
// the map and the cluster list share the single rule set in lib/spotDisplay.
|
||||
// Re-derived whenever the poll delivers a new status map, which is also when a
|
||||
// just-changed option takes effect.
|
||||
// Read at render time, not inside the memo: the options must be part of the
|
||||
// dependencies. Keyed only on spotStatusRaw, toggling an option changed
|
||||
// nothing until the next poll happened to hand over a fresh object.
|
||||
const dispOpts = readSpotDisplayOptions();
|
||||
const spotStatus = useMemo(() => {
|
||||
if (!dispOpts.muteWorked && !dispOpts.slotHighlight) return spotStatusRaw;
|
||||
const out: Record<string, SpotStatusEntry> = {};
|
||||
for (const k of Object.keys(spotStatusRaw)) out[k] = applySpotDisplay(spotStatusRaw[k], dispOpts) as SpotStatusEntry;
|
||||
return out;
|
||||
}, [spotStatusRaw, dispOpts.muteWorked, dispOpts.slotHighlight]);
|
||||
const range = BAND_RANGES[band];
|
||||
const segments = SEGMENT_COLORS[band] ?? [];
|
||||
const [zoomIdx, setZoomIdx] = useState(2); // default 32 px/kHz
|
||||
@@ -248,6 +312,7 @@ export function BandMap({ band, spots, spotStatus, currentFreqHz, onSpotClick, o
|
||||
case 'new': return 0;
|
||||
case 'new-band': return 1;
|
||||
case 'new-slot': return 2;
|
||||
case 'new-call': return 2;
|
||||
case 'worked': return 4;
|
||||
default: return 3;
|
||||
}
|
||||
@@ -358,6 +423,43 @@ export function BandMap({ band, spots, spotStatus, currentFreqHz, onSpotClick, o
|
||||
return () => el.removeEventListener('wheel', onWheel);
|
||||
}, [range]);
|
||||
|
||||
// Ctrl+↑ / Ctrl+↓ hop to the next spot above / below the rig frequency and tune
|
||||
// to it. Higher freq is UP on the map (see freqToY), so ↑ = next higher spot.
|
||||
// Only active on the docked Main-view map (keyNav) and ignored while typing.
|
||||
// MUST stay ABOVE the `if (!range)` early return below: on an unknown band
|
||||
// (e.g. a spurious 33 cm CAT reading from an Icom) that return skipped this
|
||||
// hook, so the hook count changed between renders and React crashed with #300
|
||||
// ("rendered fewer hooks than expected"). lo/hi are always defined (they fall
|
||||
// back to [0,1] when there's no range), so it's safe to run here.
|
||||
useEffect(() => {
|
||||
if (!keyNav) return;
|
||||
const onKey = (e: KeyboardEvent) => {
|
||||
if (!e.ctrlKey || e.altKey || e.metaKey) return;
|
||||
if (e.key !== 'ArrowUp' && e.key !== 'ArrowDown') return;
|
||||
const ae = document.activeElement as HTMLElement | null;
|
||||
const tag = (ae?.tagName || '').toLowerCase();
|
||||
if (tag === 'input' || tag === 'textarea' || tag === 'select' || ae?.isContentEditable) return;
|
||||
const list = spots
|
||||
.filter((s) => (s.band ?? '') === band && s.freq_hz > 0)
|
||||
.slice()
|
||||
.sort((a, b) => a.freq_hz - b.freq_hz);
|
||||
if (!list.length) return;
|
||||
const cur = currentFreqHz || (lo + hi) * 500; // mid-band kHz→Hz when no rig freq
|
||||
const EPS = 50; // Hz, so we don't re-pick the spot we're already sitting on
|
||||
let target: Spot | undefined;
|
||||
if (e.key === 'ArrowUp') {
|
||||
target = list.find((s) => s.freq_hz > cur + EPS);
|
||||
} else {
|
||||
for (let i = list.length - 1; i >= 0; i--) { if (list[i].freq_hz < cur - EPS) { target = list[i]; break; } }
|
||||
}
|
||||
if (!target) return;
|
||||
e.preventDefault();
|
||||
onSpotClick(target);
|
||||
};
|
||||
window.addEventListener('keydown', onKey);
|
||||
return () => window.removeEventListener('keydown', onKey);
|
||||
}, [keyNav, spots, band, currentFreqHz, lo, hi, onSpotClick]);
|
||||
|
||||
if (!range) {
|
||||
return (
|
||||
<div className="h-full w-full flex flex-col items-center justify-center text-xs text-muted-foreground p-3 bg-muted/20">
|
||||
@@ -388,38 +490,6 @@ export function BandMap({ band, spots, spotStatus, currentFreqHz, onSpotClick, o
|
||||
scrollerRef.current.scrollTop = Math.max(0, y - containerH / 2);
|
||||
}
|
||||
|
||||
// Ctrl+↑ / Ctrl+↓ hop to the next spot above / below the rig frequency and tune
|
||||
// to it. Higher freq is UP on the map (see freqToY), so ↑ = next higher spot.
|
||||
// Only active on the docked Main-view map (keyNav) and ignored while typing.
|
||||
useEffect(() => {
|
||||
if (!keyNav) return;
|
||||
const onKey = (e: KeyboardEvent) => {
|
||||
if (!e.ctrlKey || e.altKey || e.metaKey) return;
|
||||
if (e.key !== 'ArrowUp' && e.key !== 'ArrowDown') return;
|
||||
const ae = document.activeElement as HTMLElement | null;
|
||||
const tag = (ae?.tagName || '').toLowerCase();
|
||||
if (tag === 'input' || tag === 'textarea' || tag === 'select' || ae?.isContentEditable) return;
|
||||
const list = spots
|
||||
.filter((s) => (s.band ?? '') === band && s.freq_hz > 0)
|
||||
.slice()
|
||||
.sort((a, b) => a.freq_hz - b.freq_hz);
|
||||
if (!list.length) return;
|
||||
const cur = currentFreqHz || (lo + hi) * 500; // mid-band kHz→Hz when no rig freq
|
||||
const EPS = 50; // Hz, so we don't re-pick the spot we're already sitting on
|
||||
let target: Spot | undefined;
|
||||
if (e.key === 'ArrowUp') {
|
||||
target = list.find((s) => s.freq_hz > cur + EPS);
|
||||
} else {
|
||||
for (let i = list.length - 1; i >= 0; i--) { if (list[i].freq_hz < cur - EPS) { target = list[i]; break; } }
|
||||
}
|
||||
if (!target) return;
|
||||
e.preventDefault();
|
||||
onSpotClick(target);
|
||||
};
|
||||
window.addEventListener('keydown', onKey);
|
||||
return () => window.removeEventListener('keydown', onKey);
|
||||
}, [keyNav, spots, band, currentFreqHz, lo, hi, onSpotClick]);
|
||||
|
||||
const currentKHz = currentFreqHz ? currentFreqHz / 1000 : 0;
|
||||
const showRigPointer = currentKHz >= lo && currentKHz <= hi;
|
||||
const rigY = freqToY(currentKHz);
|
||||
@@ -562,10 +632,21 @@ export function BandMap({ band, spots, spotStatus, currentFreqHz, onSpotClick, o
|
||||
'hover:translate-x-0.5 hover:shadow',
|
||||
style.pill,
|
||||
)}
|
||||
title={`${p.spot.dx_call}${entry?.country ? ' · ' + entry.country : ''} · ${p.spot.freq_khz.toFixed(1)} kHz · ${statusLabel(st, t)}${p.spot.comment ? ' · ' + p.spot.comment : ''}${p.spot.spotter ? ' · de ' + p.spot.spotter : ''}`}
|
||||
title={`${p.spot.dx_call}${entry?.country ? ' · ' + entry.country : ''} · ${p.spot.freq_khz.toFixed(1)} kHz · ${statusLabel(st, t)}${markersFor(entry).map((m) => ' · ' + t(BMP_MARKER_LABEL[m.key])).join('')}${p.spot.comment ? ' · ' + p.spot.comment : ''}${p.spot.spotter ? ' · de ' + p.spot.spotter : ''}`}
|
||||
>
|
||||
{/* Status accent strip on the left */}
|
||||
<span className={cn('w-1 shrink-0', style.bar)} aria-hidden />
|
||||
{/* Left accent strip. With no extra marker it repeats the status
|
||||
colour, exactly as before; otherwise it splits into one
|
||||
segment per marker, so "worked entity + new park" shows both
|
||||
instead of one hiding the other. */}
|
||||
{(() => {
|
||||
const marks = markersFor(entry);
|
||||
if (marks.length === 0) return <span className={cn('w-1 shrink-0', style.bar)} aria-hidden />;
|
||||
return (
|
||||
<span className="w-1 shrink-0 flex flex-col" aria-hidden>
|
||||
{marks.map((m) => <span key={m.key} className="flex-1" style={{ background: m.colour }} />)}
|
||||
</span>
|
||||
);
|
||||
})()}
|
||||
<span className="flex items-center gap-1.5 px-2 font-mono text-[11px] font-bold leading-none">
|
||||
<span>{p.spot.dx_call}</span>
|
||||
{mode && (
|
||||
@@ -585,6 +666,11 @@ export function BandMap({ band, spots, spotStatus, currentFreqHz, onSpotClick, o
|
||||
<LegendDot cls="bg-warning" label={t('bmp.legendNewBand')} />
|
||||
<LegendDot cls="bg-caution" label={t('bmp.legendNewSlot')} />
|
||||
<LegendDot cls="bg-muted-foreground/30" label={t("bmp.legendWorked")} />
|
||||
{/* The stacked markers, straight from the shared table so the legend
|
||||
cannot drift from what the pills actually draw. */}
|
||||
{BMP_MARKERS.map((m) => (
|
||||
<LegendDot key={m.key} colour={m.colour} label={t(BMP_MARKER_LABEL[m.key])} />
|
||||
))}
|
||||
{/* Sub-band shading, so the wash behind the pills is never colour-alone. */}
|
||||
<span className="mx-0.5 opacity-40">|</span>
|
||||
<LegendDot colour={SEG_CW} label={t("bmp.legendCW")} />
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
import { useMemo } from 'react';
|
||||
import { Star, Radio, Sunrise, Sunset } from 'lucide-react';
|
||||
import { useEffect, useMemo, useState } from 'react';
|
||||
import { Star, Radio, Sunrise, Sunset, X, Loader2 } from 'lucide-react';
|
||||
import { Badge } from '@/components/ui/badge';
|
||||
import { cn } from '@/lib/utils';
|
||||
import { sunTimes } from '@/lib/sun';
|
||||
import { BandSlotQSOs } from '../../wailsjs/go/main/App';
|
||||
import type { WorkedBeforeView } from '@/types';
|
||||
|
||||
type WorkedBefore = WorkedBeforeView;
|
||||
@@ -18,6 +19,12 @@ interface Props {
|
||||
// to an entity with no position at all, and the block simply does not appear.
|
||||
lat?: number;
|
||||
lon?: number;
|
||||
// Set when the matrix is showing a QSO picked in the log grid rather than the
|
||||
// entry form — labelled so the two can never be confused.
|
||||
forCall?: string;
|
||||
// Open the QSO editor for a contact — makes callsigns in the cell drill-down
|
||||
// clickable. Threaded down from App.openEdit.
|
||||
onEditQso?: (id: number) => void;
|
||||
}
|
||||
|
||||
// Compact column label for a band tag: keep the classic V/U for 2m/70cm,
|
||||
@@ -89,7 +96,9 @@ function cellTitle(band: string, cls: string, status: string, current: boolean):
|
||||
return `${band} ${cls}: ${desc}${current ? ' — current entry' : ''}`;
|
||||
}
|
||||
|
||||
export function BandSlotGrid({ wb, busy, currentBand, currentMode, bands, hasCall = true, lat, lon }: Props) {
|
||||
export function BandSlotGrid({ wb, busy, currentBand, currentMode, bands, hasCall = true, lat, lon, forCall, onEditQso }: Props) {
|
||||
// Cell drill-down: which band+class the operator clicked, or null.
|
||||
const [slot, setSlot] = useState<{ band: string; cls: string } | null>(null);
|
||||
// Columns from the operator's configured bands (so the matrix shows only the
|
||||
// bands they actually use), falling back to the built-in default set.
|
||||
const cols = useMemo(
|
||||
@@ -208,6 +217,14 @@ export function BandSlotGrid({ wb, busy, currentBand, currentMode, bands, hasCal
|
||||
</>
|
||||
) : hasDxcc ? (
|
||||
<>
|
||||
{/* Says WHOSE stats these are when they come from a row picked in
|
||||
the log rather than from what's being typed. */}
|
||||
{forCall && (
|
||||
<Badge variant="outline" className="px-2 py-0.5 text-[10px] font-mono shrink-0"
|
||||
title="Stats for the QSO selected in the log">
|
||||
{forCall}
|
||||
</Badge>
|
||||
)}
|
||||
<Badge className="bg-primary text-primary-foreground px-3 py-1 text-xs normal-case font-semibold tracking-normal">
|
||||
{dxccName || `DXCC #${dxcc}`}
|
||||
</Badge>
|
||||
@@ -282,10 +299,14 @@ export function BandSlotGrid({ wb, busy, currentBand, currentMode, bands, hasCal
|
||||
return (
|
||||
<td
|
||||
key={b.tag}
|
||||
title={cellTitle(b.tag, cls, st, isCurrent)}
|
||||
title={cellTitle(b.tag, cls, st, isCurrent) + (st ? ' — click to list the QSOs' : '')}
|
||||
onClick={st ? () => setSlot({ band: b.tag, cls }) : undefined}
|
||||
className={cn(
|
||||
'w-[28px] h-[24px] rounded transition-colors p-0',
|
||||
st ? STATUS_CLASSES[st] : 'bg-mx-none',
|
||||
// Only a filled cell has anything to show — an empty one
|
||||
// stays inert rather than opening a "no QSOs" dialog.
|
||||
st && 'cursor-pointer hover:brightness-110',
|
||||
isCurrent && 'ring-2 ring-warning ring-inset',
|
||||
)}
|
||||
/>
|
||||
@@ -313,6 +334,119 @@ export function BandSlotGrid({ wb, busy, currentBand, currentMode, bands, hasCal
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{slot && (
|
||||
<SlotQSOModal
|
||||
call={wb?.callsign ?? ''}
|
||||
dxcc={dxcc}
|
||||
entity={dxccName}
|
||||
band={slot.band}
|
||||
cls={slot.cls}
|
||||
onClose={() => setSlot(null)}
|
||||
onEdit={onEditQso}
|
||||
/>
|
||||
)}
|
||||
</section>
|
||||
);
|
||||
}
|
||||
|
||||
// ── Cell drill-down ──────────────────────────────────────────────────────────
|
||||
// The contacts behind one band+class cell: this exact callsign AND anyone else
|
||||
// in the entity, because that is the pair of facts the cell's colour encodes.
|
||||
// The call's own QSOs are marked so the two never blur together.
|
||||
|
||||
function SlotQSOModal({ call, dxcc, entity, band, cls, onClose, onEdit }: {
|
||||
call: string; dxcc: number; entity: string; band: string; cls: string; onClose: () => void; onEdit?: (id: number) => void;
|
||||
}) {
|
||||
const [rows, setRows] = useState<any[] | null>(null);
|
||||
const [err, setErr] = useState('');
|
||||
|
||||
useEffect(() => {
|
||||
let dead = false;
|
||||
BandSlotQSOs(call, dxcc, band, cls)
|
||||
.then((r: any) => { if (!dead) setRows((r ?? []) as any[]); })
|
||||
.catch((e: any) => { if (!dead) { setErr(String(e?.message ?? e)); setRows([]); } });
|
||||
return () => { dead = true; };
|
||||
}, [call, dxcc, band, cls]);
|
||||
|
||||
useEffect(() => {
|
||||
// Capture phase: the app's global ESC handler resets the entry form, and
|
||||
// closing a dialog must not also wipe what the operator was typing.
|
||||
function onKey(e: KeyboardEvent) {
|
||||
if (e.key === 'Escape') { e.stopImmediatePropagation(); e.preventDefault(); onClose(); }
|
||||
}
|
||||
window.addEventListener('keydown', onKey, true);
|
||||
return () => window.removeEventListener('keydown', onKey, true);
|
||||
}, [onClose]);
|
||||
|
||||
return (
|
||||
<div className="fixed inset-0 z-50 flex items-center justify-center bg-black/60 backdrop-blur-[2px] p-4" onClick={onClose}>
|
||||
<div className="bg-card border border-border rounded-xl shadow-2xl w-[760px] max-w-full max-h-[72vh] flex flex-col overflow-hidden ring-1 ring-black/5"
|
||||
onClick={(e) => e.stopPropagation()}>
|
||||
<div className="flex items-center gap-2.5 px-4 py-2.5 border-b border-border bg-muted/30">
|
||||
<span className="inline-flex items-center justify-center h-6 min-w-6 px-1.5 rounded-md bg-primary/15 text-primary text-[11px] font-bold shrink-0 tabular-nums">{band}</span>
|
||||
<div className="min-w-0">
|
||||
<div className="font-semibold text-sm leading-tight truncate">
|
||||
{cls}{entity && <span className="text-muted-foreground font-normal"> · {entity}</span>}
|
||||
</div>
|
||||
{onEdit && <div className="text-[10px] text-muted-foreground leading-tight">Click a callsign to edit the QSO</div>}
|
||||
</div>
|
||||
<span className="ml-auto text-xs text-muted-foreground tabular-nums shrink-0">{rows ? `${rows.length} QSO${rows.length > 1 ? 's' : ''}` : ''}</span>
|
||||
<button type="button" onClick={onClose} className="text-muted-foreground hover:text-foreground shrink-0 rounded p-0.5 hover:bg-muted transition-colors">
|
||||
<X className="size-4" />
|
||||
</button>
|
||||
</div>
|
||||
<div className="flex-1 overflow-auto">
|
||||
{err && <p className="p-3 text-xs text-destructive">{err}</p>}
|
||||
{!rows ? (
|
||||
<p className="p-4 text-xs text-muted-foreground flex items-center gap-2">
|
||||
<Loader2 className="size-3.5 animate-spin" /> Loading…
|
||||
</p>
|
||||
) : rows.length === 0 ? (
|
||||
<p className="p-4 text-xs text-muted-foreground italic">No QSOs.</p>
|
||||
) : (
|
||||
<table className="w-full text-xs border-collapse">
|
||||
<thead className="sticky top-0 z-10 bg-muted/80 backdrop-blur text-[10px] uppercase tracking-wider text-muted-foreground">
|
||||
<tr>
|
||||
<th className="text-left font-medium px-3 py-1.5">Date UTC</th>
|
||||
<th className="text-left font-medium px-3 py-1.5">Callsign</th>
|
||||
<th className="text-left font-medium px-3 py-1.5">Mode</th>
|
||||
<th className="text-left font-medium px-3 py-1.5">Freq</th>
|
||||
<th className="text-left font-medium px-3 py-1.5">Name</th>
|
||||
<th className="text-center font-medium px-3 py-1.5">Cfm</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{rows.map((q, i) => {
|
||||
const cfm = q.lotw_rcvd === 'Y' || q.eqsl_rcvd === 'Y' || q.qsl_rcvd === 'Y';
|
||||
const mine = q.callsign === call;
|
||||
return (
|
||||
<tr key={q.id ?? i} className="border-t border-border/40 even:bg-muted/[0.06] hover:bg-primary/[0.06] transition-colors">
|
||||
<td className="px-3 py-1.5 tabular-nums text-muted-foreground whitespace-nowrap">
|
||||
{String(q.qso_date ?? '').slice(0, 16).replace('T', ' ')}
|
||||
</td>
|
||||
<td className="px-3 py-1.5">
|
||||
{onEdit ? (
|
||||
<button type="button" onClick={() => { onEdit(q.id as number); onClose(); }} title="Edit this QSO"
|
||||
className={cn('font-mono cursor-pointer text-left hover:underline underline-offset-2', mine ? 'font-bold text-primary' : 'text-foreground hover:text-primary')}>
|
||||
{q.callsign}
|
||||
</button>
|
||||
) : (
|
||||
<span className={cn('font-mono', mine && 'font-bold text-primary')}>{q.callsign}</span>
|
||||
)}
|
||||
</td>
|
||||
<td className="px-3 py-1.5">{q.mode}</td>
|
||||
<td className="px-3 py-1.5 tabular-nums text-muted-foreground">{q.freq_hz ? (q.freq_hz / 1e6).toFixed(3) : ''}</td>
|
||||
<td className="px-3 py-1.5 text-muted-foreground truncate max-w-[180px]">{q.name}</td>
|
||||
<td className="px-3 py-1.5 text-center">{cfm ? <span className="text-success">✓</span> : <span className="text-muted-foreground/30">·</span>}</td>
|
||||
</tr>
|
||||
);
|
||||
})}
|
||||
</tbody>
|
||||
</table>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -12,6 +12,8 @@ import {
|
||||
import { Button } from '@/components/ui/button';
|
||||
import { Checkbox } from '@/components/ui/checkbox';
|
||||
import { cleanSpotter, inferSpotMode, spotStatusKey } from '@/lib/spot';
|
||||
import { markerColour } from '@/lib/spotMarkers';
|
||||
import { applySpotDisplay, readSpotDisplayOptions } from '@/lib/spotDisplay';
|
||||
import { loadLocal, loadRemote, saveState, seedLocal, whenGridPrefsReady } from '@/lib/gridPrefs';
|
||||
import { useI18n } from '@/lib/i18n';
|
||||
|
||||
@@ -51,10 +53,22 @@ export type SpotStatusEntry = {
|
||||
country?: string;
|
||||
continent?: string;
|
||||
worked_call?: boolean;
|
||||
// worked_slot: this exact callsign already worked on THIS band and mode.
|
||||
// Always slot-scoped, unlike worked_call which follows the "same slot" option.
|
||||
worked_slot?: boolean;
|
||||
new_county?: boolean;
|
||||
// The resolved US county and state, so the grid can SHOW them and not merely
|
||||
// flag them. Filled from the offline ULS store, US callsigns only.
|
||||
county?: string;
|
||||
state?: string;
|
||||
new_pota?: boolean;
|
||||
new_pfx?: boolean;
|
||||
pfx?: string;
|
||||
// lotw: the DX uploads to LoTW, per ARRL user list. Inert until downloaded.
|
||||
lotw?: boolean;
|
||||
spotter_continent?: string;
|
||||
grid?: string;
|
||||
new_grid?: boolean;
|
||||
};
|
||||
|
||||
type Props = {
|
||||
@@ -96,26 +110,54 @@ type ColEntry = ColDef<ClusterSpot> & { group: string; label: string; defaultVis
|
||||
// statusFor resolves the precomputed spot status (new / new-band / new-slot /
|
||||
// worked-call) for an ag-Grid cell's row.
|
||||
function statusFor(p: any): SpotStatusEntry | undefined {
|
||||
return p?.context?.spotStatus?.[
|
||||
const s = p?.context?.spotStatus?.[
|
||||
spotStatusKey(p.data?.dx_call, p.data?.band ?? '', p.data?.comment ?? '', p.data?.freq_hz)
|
||||
];
|
||||
// One chokepoint: the colour, the badges and the Status text all read through
|
||||
// here, so the two display options are applied once rather than in each
|
||||
// renderer — and the band map applies the very same function.
|
||||
return applySpotDisplay(s, readSpotDisplayOptions());
|
||||
}
|
||||
|
||||
// Spot status is shown by COLOURING THE TEXT, never by a pill or a badge.
|
||||
// Spot status is shown on the CELL that carries the fact — filled background for
|
||||
// a novelty, tinted text otherwise — never by a pill or a badge.
|
||||
//
|
||||
// The pills were dropped: a rounded box has its own height and padding, so it
|
||||
// sat off the row's baseline and the callsign inside it no longer lined up with
|
||||
// the plain callsigns above and below. A whole column of them read as chrome
|
||||
// rather than as data. Same reasoning — and the same semantic tokens — as the
|
||||
// Y/N/R QSL columns in lib/qslStatus.ts.
|
||||
// The pills were dropped and stay dropped: a rounded box has its own height and
|
||||
// padding, so it sat off the row's baseline and the callsign inside it no longer
|
||||
// lined up with the plain callsigns above and below. A whole column of them read
|
||||
// as chrome rather than as data. Same reasoning — and the same semantic tokens —
|
||||
// as the Y/N/R QSL columns in lib/qslStatus.ts.
|
||||
//
|
||||
// Which cell is coloured IS the message, so one colour is enough for all three:
|
||||
// Which cell is marked IS the message:
|
||||
//
|
||||
// yellow call → new DXCC yellow band → new band yellow mode → new mode
|
||||
// blue call → already worked
|
||||
// filled call → new DXCC filled band → new band filled mode → new mode
|
||||
// filled pfx → new prefix filled POTA → new park filled county → new county
|
||||
// blue call → already worked (not a novelty, so text only)
|
||||
const NEW = 'var(--warning)'; // yellow: something here is new
|
||||
const WKD = 'var(--info)'; // blue: this callsign is already in the log
|
||||
|
||||
// FILLING the cell that carries the fact, rather than only tinting its text.
|
||||
//
|
||||
// This is not a return to the pills that were dropped. A pill is a box INSIDE
|
||||
// the cell: it has its own height and padding, so it sat off the row baseline
|
||||
// and the callsign inside it stopped lining up with the plain callsigns above
|
||||
// and below. A cell background has no geometry of its own — the text does not
|
||||
// move by a single pixel — and it reads from across the room, which a tinted
|
||||
// glyph does not.
|
||||
//
|
||||
// Which cell is filled is still the whole message: filled Band means new band,
|
||||
// filled Pfx means new prefix, filled County means new county.
|
||||
//
|
||||
// The colours come from the same places they already came from — the semantic
|
||||
// status tokens and lib/spotMarkers — so a fact keeps one colour across the
|
||||
// grid, the band map and the filter chips. 22 % is the wash that survived both
|
||||
// themes: enough to see at a glance, not enough to fight the text on it.
|
||||
const fillStyle = (colour: string) => ({
|
||||
background: `color-mix(in srgb, ${colour} 22%, transparent)`,
|
||||
color: colour,
|
||||
fontWeight: 700,
|
||||
});
|
||||
|
||||
// cellText renders a cell value in an optional colour. An empty value keeps the
|
||||
// muted dash the grid used before, so blank cells still read as "nothing here"
|
||||
// rather than as a gap.
|
||||
@@ -134,12 +176,26 @@ function statusColor(s: SpotStatusEntry | undefined): string | null {
|
||||
case 'new-band':
|
||||
case 'new-mode':
|
||||
case 'new-slot':
|
||||
case 'new-call':
|
||||
return NEW;
|
||||
default:
|
||||
return s?.worked_call ? WKD : null;
|
||||
}
|
||||
}
|
||||
|
||||
// isDull reports a spot that "represents nothing" under the current worked/slot
|
||||
// rules: the entity/band/mode is already worked (status resolved, not new in any
|
||||
// dimension), the callsign itself isn't in the log, and there's no POTA / county
|
||||
// / prefix novelty. Such rows are dimmed so the eye skips them. Because the
|
||||
// status obeys the DX-cluster "same slot" option and the digital-mode grouping,
|
||||
// what counts as dull follows those settings automatically. Unresolved statuses
|
||||
// (still loading, or entity unknown) are NOT dimmed — that would flicker.
|
||||
function isDull(s: SpotStatusEntry | undefined): boolean {
|
||||
if (!s || !s.status) return false;
|
||||
if (s.status === 'new' || s.status === 'new-band' || s.status === 'new-mode' || s.status === 'new-slot' || s.status === 'new-call') return false;
|
||||
return !(s.worked_call || s.new_pota || s.new_county || s.new_pfx || s.new_grid);
|
||||
}
|
||||
|
||||
const makeColCatalog = (t: TFn): ColEntry[] => [
|
||||
{
|
||||
group: 'Spot', label: t('clg2.c.time'), colId: 'time',
|
||||
@@ -163,12 +219,27 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
|
||||
headerName: t('clg2.c.call'), field: 'dx_call' as any, width: 120,
|
||||
defaultVisible: true,
|
||||
cellClass: 'font-mono',
|
||||
// NEW DXCC → yellow call. Already worked → blue call. Anything else keeps
|
||||
// the theme's normal ink so ordinary callsigns don't shout.
|
||||
// NEW DXCC fills the call cell. Already worked only tints the text blue:
|
||||
// 'worked' is not a novelty, and filling it would wash most of the rows.
|
||||
cellStyle: (p: any) => (statusFor(p)?.status === 'new' ? fillStyle('var(--danger)') : null) as any,
|
||||
cellRenderer: (p: any) => {
|
||||
const s = statusFor(p);
|
||||
const color = s?.status === 'new' ? NEW : s?.worked_call ? WKD : null;
|
||||
return <span style={{ color: color ?? undefined, fontWeight: 700 }}>{p.value ?? ''}</span>;
|
||||
const color = s?.status === 'new' ? null : s?.worked_call ? WKD : null;
|
||||
return (
|
||||
<span style={{ color: color ?? undefined, fontWeight: 700 }}>
|
||||
{p.value ?? ''}
|
||||
{/* A single letter rather than a word: the column is 120 px and holds a
|
||||
callsign. It stays the muted-blue of a confirmation, never a status
|
||||
colour — whether a station uploads to LoTW says nothing about
|
||||
whether the spot is worth chasing. */}
|
||||
{s?.lotw ? (
|
||||
<span title={t('clu.lotwBadge')} style={{
|
||||
marginLeft: 4, padding: '0 3px', borderRadius: 3, fontSize: 9, verticalAlign: 'middle',
|
||||
background: 'color-mix(in srgb, var(--info) 22%, transparent)', color: 'var(--info)',
|
||||
}}>L</span>
|
||||
) : null}
|
||||
</span>
|
||||
);
|
||||
},
|
||||
tooltipValueGetter: (p: any) => {
|
||||
const s = statusFor(p);
|
||||
@@ -190,10 +261,12 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
|
||||
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-slot') parts.push(t('clg2.newSlot'));
|
||||
else if (s?.status === 'new-call') parts.push(t('clg2.newCall'));
|
||||
else if (s?.worked_call) parts.push(t('clg2.wkdCall'));
|
||||
if (s?.new_county) parts.push(t('clg2.newCounty'));
|
||||
if (s?.new_pota) parts.push(t('clg2.newPota'));
|
||||
if (s?.new_pfx) parts.push(t('clg2.newPfx'));
|
||||
if (s?.new_grid) parts.push(t('clg2.newGrid'));
|
||||
return parts.join(' ');
|
||||
},
|
||||
cellRenderer: (p: any) => {
|
||||
@@ -205,12 +278,16 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
|
||||
: s?.status === 'new-band' ? t('clg2.newBand')
|
||||
: s?.status === 'new-mode' ? t('clg2.newMode')
|
||||
: s?.status === 'new-slot' ? t('clg2.newSlot')
|
||||
: s?.status === 'new-call' ? t('clg2.newCall')
|
||||
: t('clg2.wkdCall');
|
||||
parts.push({ text: label, color: main });
|
||||
}
|
||||
if (s?.new_county) parts.push({ text: t('clg2.newCounty'), color: 'var(--success)' });
|
||||
if (s?.new_pota) parts.push({ text: t('clg2.newPota'), color: 'var(--success)' });
|
||||
if (s?.new_pfx) parts.push({ text: t('clg2.newPfx'), color: 'var(--caution)' });
|
||||
// Colours from lib/spotMarkers — shared with the band map so a marker is
|
||||
// never one colour here and another there.
|
||||
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_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') });
|
||||
if (parts.length === 0) return <span style={{ color: 'var(--muted-foreground)', fontSize: 10 }}>—</span>;
|
||||
return (
|
||||
<span style={{ whiteSpace: 'nowrap' }}>
|
||||
@@ -227,6 +304,7 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
|
||||
if (s?.status === 'new') return t('clg2.tipNewDxcc', { country: s?.country ?? '' });
|
||||
if (s?.status === 'new-band') return t('clg2.tipNewBand');
|
||||
if (s?.status === 'new-slot') return t('clg2.tipNewSlotBand');
|
||||
if (s?.status === 'new-call') return t('clg2.tipNewCall');
|
||||
if (s?.worked_call) return t('clg2.tipWorkedCall');
|
||||
return undefined;
|
||||
},
|
||||
@@ -235,7 +313,9 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
|
||||
group: 'Spot', label: t('clg2.c.pota'), colId: 'pota',
|
||||
headerName: t('clg2.c.pota'), field: 'pota_ref' as any, width: 92, cellClass: 'font-mono',
|
||||
defaultVisible: true,
|
||||
cellStyle: { color: 'var(--success)' },
|
||||
cellStyle: (p: any) => (statusFor(p)?.new_pota
|
||||
? fillStyle(markerColour('new_pota'))
|
||||
: { color: 'var(--success)' }) as any,
|
||||
tooltipValueGetter: (p: any) => (p.data?.pota_name ? t('clg2.tipPota', { name: p.data.pota_name }) : undefined),
|
||||
},
|
||||
{
|
||||
@@ -250,8 +330,9 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
|
||||
headerName: t('clg2.c.band'), field: 'band' as any, width: 75,
|
||||
defaultVisible: true,
|
||||
cellClass: 'font-mono',
|
||||
// NEW BAND for this entity → the band text turns yellow.
|
||||
cellRenderer: (p: any) => cellText(p.value, statusFor(p)?.status === 'new-band' ? NEW : null),
|
||||
// NEW BAND for this entity → the band cell is filled.
|
||||
cellStyle: (p: any) => (statusFor(p)?.status === 'new-band' ? fillStyle(NEW) : null) as any,
|
||||
cellRenderer: (p: any) => cellText(p.value, null),
|
||||
tooltipValueGetter: (p: any) => (statusFor(p)?.status === 'new-band' ? t('clg2.tipNewBand') : undefined),
|
||||
},
|
||||
{
|
||||
@@ -264,7 +345,8 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
|
||||
// for the entity. NEW SLOT means band AND mode were each worked before (just
|
||||
// not together), so highlighting the mode cell would wrongly imply "CW is new";
|
||||
// that case is signalled by the Status badge alone.
|
||||
cellRenderer: (p: any) => cellText(p.value, statusFor(p)?.status === 'new-mode' ? NEW : null),
|
||||
cellStyle: (p: any) => (statusFor(p)?.status === 'new-mode' ? fillStyle('var(--caution)') : null) as any,
|
||||
cellRenderer: (p: any) => cellText(p.value, null),
|
||||
tooltipValueGetter: (p: any) => {
|
||||
const st = statusFor(p)?.status;
|
||||
if (st === 'new-mode') return t('clg2.tipNewMode');
|
||||
@@ -276,7 +358,37 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
|
||||
group: 'Spot', label: t('clg2.c.pfx'), colId: 'pfx',
|
||||
headerName: t('clg2.c.pfx'), width: 60, cellClass: 'font-mono',
|
||||
valueGetter: (p: any) => fmtPfx(p.data?.dx_call ?? ''),
|
||||
cellStyle: { color: 'var(--muted-foreground)' },
|
||||
// NEW PFX fills the prefix cell, in the prefix marker's own colour.
|
||||
cellStyle: (p: any) => (statusFor(p)?.new_pfx
|
||||
? fillStyle(markerColour('new_pfx'))
|
||||
: { color: 'var(--muted-foreground)' }) as any,
|
||||
tooltipValueGetter: (p: any) => (statusFor(p)?.new_pfx ? t('clg2.tipNewPfx') : undefined),
|
||||
},
|
||||
{
|
||||
group: 'Geo', label: t('clg2.c.grid'), colId: 'grid',
|
||||
headerName: t('clg2.c.grid'), width: 70, cellClass: 'font-mono',
|
||||
// Not on the spot: the square a station announced in a CQ that THIS receiver
|
||||
// decoded over the WSJT-X link, so it is filled for the digital watering
|
||||
// hole being monitored and empty everywhere else. A cluster line carries the
|
||||
// spotter's grid at best, never the DX's.
|
||||
valueGetter: (p: any) => statusFor(p)?.grid ?? '',
|
||||
cellStyle: (p: any) => (statusFor(p)?.new_grid ? fillStyle(markerColour('new_grid')) : null) as any,
|
||||
cellRenderer: (p: any) => cellText(p.value, null),
|
||||
tooltipValueGetter: (p: any) => (statusFor(p)?.new_grid ? t('clg2.tipNewGrid') : undefined),
|
||||
},
|
||||
{
|
||||
group: 'Geo', label: t('clg2.c.county'), colId: 'county',
|
||||
headerName: t('clg2.c.county'), width: 130, cellClass: 'font-mono',
|
||||
// Not on the spot: resolved per callsign from the offline ULS store, so it
|
||||
// stays empty for non-US calls and until that database is downloaded.
|
||||
valueGetter: (p: any) => {
|
||||
const s = statusFor(p);
|
||||
if (!s?.county) return '';
|
||||
return s.state ? s.county + ', ' + s.state : s.county;
|
||||
},
|
||||
cellStyle: (p: any) => (statusFor(p)?.new_county ? fillStyle(markerColour('new_county')) : null) as any,
|
||||
cellRenderer: (p: any) => cellText(p.value, null),
|
||||
tooltipValueGetter: (p: any) => (statusFor(p)?.new_county ? t('clg2.tipNewCounty') : undefined),
|
||||
},
|
||||
{
|
||||
group: 'Geo', label: t('clg2.c.cqz'), colId: 'cqz',
|
||||
@@ -397,6 +509,11 @@ export function ClusterGrid({ rows, spotStatus, onSpotClick }: Props) {
|
||||
|
||||
const defaultColDef = useMemo<ColDef>(() => ({
|
||||
sortable: true, resizable: true, filter: true, suppressMovable: false,
|
||||
// Dim "represents nothing" spots at the CELL level, via a class that
|
||||
// refreshCells re-applies. Doing it with a row STYLE needed redrawRows() on
|
||||
// every status update, which re-rendered the whole grid continuously and
|
||||
// pegged the CPU on a busy cluster (the 0.23.6 slowdown).
|
||||
cellClassRules: { 'opacity-40': (p: any) => isDull(statusFor(p)) },
|
||||
}), []);
|
||||
|
||||
// Pass spotStatus through AG Grid's context so cell renderers can look up
|
||||
@@ -406,12 +523,22 @@ export function ClusterGrid({ rows, spotStatus, onSpotClick }: Props) {
|
||||
const context = useMemo(() => ({ spotStatus }), [spotStatus]);
|
||||
|
||||
// Spot statuses arrive asynchronously (~after the rows render). The Call/Band/
|
||||
// Mode cellStyles depend on them but their cell VALUE doesn't change, so ag-grid
|
||||
// won't re-render those cells on its own — force a refresh so e.g. a worked call
|
||||
// turns blue once its status loads.
|
||||
// Mode cellStyles and the dimmed "represents nothing" class depend on them but
|
||||
// the cell VALUE doesn't change, so ag-grid won't re-render on its own — force a
|
||||
// refresh so e.g. a worked call turns blue once its status loads.
|
||||
//
|
||||
// THROTTLED: under an RBN firehose spotStatus updates ~20×/second, and firing a
|
||||
// full refreshCells that often is pure churn on a slow PC. Coalesce the bursts
|
||||
// into one refresh every 200 ms (still imperceptible) instead of one per update.
|
||||
const refreshPending = useRef<number | undefined>(undefined);
|
||||
useEffect(() => {
|
||||
if (refreshPending.current !== undefined) return; // a refresh is already queued
|
||||
refreshPending.current = window.setTimeout(() => {
|
||||
refreshPending.current = undefined;
|
||||
gridRef.current?.api?.refreshCells({ force: true });
|
||||
}, 200);
|
||||
}, [spotStatus]);
|
||||
useEffect(() => () => { if (refreshPending.current !== undefined) window.clearTimeout(refreshPending.current); }, []);
|
||||
|
||||
// Restore AFTER the profile scope is known — this grid has no key= remount to
|
||||
// save it from reading the wrong (unscoped) cache key at first paint.
|
||||
|
||||
@@ -69,6 +69,14 @@ interface Props {
|
||||
band: string;
|
||||
mode: string;
|
||||
bands?: string[]; // configured bands for the worked-before matrix columns
|
||||
// When the entry form is empty and a QSO is selected in the log grid, the
|
||||
// Stats (F1) matrix shows THAT contact's entity instead of sitting blank.
|
||||
// Only the matrix is redirected — every other tab still edits the live entry.
|
||||
slotCall?: string;
|
||||
slotBand?: string;
|
||||
slotMode?: string;
|
||||
slotWb?: any;
|
||||
slotWbBusy?: boolean;
|
||||
imageUrl?: string;
|
||||
onOpenImage?: () => void;
|
||||
// Optional controlled active tab (so the app can switch it via keyboard).
|
||||
@@ -77,6 +85,8 @@ interface Props {
|
||||
// When the WinKeyer is active, F1-F12 fire macros, so the tab shortcut is
|
||||
// shown as Ctrl+F1…F5 instead of F1…F5.
|
||||
keyerActive?: boolean;
|
||||
// Open the QSO editor — makes callsigns clickable in the band-slot drill-down.
|
||||
onEditQso?: (id: number) => void;
|
||||
}
|
||||
|
||||
export type TabName = 'stats' | 'info' | 'awards' | 'my' | 'extended';
|
||||
@@ -139,7 +149,7 @@ function Field({ label, span = 1, className, children }: { label: string; span?:
|
||||
);
|
||||
}
|
||||
|
||||
export function DetailsPanel({ callsign, prefix, operatorGrid, remoteGrid, qth, name, country, comment, note, details, onChange, wb, wbBusy, band, mode, bands, tab, onTab, keyerActive }: Props) {
|
||||
export function DetailsPanel({ callsign, prefix, operatorGrid, remoteGrid, qth, name, country, comment, note, details, onChange, wb, wbBusy, band, mode, bands, slotCall, slotBand, slotMode, slotWb, slotWbBusy, tab, onTab, keyerActive, onEditQso }: Props) {
|
||||
const { t } = useI18n();
|
||||
const [internalOpen, setInternalOpen] = useState<TabName>('stats');
|
||||
const open = tab ?? internalOpen; // controlled when `tab` is provided
|
||||
@@ -272,7 +282,15 @@ export function DetailsPanel({ callsign, prefix, operatorGrid, remoteGrid, qth,
|
||||
<div className={cn('flex-1 min-h-0', open === 'stats' ? 'overflow-hidden' : 'overflow-y-auto')}>
|
||||
{open === 'stats' && (
|
||||
<div className="px-3 py-2.5">
|
||||
<BandSlotGrid wb={wb} busy={!!wbBusy} currentBand={band} currentMode={mode} bands={bands} hasCall={callsign.trim() !== ''}
|
||||
<BandSlotGrid
|
||||
wb={slotCall ? slotWb : wb}
|
||||
busy={slotCall ? !!slotWbBusy : !!wbBusy}
|
||||
currentBand={slotCall ? (slotBand ?? '') : band}
|
||||
currentMode={slotCall ? (slotMode ?? '') : mode}
|
||||
bands={bands}
|
||||
hasCall={slotCall ? true : callsign.trim() !== ''}
|
||||
forCall={slotCall}
|
||||
onEditQso={onEditQso}
|
||||
lat={dxLL?.lat} lon={dxLL?.lon} />
|
||||
</div>
|
||||
)}
|
||||
@@ -447,18 +465,18 @@ export function DetailsPanel({ callsign, prefix, operatorGrid, remoteGrid, qth,
|
||||
</Select>
|
||||
</Field>
|
||||
<Field label={t('detp.rig')} span={3}>
|
||||
<Input value={details.my_rig} placeholder="Flex 8600" onChange={(e) => onChange({ my_rig: e.target.value })} />
|
||||
<Input value={details.my_rig} onChange={(e) => onChange({ my_rig: e.target.value })} />
|
||||
</Field>
|
||||
<Field label={t('detp.antenna')} span={3}>
|
||||
<Input value={details.my_antenna} placeholder="UB640" onChange={(e) => onChange({ my_antenna: e.target.value })} />
|
||||
<Input value={details.my_antenna} onChange={(e) => onChange({ my_antenna: e.target.value })} />
|
||||
</Field>
|
||||
{satelliteMode && (
|
||||
<>
|
||||
<Field label={t('detp.satName')} span={3}>
|
||||
<Input value={details.sat_name} placeholder="AO-91" onChange={(e) => onChange({ sat_name: e.target.value })} />
|
||||
<Input value={details.sat_name} onChange={(e) => onChange({ sat_name: e.target.value })} />
|
||||
</Field>
|
||||
<Field label={t('detp.satelliteMode')} span={3}>
|
||||
<Input value={details.sat_mode} placeholder="U/V" onChange={(e) => onChange({ sat_mode: e.target.value })} />
|
||||
<Input value={details.sat_mode} onChange={(e) => onChange({ sat_mode: e.target.value })} />
|
||||
</Field>
|
||||
</>
|
||||
)}
|
||||
|
||||
@@ -13,7 +13,8 @@ import { useI18n } from '@/lib/i18n';
|
||||
|
||||
export type FilterOp =
|
||||
| 'eq' | 'ne' | 'gt' | 'lt' | 'ge' | 'le'
|
||||
| 'contains' | 'startswith' | 'endswith' | 'empty' | 'notempty';
|
||||
| 'contains' | 'startswith' | 'endswith' | 'empty' | 'notempty'
|
||||
| 'in' | 'notin';
|
||||
|
||||
export interface FilterCondition { field: string; op: FilterOp; value: string }
|
||||
export interface QueryFilter {
|
||||
@@ -121,9 +122,15 @@ const OPS: { value: FilterOp; label: string }[] = [
|
||||
{ value: 'le', label: 'fltb.opLe' },
|
||||
{ value: 'empty', label: 'fltb.opEmpty' },
|
||||
{ value: 'notempty', label: 'fltb.opNotEmpty' },
|
||||
// 'in' is what makes a real question askable. Every condition is joined by ONE
|
||||
// AND or OR, so "2 m or 70 cm, in FT8, since January" had no expression: AND
|
||||
// killed the two bands, OR let every FT8 QSO through. The OR lives inside the
|
||||
// condition instead, and the rest keeps ANDing.
|
||||
{ value: 'in', label: 'fltb.opIn' },
|
||||
{ value: 'notin', label: 'fltb.opNotIn' },
|
||||
];
|
||||
|
||||
const TEXT_OPS: FilterOp[] = ['contains', 'startswith', 'endswith', 'eq', 'ne', 'empty', 'notempty'];
|
||||
const TEXT_OPS: FilterOp[] = ['contains', 'startswith', 'endswith', 'eq', 'ne', 'in', 'notin', 'empty', 'notempty'];
|
||||
const NUM_OPS: FilterOp[] = ['eq', 'ne', 'gt', 'lt', 'ge', 'le', 'empty', 'notempty'];
|
||||
|
||||
function opsFor(field: string): { value: FilterOp; label: string }[] {
|
||||
@@ -257,6 +264,7 @@ export function FilterBuilder({ open, initial, onApply, onClose }: Props) {
|
||||
)}
|
||||
{conditions.map((c, i) => {
|
||||
const needsValue = c.op !== 'empty' && c.op !== 'notempty';
|
||||
const isList = c.op === 'in' || c.op === 'notin';
|
||||
const fieldType = FIELDS.find((f) => f.value === c.field)?.type ?? 'text';
|
||||
return (
|
||||
<div key={i} className="flex items-center gap-2">
|
||||
@@ -281,19 +289,28 @@ export function FilterBuilder({ open, initial, onApply, onClose }: Props) {
|
||||
// An ADIF date is picked with a calendar but STORED as the
|
||||
// 8-digit form the column holds, so the comparison stays a
|
||||
// plain string one on both sides.
|
||||
type={fieldType === 'date' || fieldType === 'adifdate' ? 'date' : fieldType === 'number' ? 'number' : 'text'}
|
||||
// A list is typed by hand, commas and all, so it stays a text
|
||||
// box even on a date or number field: a calendar cannot express
|
||||
// "any one of these".
|
||||
type={isList ? 'text'
|
||||
: fieldType === 'date' || fieldType === 'adifdate' ? 'date'
|
||||
: fieldType === 'number' ? 'number' : 'text'}
|
||||
className="h-8 flex-1 text-xs"
|
||||
disabled={!needsValue}
|
||||
placeholder={needsValue ? (fieldType === 'date' ? 'YYYY-MM-DD' : t('fltb.valuePh')) : '—'}
|
||||
placeholder={!needsValue ? '—'
|
||||
: isList ? t('fltb.listPh')
|
||||
: fieldType === 'date' ? 'YYYY-MM-DD' : t('fltb.valuePh')}
|
||||
// \d, not d: the escape was missing, so the test never matched
|
||||
// an 8-digit ADIF date and the calendar input was handed
|
||||
// "20260728" — which type=date rejects, showing an empty box
|
||||
// over a value that was really there.
|
||||
value={fieldType === 'adifdate' && /^\d{8}$/.test(c.value)
|
||||
// The ADIF reshaping is skipped for a list: it would eat the
|
||||
// commas and leave one unreadable run of digits.
|
||||
value={!isList && fieldType === 'adifdate' && /^\d{8}$/.test(c.value)
|
||||
? `${c.value.slice(0, 4)}-${c.value.slice(4, 6)}-${c.value.slice(6, 8)}`
|
||||
: c.value}
|
||||
onChange={(e) => setCond(i, {
|
||||
value: fieldType === 'adifdate' ? e.target.value.replace(/-/g, '') : e.target.value,
|
||||
value: !isList && fieldType === 'adifdate' ? e.target.value.replace(/-/g, '') : e.target.value,
|
||||
})}
|
||||
onKeyDown={(e) => { if (e.key === 'Enter') apply(); }}
|
||||
/>
|
||||
|
||||
@@ -47,12 +47,33 @@ const ZERO: IcomState = {
|
||||
|
||||
// Band buttons jump the VFO to a sensible default frequency (SSB/CW mix) using
|
||||
// the plain SetFrequency command — no band-stacking codes needed. Hz values.
|
||||
const BANDS: { l: string; hz: number }[] = [
|
||||
type Band = { l: string; hz: number };
|
||||
|
||||
const HF_BANDS: Band[] = [
|
||||
{ l: '160', hz: 1_840_000 }, { l: '80', hz: 3_750_000 }, { l: '40', hz: 7_100_000 },
|
||||
{ l: '30', hz: 10_130_000 }, { l: '20', hz: 14_150_000 }, { l: '17', hz: 18_130_000 },
|
||||
{ l: '15', hz: 21_250_000 }, { l: '12', hz: 24_950_000 }, { l: '10', hz: 28_400_000 },
|
||||
{ l: '6', hz: 50_150_000 },
|
||||
];
|
||||
const B6 = { l: '6', hz: 50_150_000 };
|
||||
const B2 = { l: '2', hz: 144_300_000 }; // SSB calling
|
||||
const B70 = { l: '70cm', hz: 432_200_000 }; // SSB calling
|
||||
const B23 = { l: '23cm', hz: 1_296_200_000 }; // SSB calling
|
||||
|
||||
// Band buttons jump the VFO to a sensible default frequency (SSB/CW mix) using
|
||||
// the plain SetFrequency command — no band-stacking codes needed.
|
||||
//
|
||||
// Which buttons to OFFER depends on the radio, exactly as the attenuator steps
|
||||
// do below. An IC-9700 has no HF at all, yet the console was showing it 160
|
||||
// through 6 and none of the bands it actually covers: ten dead buttons, and no
|
||||
// way to change band from here on the only rig where you would want to.
|
||||
function bandsFor(model?: string): Band[] {
|
||||
const m = (model ?? '').toUpperCase();
|
||||
if (m.includes('9700')) return [B2, B70, B23]; // VHF/UHF/SHF only
|
||||
if (m.includes('705')) return [...HF_BANDS, B6, B2, B70];
|
||||
if (m.includes('9100')) return [...HF_BANDS, B6, B2, B70, B23];
|
||||
// 7300 / 7610 / 7100 / unknown: HF + 6 m, the historical list.
|
||||
return [...HF_BANDS, B6];
|
||||
}
|
||||
|
||||
// Mode buttons for the console (like RS-BA1's row). SetCATMode picks USB/LSB for
|
||||
// SSB by frequency and the rig's data variant for digital modes.
|
||||
@@ -85,7 +106,10 @@ function bandOfHz(hz?: number): string {
|
||||
['160', 1.8, 2.0], ['80', 3.5, 4.0], ['60', 5.25, 5.45], ['40', 7.0, 7.3],
|
||||
['30', 10.1, 10.15], ['20', 14.0, 14.35], ['17', 18.068, 18.168],
|
||||
['15', 21.0, 21.45], ['12', 24.89, 24.99], ['10', 28.0, 29.7],
|
||||
['6', 50.0, 54.0], ['4', 70.0, 70.5], ['2', 144.0, 148.0], ['70', 430.0, 450.0],
|
||||
// Labels must match the band buttons' exactly — this is only used to light
|
||||
// the button for the band the rig is on, and '70' never matched '70cm'.
|
||||
['6', 50.0, 54.0], ['4', 70.0, 70.5], ['2', 144.0, 148.0],
|
||||
['70cm', 430.0, 450.0], ['23cm', 1240.0, 1300.0],
|
||||
];
|
||||
for (const [name, lo, hi] of bands) if (mhz >= lo && mhz <= hi) return name;
|
||||
return '';
|
||||
@@ -749,7 +773,7 @@ export function IcomPanel({ onReportRST, isNetwork = false }: { onReportRST?: (r
|
||||
{/* Band buttons + antenna selection. */}
|
||||
<Card icon={Antenna} title={t('icmp.bandsAntenna')} accent="#0891b2">
|
||||
<div className="grid grid-cols-5 gap-1.5">
|
||||
{BANDS.map((b) => {
|
||||
{bandsFor(st.model).map((b) => {
|
||||
const here = bandOfHz(mainHz) === b.l;
|
||||
return (
|
||||
<button key={b.l} type="button" onClick={() => SetCATFrequency(b.hz).catch(() => {})}
|
||||
|
||||
@@ -21,7 +21,13 @@ import { TailLogFile, GetLogFilePath } from '../../wailsjs/go/main/App';
|
||||
// 256 KB blob: with "cluster" or "acom" typed in, the window becomes exactly
|
||||
// the subsystem trace you would have grepped for.
|
||||
// • It polls only while open. A closed dialog costs nothing.
|
||||
const TAIL_BYTES = 256 * 1024;
|
||||
// 512 KB ≈ 3200 lines. The window is a sliding tail: once new lines push past it
|
||||
// the oldest fall out of the fetched text entirely, so a small buffer dropped
|
||||
// lines the operator was still reading during a busy trace (CAT/cluster/antenna
|
||||
// polling). This is double the old 256 KB — 1 MB was tried but the per-second
|
||||
// fetch + split + re-render of ~6500 lines made the window lag. 512 KB keeps a
|
||||
// useful backlog while staying smooth. The backend caps this at 4 MB.
|
||||
const TAIL_BYTES = 512 * 1024;
|
||||
const POLL_MS = 1000;
|
||||
|
||||
export function LogViewer({ open, onOpenChange }: { open: boolean; onOpenChange: (v: boolean) => void }) {
|
||||
|
||||
@@ -43,9 +43,20 @@ function unwrapLon(ring: [number, number][]): [number, number][] {
|
||||
}
|
||||
|
||||
const CARTO_LIGHT = 'https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}{r}.png';
|
||||
const OSM = 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
|
||||
const CARTO_ATTR = '© OpenStreetMap © CARTO';
|
||||
const OSM_ATTR = '© OpenStreetMap contributors';
|
||||
|
||||
// NOT tile.openstreetmap.org. Those are OpenStreetMap's VOLUNTEER-run servers,
|
||||
// and their usage policy does not cover a desktop application handed to an
|
||||
// unbounded number of operators — they blocked OpsLog for it, and every user's
|
||||
// map filled with "Access blocked / 403" tiles at once.
|
||||
//
|
||||
// The replacements are tile services whose terms do cover redistributed apps,
|
||||
// with no API key: Carto (whose tiles are OSM-derived, hence the attribution
|
||||
// still credits OpenStreetMap) and Esri. Anything added here later must be
|
||||
// checked the same way — a free tile URL is not the same thing as a tile URL we
|
||||
// are allowed to ship.
|
||||
const ESRI_STREET = 'https://server.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer/tile/{z}/{y}/{x}';
|
||||
const ESRI_STREET_ATTR = 'Tiles © Esri — Source: Esri, HERE, Garmin, © OpenStreetMap contributors';
|
||||
|
||||
// Selectable basemaps for the world (great-circle) map. All key-free and all
|
||||
// LABELLED (country/continent names). `labelsUrl` adds a transparent place-name
|
||||
@@ -55,7 +66,7 @@ const BASEMAPS: Record<BasemapKey, { label: string; url: string; attr: string; s
|
||||
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',
|
||||
attr: CARTO_ATTR, subdomains: 'abcd' },
|
||||
street: { label: 'Street', url: OSM, attr: OSM_ATTR },
|
||||
street: { label: 'Street', url: ESRI_STREET, attr: ESRI_STREET_ATTR },
|
||||
satellite: { label: 'Satellite', url: 'https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}',
|
||||
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}' },
|
||||
@@ -416,7 +427,14 @@ export function LocatorMap({ toGrid, toLabel }: LocatorProps) {
|
||||
if (locatorRef.current && !locatorMap.current) {
|
||||
const m = L.map(locatorRef.current, { zoomControl: true, attributionControl: true })
|
||||
.setView([20, 0], 2);
|
||||
L.tileLayer(OSM, { attribution: OSM_ATTR, maxZoom: 19 }).addTo(m);
|
||||
// Same restraint as the world map: fetch on idle, not mid-pan, and keep a
|
||||
// single ring of buffer tiles. Requesting tiles as fast as the pointer
|
||||
// moves is what gets an app blocked, and the next provider is under no
|
||||
// more obligation to tolerate it than the last one was.
|
||||
L.tileLayer(CARTO_LIGHT, {
|
||||
attribution: CARTO_ATTR, subdomains: 'abcd', maxZoom: 19,
|
||||
updateWhenIdle: true, updateWhenZooming: false, keepBuffer: 1,
|
||||
}).addTo(m);
|
||||
locatorOverlay.current = L.layerGroup().addTo(m);
|
||||
locatorMap.current = m;
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@ import {
|
||||
Select, SelectTrigger, SelectValue, SelectContent, SelectItem,
|
||||
} from '@/components/ui/select';
|
||||
import { cn } from '@/lib/utils';
|
||||
import { FindQSOsForUpload, UploadQSOsManual, DownloadConfirmations, SyncPOTAHunterLog, ListQSO, BulkUpdateQSL, UploadCallsign, GetSlotStats } from '../../wailsjs/go/main/App';
|
||||
import { FindQSOsForUpload, UploadQSOsManual, DownloadConfirmations, CancelConfirmations, SyncPOTAHunterLog, ListQSO, BulkUpdateQSL, UploadCallsign, GetSlotStats } from '../../wailsjs/go/main/App';
|
||||
import { Input } from '@/components/ui/input';
|
||||
import { RecentQSOsGrid } from '@/components/RecentQSOsGrid';
|
||||
import { EventsOn } from '../../wailsjs/runtime/runtime';
|
||||
@@ -120,6 +120,10 @@ export function QSLManagerPanel({ onEditQSO }: { onEditQSO?: (id: number) => voi
|
||||
if (service === 'pota' || service === 'paper') { setUploadCall(''); return; }
|
||||
UploadCallsign(service).then((c) => setUploadCall(c || '')).catch(() => setUploadCall(''));
|
||||
}, [service]);
|
||||
// Closing the QSL Manager (the tab's ×) unmounts this panel — cancel any download
|
||||
// still running so a slow QRZ/LoTW sync doesn't keep going in the background and
|
||||
// bleed its log into the next one.
|
||||
useEffect(() => () => { CancelConfirmations().catch(() => {}); }, []);
|
||||
const [potaSyncing, setPotaSyncing] = useState(false);
|
||||
const [potaRes, setPotaRes] = useState<POTASync | null>(null);
|
||||
const [potaErr, setPotaErr] = useState('');
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { useEffect, useMemo, useRef, useState } from 'react';
|
||||
import { Trash2, Search, Loader2, CalendarDays } from 'lucide-react';
|
||||
import { LookupCallsign, LookupCallsignFresh, DXCCForCountry, GetAwardDefs, ComputeQSOAwardRefs, GetListsSettings } from '../../wailsjs/go/main/App';
|
||||
import { LookupCallsign, LookupCallsignFresh, DXCCForCountry, GetAwardDefs, ComputeQSOAwardRefs, GetListsSettings, OpenExternalURL, SetOpsLogQSLReceived } from '../../wailsjs/go/main/App';
|
||||
import { rstOptions, type RSTLists } from '@/lib/rst';
|
||||
import { AwardRefSelector } from '@/components/AwardRefSelector';
|
||||
import { AdifExtrasEditor } from '@/components/AdifExtrasEditor';
|
||||
@@ -22,6 +22,7 @@ import { Combobox } from '@/components/ui/combobox';
|
||||
import { cn } from '@/lib/utils';
|
||||
import { flagURL } from '@/lib/flags';
|
||||
import { useI18n } from '@/lib/i18n';
|
||||
import { titleCase, sentenceCase } from '@/lib/textCase';
|
||||
import type { QSOForm } from '@/types';
|
||||
|
||||
type QSO = QSOForm;
|
||||
@@ -72,6 +73,11 @@ const CONF_LABEL_KEYS: Record<string, string> = {
|
||||
QSL: 'qedit.confQslPaper',
|
||||
};
|
||||
|
||||
// OpsLog's own card. Kept out of CONFIRMATIONS on purpose — that list maps QSO
|
||||
// columns and this channel is backed by ADIF extras — but it still belongs in
|
||||
// the channel picker and the status table alongside the rest.
|
||||
const OPSLOG_CONF = 'OPSLOG';
|
||||
|
||||
// Colour-coded status cell for the confirmation grid.
|
||||
function StatusCell({ value }: { value?: string }) {
|
||||
const { t } = useI18n();
|
||||
@@ -428,6 +434,26 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
|
||||
[draft.extras],
|
||||
);
|
||||
|
||||
// OpsLog QSL "received" marker (ADIF extra). Drives the card's PSE/TNX stamp:
|
||||
// received → TNX QSL (thanks for your card), otherwise PSE QSL (please send one).
|
||||
// Saved with the normal Save via draft.extras.
|
||||
const OPSLOG_QSL_RCVD = 'APP_OPSLOG_QSL_RCVD';
|
||||
const qslReceived = !!String(draft.extras?.[OPSLOG_QSL_RCVD] ?? '').trim();
|
||||
// Sent side, for the confirmations table. Two key names because the marker was
|
||||
// renamed once and old QSOs still carry the first one — same test the Recent
|
||||
// QSOs "OpsLog QSL" column makes.
|
||||
const opslogQslSent = !!(draft.extras?.['APP_OPSLOG_QSL_SENT'] || draft.extras?.['APP_OPSLOG_QSL_CARD_SENT']);
|
||||
const toggleQslReceived = (on: boolean) => {
|
||||
// Reflect immediately in the draft (for the PSE/TNX indicator)…
|
||||
const next = { ...(draft.extras ?? {}) };
|
||||
if (on) next[OPSLOG_QSL_RCVD] = new Date().toISOString();
|
||||
else delete next[OPSLOG_QSL_RCVD];
|
||||
set('extras', next as any);
|
||||
// …and persist right away with a targeted write that reliably sets OR clears
|
||||
// the key (the modal's extras-merge on Save wouldn't clear a removed key).
|
||||
if ((draft as any).id) SetOpsLogQSLReceived((draft as any).id, on).catch(() => {});
|
||||
};
|
||||
|
||||
return (
|
||||
<Dialog open onOpenChange={(o) => { if (!o) onClose(); }}>
|
||||
<DialogContent className="max-w-5xl max-h-[92vh] grid grid-rows-[auto_1fr_auto] gap-0 p-0">
|
||||
@@ -466,7 +492,22 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
|
||||
{/* Top: Callsign + RST + Fetch */}
|
||||
<div className="flex items-end gap-2 mb-3">
|
||||
<div className="flex flex-col flex-1 min-w-0">
|
||||
<div className="flex items-center">
|
||||
<Label>{t('qedit.callsign')}</Label>
|
||||
{(draft.callsign ?? '').trim() && (
|
||||
<button
|
||||
type="button"
|
||||
title={t('qrz.openTitle', { call: (draft.callsign ?? '').trim().toUpperCase() })}
|
||||
onClick={() => {
|
||||
const c = (draft.callsign ?? '').trim().toUpperCase().split('/').map(encodeURIComponent).join('/');
|
||||
if (c) OpenExternalURL(`https://www.qrz.com/db/${c}`).catch((e: any) => setLocalErr(String(e?.message ?? e)));
|
||||
}}
|
||||
className="ml-auto shrink-0 inline-flex items-center gap-0.5 text-[9px] font-semibold normal-case tracking-wider text-primary hover:underline"
|
||||
>
|
||||
QRZ ↗
|
||||
</button>
|
||||
)}
|
||||
</div>
|
||||
<Input className="font-mono text-lg font-bold tracking-wider uppercase h-10"
|
||||
value={draft.callsign ?? ''} onChange={(e) => set('callsign', e.target.value)} />
|
||||
</div>
|
||||
@@ -483,7 +524,8 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
|
||||
<div className="grid grid-cols-2 gap-x-6 gap-y-2.5">
|
||||
{/* ── Left column ── */}
|
||||
<div className="flex flex-col gap-2.5">
|
||||
<div><Label>{t('qedit.name')}</Label><Input value={draft.name ?? ''} onChange={(e) => set('name', e.target.value)} /></div>
|
||||
<div><Label>{t('qedit.name')}</Label><Input value={draft.name ?? ''} onChange={(e) => set('name', e.target.value)}
|
||||
onBlur={() => set('name', titleCase(draft.name ?? '') as any)} /></div>
|
||||
<div className="flex items-center gap-2">
|
||||
<Label className="w-20 shrink-0">{t('qedit.band')}</Label>
|
||||
<Select value={draft.band || ''} onValueChange={(v) => set('band', v)}>
|
||||
@@ -549,8 +591,10 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
|
||||
<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>PFX</Label><Input readOnly value={pfxOf(draft.callsign ?? '')} className="font-mono bg-muted/40" /></div>
|
||||
</div>
|
||||
<div><Label>{t('qedit.comment')}</Label><Input value={draft.comment ?? ''} onChange={(e) => set('comment', e.target.value)} /></div>
|
||||
<div><Label>{t('qedit.note')}</Label><Textarea rows={3} value={draft.notes ?? ''} onChange={(e) => set('notes', e.target.value)} /></div>
|
||||
<div><Label>{t('qedit.comment')}</Label><Input value={draft.comment ?? ''} onChange={(e) => set('comment', e.target.value)}
|
||||
onBlur={() => set('comment', sentenceCase(draft.comment ?? '') as any)} /></div>
|
||||
<div><Label>{t('qedit.note')}</Label><Textarea rows={3} value={draft.notes ?? ''} onChange={(e) => set('notes', e.target.value)}
|
||||
onBlur={() => set('notes', sentenceCase(draft.notes ?? '') as any)} /></div>
|
||||
</div>
|
||||
</div>
|
||||
</TabsContent>
|
||||
@@ -571,7 +615,8 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
|
||||
</SelectContent>
|
||||
</Select>
|
||||
</div>
|
||||
<div><Label>QTH</Label><Input value={draft.qth ?? ''} onChange={(e) => set('qth', e.target.value)} /></div>
|
||||
<div><Label>QTH</Label><Input value={draft.qth ?? ''} onChange={(e) => set('qth', e.target.value)}
|
||||
onBlur={() => set('qth', titleCase(draft.qth ?? '') as any)} /></div>
|
||||
<div><Label>{t('qedit.address')}</Label><Textarea rows={4} value={draft.address ?? ''} onChange={(e) => set('address', e.target.value)} /></div>
|
||||
</div>
|
||||
{/* Right column */}
|
||||
@@ -581,7 +626,13 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
|
||||
<div className="flex flex-col flex-1"><Label>Lat</Label><Input type="number" step="0.000001" value={draft.lat ?? ''} onChange={(e) => set('lat', numOrUndef(e.target.value) as any)} className="font-mono" /></div>
|
||||
<div className="flex flex-col flex-1"><Label>Lon</Label><Input type="number" step="0.000001" value={draft.lon ?? ''} onChange={(e) => set('lon', numOrUndef(e.target.value) as any)} className="font-mono" /></div>
|
||||
</div>
|
||||
<div><Label>{t('qedit.qslMsg')}</Label><Input value={draft.qsl_msg ?? ''} onChange={(e) => set('qsl_msg', e.target.value)} /></div>
|
||||
{/* The OpsLog QSL marker used to sit here, under QSL Msg. It
|
||||
belongs with the other confirmation channels — see the QSL
|
||||
Info tab. */}
|
||||
<div>
|
||||
<Label>{t('qedit.qslMsg')}</Label>
|
||||
<Input value={draft.qsl_msg ?? ''} onChange={(e) => set('qsl_msg', e.target.value)} />
|
||||
</div>
|
||||
<div><Label>{t('qedit.qslVia')}</Label><Input value={draft.qsl_via ?? ''} onChange={(e) => set('qsl_via', e.target.value)} /></div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -629,9 +680,51 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
|
||||
<Label>{t('qedit.manageConf')}</Label>
|
||||
<Select value={confSel} onValueChange={setConfSel}>
|
||||
<SelectTrigger><SelectValue /></SelectTrigger>
|
||||
<SelectContent>{CONFIRMATIONS.map((c) => <SelectItem key={c.key} value={c.key}>{CONF_LABEL_KEYS[c.key] ? t(CONF_LABEL_KEYS[c.key]) : c.label}</SelectItem>)}</SelectContent>
|
||||
<SelectContent>
|
||||
{CONFIRMATIONS.map((c) => <SelectItem key={c.key} value={c.key}>{CONF_LABEL_KEYS[c.key] ? t(CONF_LABEL_KEYS[c.key]) : c.label}</SelectItem>)}
|
||||
{/* Listed here but NOT in CONFIRMATIONS: that table maps
|
||||
QSO columns, and this channel lives in the ADIF
|
||||
extras. It gets its own editor below rather than the
|
||||
generic sent/received/date grid, which has no field
|
||||
to bind to. */}
|
||||
<SelectItem value={OPSLOG_CONF}>{t('qedit.confOpsLog')}</SelectItem>
|
||||
</SelectContent>
|
||||
</Select>
|
||||
</div>
|
||||
|
||||
{confSel === OPSLOG_CONF ? (
|
||||
/* OpsLog's own card. "Sent" is stamped when the card
|
||||
actually goes out, so it is shown, not offered: ticking
|
||||
it by hand would record something that never happened.
|
||||
"Received" drives the PSE/TNX stamp printed on the card,
|
||||
which is the whole reason the flag exists — hence the
|
||||
live indicator next to it. It writes immediately rather
|
||||
than on Save, because clearing an extras key would not
|
||||
survive the merge Save does. */
|
||||
<div className="space-y-3">
|
||||
<div className="grid grid-cols-2 gap-3">
|
||||
<div>
|
||||
<Label>{t('qedit.sent')}</Label>
|
||||
<Input disabled value={opslogQslSent ? t('qedit.qslYes') : t('qedit.qslNo')} />
|
||||
</div>
|
||||
<div>
|
||||
<Label>{t('qedit.received')}</Label>
|
||||
<label className="flex h-9 items-center gap-2 text-sm cursor-pointer">
|
||||
<Checkbox checked={qslReceived} onCheckedChange={(c) => toggleQslReceived(!!c)} />
|
||||
{t('qedit.qslReceived')}
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
<div className="flex items-center gap-2">
|
||||
<span className="text-[11px] font-mono px-1.5 py-0.5 rounded bg-muted text-muted-foreground">
|
||||
{qslReceived ? 'TNX QSL' : 'PSE QSL'}
|
||||
</span>
|
||||
<span className="text-[11px] text-muted-foreground">{t('qedit.pseTnxHint')}</span>
|
||||
</div>
|
||||
<p className="text-[11px] text-muted-foreground">{t('qedit.opslogSentHint')}</p>
|
||||
</div>
|
||||
) : (
|
||||
<>
|
||||
<div className="grid grid-cols-2 gap-3">
|
||||
<div><Label>{t('qedit.sent')}</Label><QslSelect value={val(def.sent)} onChange={(v) => put(def.sent, v)} /></div>
|
||||
<div><Label>{t('qedit.received')}</Label>
|
||||
@@ -648,6 +741,8 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
|
||||
<p className="text-[11px] text-muted-foreground">
|
||||
{t('qedit.qslPanelHint')} <strong>{t('qedit.saveChanges')}</strong>.
|
||||
</p>
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* Right: live status grid for every channel.
|
||||
@@ -672,6 +767,17 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
|
||||
<td className="w-24">{c.rcvd ? <StatusCell value={val(c.rcvd)} /> : <span className="block text-center text-[11px] text-muted-foreground">—</span>}</td>
|
||||
</tr>
|
||||
))}
|
||||
{/* OpsLog's own card, read from the ADIF extras rather
|
||||
than a QSO column — hence a hand-written row instead
|
||||
of a CONFIRMATIONS entry. "Sent" is stamped by OpsLog
|
||||
when the card actually goes out, so it stays
|
||||
read-only here: an operator ticking it by hand would
|
||||
be recording something that never happened. */}
|
||||
<tr className="text-xs">
|
||||
<td className="font-medium pr-3 py-0.5 whitespace-nowrap">{t('qedit.confOpsLog')}</td>
|
||||
<td className="w-24"><StatusCell value={opslogQslSent ? 'Y' : 'N'} /></td>
|
||||
<td className="w-24"><StatusCell value={qslReceived ? 'Y' : 'N'} /></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
@@ -56,6 +56,10 @@ type Props = {
|
||||
onRowDoubleClicked?: (q: QSOForm) => void;
|
||||
onRowClicked?: (q: QSOForm) => void;
|
||||
onRowSelected?: (ids: number[]) => void;
|
||||
// The full first selected row — the Stats (F1) panel shows its entity when the
|
||||
// entry form is empty, so browsing the log answers "what have I got with this
|
||||
// one?" without retyping the call.
|
||||
onRowSelectedQso?: (row: QSOForm | null) => void;
|
||||
onUpdateFromCty?: (ids: number[]) => void;
|
||||
onUpdateFromQRZ?: (ids: number[]) => void;
|
||||
onUpdateFromClublog?: (ids: number[]) => void;
|
||||
@@ -191,6 +195,8 @@ export const makeColCatalog = (t: TFn, myGrid?: string): ColEntry[] => [
|
||||
{ group: 'eQSL', label: t('rqg.c.eqsl_rcvd_date'), colId: 'eqsl_rcvd_date', headerName: t('rqg.h.eqsl_rcvd_date'), field: 'eqsl_rcvd_date' as any, width: 120, valueFormatter: (p) => fmtDateOnly(p.value) },
|
||||
// App-specific: when OpsLog e-mailed its own QSL card. Distinct from eQSL.cc.
|
||||
{ group: 'QSL', label: t('rqg.c.opslog_qsl_card_sent'), colId: 'opslog_qsl_card_sent', headerName: t('rqg.c.opslog_qsl_card_sent'), width: 100, cellClass: qslStatusCellClass, valueGetter: (p) => { const e = (p.data as any)?.extras ?? {}; return (e['APP_OPSLOG_QSL_SENT'] || e['APP_OPSLOG_QSL_CARD_SENT']) ? 'Y' : 'N'; }, defaultVisible: true },
|
||||
// App-specific: operator marked a QSL as RECEIVED for this QSO (drives PSE/TNX).
|
||||
{ group: 'QSL', label: t('rqg.c.opslog_qsl_card_rcvd'), colId: 'opslog_qsl_card_rcvd', headerName: t('rqg.c.opslog_qsl_card_rcvd'), width: 100, cellClass: qslStatusCellClass, valueGetter: (p) => { const e = (p.data as any)?.extras ?? {}; return e['APP_OPSLOG_QSL_RCVD'] ? 'Y' : 'N'; }, defaultVisible: false },
|
||||
// App-specific: when the QSO's audio recording was e-mailed to the station.
|
||||
{ group: 'QSL', label: t('rqg.c.opslog_recording_sent'), colId: 'opslog_recording_sent', headerName: t('rqg.h.opslog_recording_sent'), width: 100, cellClass: qslStatusCellClass, valueGetter: (p) => { const e = (p.data as any)?.extras ?? {}; return e['APP_OPSLOG_RECORDING_SENT'] ? 'Y' : 'N'; }, defaultVisible: false },
|
||||
|
||||
@@ -276,14 +282,24 @@ const GRP_KEYS: Record<string, string> = {
|
||||
};
|
||||
export const groupLabel = (t: TFn, g: string): string => t(GRP_KEYS[g] ?? g);
|
||||
|
||||
// Award columns are governed SOLELY by the awardShown code-set, never by AG
|
||||
// Grid's saved column state. Stripping them here (on both save and restore)
|
||||
// stops a stale saved state from re-hiding a shown award column on every
|
||||
// awardCols rebuild — the desync that made award columns vanish mid-session.
|
||||
const stripAwardCols = (st: any[] | null | undefined): any[] =>
|
||||
(st ?? []).filter((s) => !String(s?.colId ?? '').startsWith('award_'));
|
||||
// Award-column VISIBILITY is governed SOLELY by the awardShown code-set, never
|
||||
// by AG Grid's saved column state: dropping `hide` here (on both save and
|
||||
// restore) stops a stale saved state from re-hiding a shown award column on
|
||||
// every awardCols rebuild — the desync that made award columns vanish
|
||||
// mid-session.
|
||||
//
|
||||
// Their POSITION, however, has to stay in the state. Filtering the entries out
|
||||
// entirely left applyColumnState({applyOrder:true}) with no place for them, and
|
||||
// AG Grid appends what the state doesn't mention — so a column the operator
|
||||
// dragged to sit AFTER an award column jumped back in front of it on reload.
|
||||
const sanitizeAwardCols = (st: any[] | null | undefined): any[] =>
|
||||
(st ?? []).map((s) => {
|
||||
if (!String(s?.colId ?? '').startsWith('award_')) return s;
|
||||
const { hide: _hide, ...rest } = s as any;
|
||||
return rest;
|
||||
});
|
||||
|
||||
export function RecentQSOsGrid({ rows, myGrid, selectAllSignal, selectRowSignal, rowDragCall, passOrder, onGridApi, storageKey, onRowDoubleClicked, onRowClicked, onRowSelected, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onSendTo, onSendRecording, onSendEQSL, onBulkEdit, onExportSelected, onExportSelectedFields, onExportFiltered, onExportCabrilloSelected, onExportCabrilloFiltered, onDelete, onFilteredCountChange, awardCols }: Props) {
|
||||
export function RecentQSOsGrid({ rows, myGrid, selectAllSignal, selectRowSignal, rowDragCall, passOrder, onGridApi, storageKey, onRowDoubleClicked, onRowClicked, onRowSelected, onRowSelectedQso, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onSendTo, onSendRecording, onSendEQSL, onBulkEdit, onExportSelected, onExportSelectedFields, onExportFiltered, onExportCabrilloSelected, onExportCabrilloFiltered, onDelete, onFilteredCountChange, awardCols }: Props) {
|
||||
const { t } = useI18n();
|
||||
const gridRef = useRef<any>(null);
|
||||
const [pickerOpen, setPickerOpen] = useState(false);
|
||||
@@ -464,12 +480,12 @@ export function RecentQSOsGrid({ rows, myGrid, selectAllSignal, selectRowSignal,
|
||||
function onGridReady(e: GridReadyEvent) {
|
||||
onGridApi?.(e.api);
|
||||
const local = loadLocal(colStateKey);
|
||||
if (local) e.api.applyColumnState({ state: sanitizeState(stripAwardCols(local)) as ColumnState[], applyOrder: true });
|
||||
if (local) e.api.applyColumnState({ state: sanitizeState(sanitizeAwardCols(local)) as ColumnState[], applyOrder: true });
|
||||
// Fall back to the portable DB copy when the local cache is empty
|
||||
// (fresh machine / after a reinstall), then re-seed the cache.
|
||||
loadRemote(colStateKey).then((remote) => {
|
||||
if (remote && !local) {
|
||||
e.api.applyColumnState({ state: sanitizeState(stripAwardCols(remote)) as ColumnState[], applyOrder: true });
|
||||
e.api.applyColumnState({ state: sanitizeState(sanitizeAwardCols(remote)) as ColumnState[], applyOrder: true });
|
||||
seedLocal(colStateKey, remote);
|
||||
}
|
||||
});
|
||||
@@ -493,7 +509,7 @@ export function RecentQSOsGrid({ rows, myGrid, selectAllSignal, selectRowSignal,
|
||||
if (restoringRef.current) return; // ignore the events fired by a column rebuild
|
||||
const state = gridRef.current?.api?.getColumnState();
|
||||
if (!state) return;
|
||||
saveState(colStateKey, stripAwardCols(state));
|
||||
saveState(colStateKey, sanitizeAwardCols(state));
|
||||
// Award columns are stripped above, so persist their widths on the side.
|
||||
let changed = false;
|
||||
for (const s of state) {
|
||||
@@ -521,7 +537,7 @@ export function RecentQSOsGrid({ rows, myGrid, selectAllSignal, selectRowSignal,
|
||||
useEffect(() => {
|
||||
const api = gridRef.current?.api;
|
||||
const local = loadLocal(colStateKey);
|
||||
if (api && local) api.applyColumnState({ state: sanitizeState(stripAwardCols(local)) as ColumnState[], applyOrder: true });
|
||||
if (api && local) api.applyColumnState({ state: sanitizeState(sanitizeAwardCols(local)) as ColumnState[], applyOrder: true });
|
||||
// Re-enable saving once AG Grid has settled the column events from the rebuild.
|
||||
const t = window.setTimeout(() => { restoringRef.current = false; }, 0);
|
||||
return () => window.clearTimeout(t);
|
||||
@@ -542,6 +558,7 @@ export function RecentQSOsGrid({ rows, myGrid, selectAllSignal, selectRowSignal,
|
||||
setSelCount(sel.length);
|
||||
setDispCount(api?.getDisplayedRowCount?.() ?? 0);
|
||||
onRowSelected?.(sel.map((r) => r.id as number).filter((id) => id != null));
|
||||
onRowSelectedQso?.(sel[0] ?? null);
|
||||
}
|
||||
// Select every row when the caller bumps selectAllSignal (QSL Manager search).
|
||||
useEffect(() => {
|
||||
|
||||
@@ -2,7 +2,7 @@ import { useEffect, useMemo, useRef, useState } from 'react';
|
||||
import {
|
||||
ArrowDown, ArrowUp, ArrowLeft, ArrowRight, Copy, Plus, Star, StarOff, Trash2,
|
||||
ChevronDown, ChevronRight,
|
||||
User, Database, Radio, Cog, Server, Award, Antenna as AntennaIcon,
|
||||
User, Database, Radio, Cog, Server, Antenna as AntennaIcon,
|
||||
Compass, Wifi, Construction, UploadCloud, Loader2, FolderOpen, Play, Power, Check, Pencil,
|
||||
} from 'lucide-react';
|
||||
import {
|
||||
@@ -26,7 +26,8 @@ import {
|
||||
AudioStartMonitor, AudioStopMonitor, AudioMonitorActive,
|
||||
AudioStartTX, AudioStopTX, AudioTXActive,
|
||||
ListClusterServers, SaveClusterServer, DeleteClusterServer,
|
||||
GetClusterAutoConnect, SetClusterAutoConnect,
|
||||
GetClusterAutoConnect, SetClusterAutoConnect, GetSelfSpotSettings, SaveSelfSpotSettings,
|
||||
GetWorkedCallVariants, SetWorkedCallVariants,
|
||||
ConnectClusterServer, DisconnectClusterServer,
|
||||
ConnectAllClusters, DisconnectAllClusters, GetClusterStatus,
|
||||
GetBackupSettings, SaveBackupSettings, RunBackupNow, PickBackupFolder,
|
||||
@@ -50,6 +51,8 @@ import {
|
||||
GetFlexState, GetFlexBandAntennas, SaveFlexBandAntennas, GetFlexBandPower, SaveFlexBandPower,
|
||||
GetADIFMonitor, SaveADIFMonitor, PickADIFMonitorFile,
|
||||
GetRelayAuto, SaveRelayAuto, GetStationDevices,
|
||||
GetAwardDefs, GetTrackedAwards, SaveTrackedAwards,
|
||||
GetBandOpenSettings, SaveBandOpenSettings, GetPSKReporterStatus,
|
||||
} from '../../wailsjs/go/main/App';
|
||||
import type { profile as profileModels } from '../../wailsjs/go/models';
|
||||
import type { LookupSettingsForm, StationSettingsForm, ListsSettingsForm, ModePresetForm } from '@/types';
|
||||
@@ -59,6 +62,7 @@ import { EventsOn } from '../../wailsjs/runtime/runtime';
|
||||
import {
|
||||
Dialog, DialogContent, DialogHeader, DialogTitle, DialogFooter, DialogDescription,
|
||||
} from '@/components/ui/dialog';
|
||||
import { WebPublishPanel } from '@/components/WebPublishPanel';
|
||||
import { Button } from '@/components/ui/button';
|
||||
import { Input } from '@/components/ui/input';
|
||||
import { Label } from '@/components/ui/label';
|
||||
@@ -141,7 +145,7 @@ const emptyProfile = (): Profile => ({
|
||||
my_grid: '', my_country: '',
|
||||
my_state: '', my_cnty: '',
|
||||
my_street: '', my_city: '', my_postal_code: '',
|
||||
my_sota_ref: '', my_pota_ref: '',
|
||||
my_sota_ref: '', my_pota_ref: '', my_iota: '',
|
||||
my_rig: '', my_antenna: '',
|
||||
tx_pwr: undefined,
|
||||
is_active: false,
|
||||
@@ -180,6 +184,7 @@ type SectionId =
|
||||
| 'external-services'
|
||||
| 'udp'
|
||||
| 'adifmon'
|
||||
| 'webpublish'
|
||||
| 'lookup'
|
||||
| 'lists-bands'
|
||||
| 'lists-modes'
|
||||
@@ -254,6 +259,7 @@ function buildTree(flexAvailable: boolean, t: (k: string) => string): TreeNode[]
|
||||
{ kind: 'item', label: t('sec.profiles'), id: 'profiles' },
|
||||
{ kind: 'item', label: t('sec.operating'), id: 'operating' },
|
||||
{ kind: 'item', label: t('sec.confirmations'), id: 'confirmations' },
|
||||
{ kind: 'item', label: t('sec.awards'), id: 'awards' },
|
||||
{ kind: 'item', label: t('sec.external'), id: 'external-services' },
|
||||
],
|
||||
},
|
||||
@@ -269,6 +275,7 @@ function buildTree(flexAvailable: boolean, t: (k: string) => string): TreeNode[]
|
||||
{ kind: 'item', label: t('sec.cluster'), id: 'cluster' },
|
||||
{ kind: 'item', label: t('sec.udp'), id: 'udp' },
|
||||
{ kind: 'item', label: t('sec.adifmon'), id: 'adifmon' },
|
||||
{ kind: 'item', label: t('sec.webpublish'), id: 'webpublish' },
|
||||
{ kind: 'item', label: t('sec.uscounties'), id: 'uscounties' },
|
||||
{ kind: 'item', label: t('sec.database'), id: 'database' },
|
||||
{ kind: 'item', label: t('sec.autostart'), id: 'autostart' },
|
||||
@@ -286,6 +293,7 @@ const SECTION_KEY: Partial<Record<SectionId, string>> = {
|
||||
'external-services': 'sec.external', lookup: 'sec.lookup', 'lists-bands': 'sec.bands', 'lists-modes': 'sec.modes',
|
||||
cluster: 'sec.cluster', backup: 'sec.backup', database: 'sec.database', autostart: 'sec.autostart', udp: 'sec.udp',
|
||||
adifmon: 'sec.adifmon',
|
||||
webpublish: 'sec.webpublish',
|
||||
uscounties: 'sec.uscounties',
|
||||
awards: 'sec.awards', cat: 'sec.cat', rotator: 'sec.rotator', winkeyer: 'sec.winkeyer', antenna: 'sec.antenna',
|
||||
antgenius: 'sec.antgenius', tunergenius: 'sec.tunergenius', pgxl: 'sec.pgxl', flex: 'sec.flex', audio: 'sec.audio', general: 'sec.general', email: 'sec.email',
|
||||
@@ -308,6 +316,7 @@ const SECTION_LABELS: Partial<Record<SectionId, string>> = {
|
||||
autostart: 'Autostart',
|
||||
udp: 'UDP integrations',
|
||||
adifmon: 'ADIF monitor',
|
||||
webpublish: 'Web publishing',
|
||||
awards: 'Awards',
|
||||
cat: 'CAT interface',
|
||||
rotator: 'Rotator',
|
||||
@@ -400,9 +409,13 @@ const THEME_SWATCH: Record<Exclude<ThemeChoice, 'auto'>, { bg: string; card: str
|
||||
'light-warm': { bg: '#e8dfc9', card: '#faf6ea', accent: '#b8410c' },
|
||||
'light-cool': { bg: '#f4f6f8', card: '#ffffff', accent: '#2563eb' },
|
||||
'light-sage': { bg: '#eef1ec', card: '#f8faf6', accent: '#2f855a' },
|
||||
'light-nordic': { bg: '#eef1f7', card: '#ffffff', accent: '#4f46e5' },
|
||||
'dim-slate': { bg: '#343b47', card: '#3d4552', accent: '#fb923c' },
|
||||
'dark-warm': { bg: '#221d18', card: '#2e2820', accent: '#e07a2e' },
|
||||
'dark-graphite': { bg: '#16181d', card: '#1f232b', accent: '#f97316' },
|
||||
'dark-indigo': { bg: '#0e0f1f', card: '#181a30', accent: '#7c6cff' },
|
||||
'dark-teal': { bg: '#061c21', card: '#0d2c33', accent: '#22d3ee' },
|
||||
'dark-plum': { bg: '#180f1e', card: '#251830', accent: '#f472b6' },
|
||||
'high-contrast': { bg: '#000000', card: '#0d0d0d', accent: '#ff7a1a' },
|
||||
};
|
||||
|
||||
@@ -673,6 +686,9 @@ type AmpUI = { id: string; name: string; enabled: boolean; type: string; transpo
|
||||
type RelayRuleUI = { device_id: string; relay: number; mode: string; freq_lo_khz: number; freq_hi_khz: number; bands: string[] };
|
||||
type StationDevUI = { id: string; type: string; name: string; labels: string[] };
|
||||
const RELAY_BANDS = ['160m', '80m', '60m', '40m', '30m', '20m', '17m', '15m', '12m', '10m', '6m', '4m', '2m', '70cm'];
|
||||
// Bands a motorized HF/6 m antenna (Ultrabeam / SteppIR) can cover — the follow
|
||||
// filter is a subset of these. Must match motorBands in app.go, low → high.
|
||||
const MOTOR_BANDS = ['40m', '30m', '20m', '17m', '15m', '12m', '10m', '6m'];
|
||||
const relayCountUI = (type: string) => (type === 'kmtronic' || type === 'denkovi' ? 8 : 5);
|
||||
|
||||
// Live status + OPERATE/STANDBY toggle for ONE configured amplifier (by config
|
||||
@@ -941,6 +957,91 @@ function FlexDiscover({ onPick }: { onPick: (ip: string, port: number) => void }
|
||||
);
|
||||
}
|
||||
|
||||
// AwardsSelectionPanel is a two-column transfer list: every defined award on the
|
||||
// left, the ones the operator follows on the right. The Awards tab shows only the
|
||||
// followed set (empty = all). Per-profile, saved immediately (local SQLite).
|
||||
function AwardsSelectionPanel({ profile }: { profile?: { name?: string; callsign?: string } }) {
|
||||
const { t } = useI18n();
|
||||
const [all, setAll] = useState<{ code: string; name: string }[]>([]);
|
||||
const [tracked, setTracked] = useState<string[]>([]);
|
||||
const [err, setErr] = useState('');
|
||||
const [q, setQ] = useState('');
|
||||
|
||||
useEffect(() => {
|
||||
(async () => {
|
||||
try {
|
||||
const [defs, tr] = await Promise.all([
|
||||
GetAwardDefs().then((d) => (d ?? []) as any[]),
|
||||
GetTrackedAwards().then((v) => (v ?? []) as string[]).catch(() => [] as string[]),
|
||||
]);
|
||||
setAll(defs.map((d) => ({ code: d.code, name: d.name })).sort((a, b) => a.code.localeCompare(b.code)));
|
||||
setTracked(tr);
|
||||
} catch (e: any) { setErr(String(e?.message ?? e)); }
|
||||
})();
|
||||
}, []);
|
||||
|
||||
async function persist(next: string[]) {
|
||||
setTracked(next);
|
||||
try { await SaveTrackedAwards(next); } catch (e: any) { setErr(String(e?.message ?? e)); }
|
||||
}
|
||||
const trackedSet = new Set(tracked);
|
||||
const byCode = new Map(all.map((a) => [a.code, a] as const));
|
||||
const needle = q.trim().toLowerCase();
|
||||
const available = all.filter((a) => !trackedSet.has(a.code)
|
||||
&& (needle === '' || `${a.code} ${a.name}`.toLowerCase().includes(needle)));
|
||||
const trackedItems = (tracked.map((c) => byCode.get(c)).filter(Boolean) as { code: string; name: string }[])
|
||||
.sort((a, b) => a.code.localeCompare(b.code));
|
||||
|
||||
return (
|
||||
<div>
|
||||
<SectionHeader title={t('sec.awards')} hint={t('awards.followHint')} />
|
||||
<ProfileScopeNote profile={profile} />
|
||||
{err && <div className="mb-2 text-xs text-destructive">{err}</div>}
|
||||
<div className="grid grid-cols-2 gap-3">
|
||||
<div className="rounded-lg border border-border bg-card/40 flex flex-col">
|
||||
<div className="flex items-center justify-between px-3 py-2 border-b border-border/60">
|
||||
<span className="text-sm font-medium">{t('awards.available')} <span className="text-muted-foreground">({available.length})</span></span>
|
||||
<button type="button" className="text-xs text-primary hover:underline disabled:opacity-40"
|
||||
disabled={available.length === 0} onClick={() => persist(all.map((a) => a.code))}>{t('awards.addAll')}</button>
|
||||
</div>
|
||||
<div className="p-2 border-b border-border/60">
|
||||
<Input value={q} onChange={(e) => setQ(e.target.value)} placeholder={t('awards.search')} className="h-8" />
|
||||
</div>
|
||||
<div className="max-h-[340px] overflow-y-auto p-1.5 space-y-0.5">
|
||||
{available.map((a) => (
|
||||
<button key={a.code} type="button" onClick={() => persist([...tracked, a.code])}
|
||||
className="group w-full flex items-center gap-2 rounded-md px-2 py-1 text-left hover:bg-primary/10">
|
||||
<span className="font-mono text-xs shrink-0">{a.code}</span>
|
||||
<span className="text-xs text-muted-foreground truncate flex-1">{a.name}</span>
|
||||
<span className="text-primary opacity-0 group-hover:opacity-100">→</span>
|
||||
</button>
|
||||
))}
|
||||
{available.length === 0 && <div className="p-2 text-xs text-muted-foreground">{t('awards.allTracked')}</div>}
|
||||
</div>
|
||||
</div>
|
||||
<div className="rounded-lg border border-primary/40 bg-primary/5 flex flex-col">
|
||||
<div className="flex items-center justify-between px-3 py-2 border-b border-border/60">
|
||||
<span className="text-sm font-medium">{t('awards.followed')} <span className="text-muted-foreground">({tracked.length})</span></span>
|
||||
<button type="button" className="text-xs text-primary hover:underline disabled:opacity-40"
|
||||
disabled={tracked.length === 0} onClick={() => persist([])}>{t('awards.clear')}</button>
|
||||
</div>
|
||||
<div className="max-h-[392px] overflow-y-auto p-1.5 space-y-0.5">
|
||||
{trackedItems.map((a) => (
|
||||
<button key={a.code} type="button" onClick={() => persist(tracked.filter((c) => c !== a.code))}
|
||||
className="group w-full flex items-center gap-2 rounded-md px-2 py-1 text-left hover:bg-primary/10">
|
||||
<span className="text-muted-foreground opacity-0 group-hover:opacity-100">←</span>
|
||||
<span className="font-mono text-xs shrink-0">{a.code}</span>
|
||||
<span className="text-xs text-muted-foreground truncate flex-1">{a.name}</span>
|
||||
</button>
|
||||
))}
|
||||
{tracked.length === 0 && <div className="p-2 text-xs text-muted-foreground">{t('awards.noneFollowed')}</div>}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
function ComingSoon({ id, icon: Icon }: { id: SectionId; icon?: any }) {
|
||||
const label = SECTION_LABELS[id] ?? id;
|
||||
const IconCmp = Icon ?? Construction;
|
||||
@@ -1136,7 +1237,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
const [modeDraft, setModeDraft] = useState('');
|
||||
const [catCfg, setCatCfg] = useState<CATSettings>({
|
||||
enabled: false, backend: 'omnirig', omnirig_rig: 1, omnirig_vfo: '', flex_host: '', flex_port: 4992, flex_spots: false, flex_decode_spots: false, flex_decode_secs: 120,
|
||||
yaesu_port: '', yaesu_baud: 38400, yaesu_low_lines: false, kenwood_low_lines: false, kenwood_port: '', kenwood_baud: 9600, kenwood_host: '', xiegu_port: '', xiegu_baud: 19200, xiegu_addr: 0x70, xiegu_ptt_line: '',
|
||||
yaesu_port: '', yaesu_baud: 38400, yaesu_low_lines: false, kenwood_low_lines: false, kenwood_port: '', kenwood_baud: 9600, kenwood_host: '', kenwood_data_mode: 'usb', xiegu_port: '', xiegu_baud: 19200, xiegu_addr: 0x70, xiegu_ptt_line: '',
|
||||
icom_port: '', icom_baud: 115200, icom_addr: 0x98, icom_net_host: '', icom_net_user: '', icom_net_pass: '', icom_net_audio: false,
|
||||
tci_host: '', tci_port: 40001, tci_spots: false, poll_ms: 250, delay_ms: 0,
|
||||
digital_default: 'FT8', share_enabled: false, share_port: 4532,
|
||||
@@ -1149,8 +1250,8 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
const [rotatorTest, setRotatorTest] = useState<{ ok: boolean; msg: string } | null>(null);
|
||||
|
||||
// Motorized antenna (Ultrabeam TCP or SteppIR TCP/serial) settings.
|
||||
const [ultrabeam, setUltrabeam] = useState<{ enabled: boolean; type: string; transport: string; host: string; port: number; com: string; baud: number; follow: boolean; step_khz: number; tx_inhibit: boolean; freq_min_mhz: number; freq_max_mhz: number }>({
|
||||
enabled: false, type: 'ultrabeam', transport: 'tcp', host: '', port: 23, com: '', baud: 9600, follow: false, step_khz: 50, tx_inhibit: false, freq_min_mhz: 13, freq_max_mhz: 54,
|
||||
const [ultrabeam, setUltrabeam] = useState<{ enabled: boolean; type: string; transport: string; host: string; port: number; com: string; baud: number; follow: boolean; step_khz: number; tx_inhibit: boolean; bands: string[]; freq_min_mhz: number; freq_max_mhz: number }>({
|
||||
enabled: false, type: 'ultrabeam', transport: 'tcp', host: '', port: 23, com: '', baud: 9600, follow: false, step_khz: 50, tx_inhibit: false, bands: [], freq_min_mhz: 13, freq_max_mhz: 54,
|
||||
});
|
||||
const [ubTesting, setUbTesting] = useState(false);
|
||||
const [ubTest, setUbTest] = useState<{ ok: boolean; msg: string } | null>(null);
|
||||
@@ -1246,6 +1347,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
const [startEqEnd, setStartEqEnd] = useState(() => localStorage.getItem('opslog.startEqualsEnd') === '1');
|
||||
const [lookupOnBlur, setLookupOnBlur] = useState(() => localStorage.getItem('opslog.lookupOnBlur') === '1');
|
||||
const [groupDigital, setGroupDigital] = useState(() => localStorage.getItem('opslog.groupDigitalSlots') === '1');
|
||||
const [clusterWorkedSameSlot, setClusterWorkedSameSlot] = useState(() => localStorage.getItem('opslog.clusterWorkedSameSlot') === '1');
|
||||
const [showQsoRate, setShowQsoRate] = useState(() => localStorage.getItem('opslog.showQsoRate') === '1');
|
||||
const [catModeBeforeFreq, setCatModeBeforeFreq] = useState(() => localStorage.getItem('opslog.catModeBeforeFreq') === '1');
|
||||
// Password-encryption (secret vault) state.
|
||||
@@ -1282,8 +1384,8 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
const [emailMsg, setEmailMsg] = useState('');
|
||||
const setEmailField = (patch: Partial<EmailCfg>) => setEmailCfg((s) => ({ ...s, ...patch }));
|
||||
// eQSL card e-mail (subject/body templates + auto-send on log).
|
||||
type EQSLCfg = { subject: string; body: string; auto_send: boolean };
|
||||
const [eqslCfg, setEqslCfg] = useState<EQSLCfg>({ subject: '', body: '', auto_send: false });
|
||||
type EQSLCfg = { subject: string; body: string; auto_send: boolean; default_message: string };
|
||||
const [eqslCfg, setEqslCfg] = useState<EQSLCfg>({ subject: '', body: '', auto_send: false, default_message: '' });
|
||||
const setEqslField = (patch: Partial<EQSLCfg>) => setEqslCfg((s) => ({ ...s, ...patch }));
|
||||
// ClubLog Country File (cty.xml) exception status.
|
||||
type ClubInfo = { enabled: boolean; loaded: boolean; date: string; count: number };
|
||||
@@ -1433,19 +1535,50 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
|
||||
const [clusterServers, setClusterServers] = useState<ClusterServer[]>([]);
|
||||
const [clusterAutoConnect, setClusterAutoConnectState] = useState(false);
|
||||
// Defaults to true so the checkbox matches the backend before the read lands.
|
||||
const [workedVariants, setWorkedVariants] = useState(true);
|
||||
// Self-spot. SELF_SPOT_MIN_MIN mirrors the backend floor — the input clamps on
|
||||
// blur, not per keystroke, or typing "10" would be rewritten to "5" the moment
|
||||
// the "1" landed and the field would fight the operator.
|
||||
const SELF_SPOT_MIN_MIN = 5;
|
||||
// Band-opening watch. Saved through the backend rather than as a UI pref: it
|
||||
// has side effects there — adding the RBN nodes, bringing the PSK Reporter
|
||||
// feed up or down — so the write has to go where those live.
|
||||
const [bandOpen, setBandOpen] = useState<any>({ enabled: false, bands: [], available: [] });
|
||||
const [pskrStatus, setPskrStatus] = useState<any>(null);
|
||||
const saveBandOpen = async (next: any) => {
|
||||
setBandOpen(next);
|
||||
try { await SaveBandOpenSettings(next); } catch { /* the status line shows the result */ }
|
||||
};
|
||||
useEffect(() => {
|
||||
(async () => {
|
||||
try { setBandOpen(await GetBandOpenSettings()); } catch { /* defaults stand */ }
|
||||
})();
|
||||
// Poll the feed while the panel is open: a live count is the only thing that
|
||||
// distinguishes "connected" from "connected and receiving nothing".
|
||||
const t = window.setInterval(async () => {
|
||||
try { setPskrStatus(await GetPSKReporterStatus()); } catch { /* ignore */ }
|
||||
}, 3000);
|
||||
return () => window.clearInterval(t);
|
||||
}, []);
|
||||
const [selfSpot, setSelfSpot] = useState({ enabled: false, minutes: SELF_SPOT_MIN_MIN });
|
||||
const [selfSpotText, setSelfSpotText] = useState(String(SELF_SPOT_MIN_MIN));
|
||||
const [clusterStatuses, setClusterStatuses] = useState<ClusterServerStatus[]>([]);
|
||||
const [editingServer, setEditingServer] = useState<ClusterServer | null>(null);
|
||||
|
||||
async function reloadClusterServers() {
|
||||
try {
|
||||
const [list, ac, st] = await Promise.all([
|
||||
const [list, ac, st, ss] = await Promise.all([
|
||||
ListClusterServers(),
|
||||
GetClusterAutoConnect(),
|
||||
GetClusterStatus(),
|
||||
GetSelfSpotSettings(),
|
||||
]);
|
||||
setClusterServers((list ?? []) as ClusterServer[]);
|
||||
setClusterAutoConnectState(ac);
|
||||
setClusterStatuses((st ?? []) as ClusterServerStatus[]);
|
||||
setSelfSpot(ss as any);
|
||||
setSelfSpotText(String((ss as any).minutes ?? SELF_SPOT_MIN_MIN));
|
||||
} catch (e: any) { setErr(String(e?.message ?? e)); }
|
||||
}
|
||||
|
||||
@@ -1532,6 +1665,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
try { setAudioCfg(await GetAudioSettings() as any); } catch {}
|
||||
try { setEmailCfg(await GetEmailSettings() as any); } catch {}
|
||||
try { setEqslCfg(await QSLGetEmailTemplates() as any); } catch {}
|
||||
try { setWorkedVariants(await GetWorkedCallVariants()); } catch {}
|
||||
reloadAudioDevices();
|
||||
reloadDvk();
|
||||
} catch (e: any) {
|
||||
@@ -1741,6 +1875,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
my_grid: (activeProfile.my_grid ?? '').trim().toUpperCase(),
|
||||
my_sota_ref: (activeProfile.my_sota_ref ?? '').trim().toUpperCase(),
|
||||
my_pota_ref: (activeProfile.my_pota_ref ?? '').trim().toUpperCase(),
|
||||
my_iota: (activeProfile.my_iota ?? '').trim().toUpperCase(),
|
||||
} as any);
|
||||
}
|
||||
await SaveLookupSettings(lookup as any);
|
||||
@@ -1758,6 +1893,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
await SaveQSLDefaults(qslDefaults as any);
|
||||
await SaveExternalServices(extSvc as any);
|
||||
await SetClusterAutoConnect(clusterAutoConnect);
|
||||
await SaveSelfSpotSettings(selfSpot as any);
|
||||
|
||||
setMsg('Settings saved.');
|
||||
onSaved();
|
||||
@@ -1899,6 +2035,10 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
<Label>{t('station.pota')}</Label>
|
||||
<Input className="font-mono uppercase" value={p.my_pota_ref ?? ''} onChange={(e) => updateActive({ my_pota_ref: e.target.value })} placeholder="FF-1234" />
|
||||
</div>
|
||||
<div className="space-y-1">
|
||||
<Label>{t('station.iota')}</Label>
|
||||
<Input className="font-mono uppercase" value={p.my_iota ?? ''} onChange={(e) => updateActive({ my_iota: e.target.value })} placeholder="EU-005" />
|
||||
</div>
|
||||
</div>
|
||||
</>
|
||||
);
|
||||
@@ -2436,6 +2576,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
<SelectItem value="flex">{t('cat.optFlex')}</SelectItem>
|
||||
<SelectItem value="yaesu">{t('cat.optYaesu')}</SelectItem>
|
||||
<SelectItem value="kenwood">{t('cat.optKenwood')}</SelectItem>
|
||||
<SelectItem value="elecraft">{t('cat.optElecraft')}</SelectItem>
|
||||
<SelectItem value="xiegu">{t('cat.optXiegu')}</SelectItem>
|
||||
<SelectItem value="icom">{t('cat.optIcom')}</SelectItem>
|
||||
<SelectItem value="icom-net">{t('cat.optIcomNet')}</SelectItem>
|
||||
@@ -2595,11 +2736,9 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
||||
<Checkbox checked={civTrace} onCheckedChange={(c) => { setCivTrace(!!c); SetCIVTrace(!!c); }} />
|
||||
{t('cat.civTrace')}
|
||||
</label>
|
||||
<p className="text-[10px] text-muted-foreground mt-1">{t('cat.civTraceHint')}</p>
|
||||
</div>
|
||||
</label> </div>
|
||||
)}
|
||||
{catCfg.backend === 'kenwood' && (
|
||||
{(catCfg.backend === 'kenwood' || catCfg.backend === 'elecraft') && (
|
||||
<>
|
||||
<div className="space-y-1">
|
||||
<Label>{t('cat.kenwoodPort')}</Label>
|
||||
@@ -2613,9 +2752,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
</Select>
|
||||
<Button type="button" variant="outline" size="sm"
|
||||
onClick={() => ListSerialPorts().then((p) => setWkPorts((p ?? []) as string[])).catch(() => {})}>↻</Button>
|
||||
</div>
|
||||
<span className="text-xs text-muted-foreground">{t('cat.kenwoodPortHint')}</span>
|
||||
</div>
|
||||
</div> </div>
|
||||
<div className="space-y-1">
|
||||
<Label>{t('cat.baud')}</Label>
|
||||
<Select value={String(catCfg.kenwood_baud || 9600)} onValueChange={(v) => setCatCfg((s) => ({ ...s, kenwood_baud: parseInt(v) || 9600 }))}>
|
||||
@@ -2623,18 +2760,14 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
<SelectContent>
|
||||
{[4800, 9600, 19200, 38400, 57600, 115200].map((r) => <SelectItem key={r} value={String(r)}>{r}</SelectItem>)}
|
||||
</SelectContent>
|
||||
</Select>
|
||||
<span className="text-xs text-muted-foreground">{t('cat.kenwoodBaudHint')}</span>
|
||||
</div>
|
||||
</Select> </div>
|
||||
<div className="space-y-1">
|
||||
<Label>{t('cat.kenwoodHost')}</Label>
|
||||
<Input
|
||||
value={catCfg.kenwood_host || ''}
|
||||
placeholder="192.168.1.50:4532"
|
||||
onChange={(e) => setCatCfg((s) => ({ ...s, kenwood_host: e.target.value }))}
|
||||
/>
|
||||
<span className="text-xs text-muted-foreground">{t('cat.kenwoodHostHint')}</span>
|
||||
</div>
|
||||
/> </div>
|
||||
<div className="space-y-1">
|
||||
<label className="flex items-center gap-2 text-xs cursor-pointer">
|
||||
<Checkbox checked={!!catCfg.kenwood_low_lines} onCheckedChange={(c) => setCatCfg((s) => ({ ...s, kenwood_low_lines: !!c }))} />
|
||||
@@ -2642,6 +2775,21 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
</label>
|
||||
<span className="text-xs text-muted-foreground">{t('cat.lowerLinesHint')}</span>
|
||||
</div>
|
||||
{catCfg.backend === 'kenwood' ? (
|
||||
<div className="space-y-1">
|
||||
<Label>{t('cat.kwDataMode')}</Label>
|
||||
<Select value={(catCfg as any).kenwood_data_mode || 'usb'} onValueChange={(v) => setCatCfg((s) => ({ ...s, kenwood_data_mode: v } as any))}>
|
||||
<SelectTrigger className="h-8"><SelectValue /></SelectTrigger>
|
||||
<SelectContent>
|
||||
<SelectItem value="usb">{t('cat.kwDataUsb')}</SelectItem>
|
||||
<SelectItem value="data">{t('cat.kwDataMd6')}</SelectItem>
|
||||
<SelectItem value="keep">{t('cat.kwDataKeep')}</SelectItem>
|
||||
</SelectContent>
|
||||
</Select>
|
||||
</div>
|
||||
) : (
|
||||
<span className="text-xs text-muted-foreground">{t('cat.elecraftHint')}</span>
|
||||
)}
|
||||
</>
|
||||
)}
|
||||
{catCfg.backend === 'icom' && (
|
||||
@@ -2855,9 +3003,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
onCheckedChange={(c) => setCatCfg((s) => ({ ...s, ptt_hotkey_toggle: !!c } as any))}
|
||||
/>
|
||||
{t('cat.pttKeyToggle')}
|
||||
</label>
|
||||
<p className="text-[11px] text-muted-foreground">{t('cat.pttKeyHint')}</p>
|
||||
</>
|
||||
</label> </>
|
||||
)}
|
||||
</div>
|
||||
{catCfg.backend === 'omnirig' && (
|
||||
@@ -3011,20 +3157,28 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
{isSteppir && (
|
||||
<div className="border-t border-border/60 pt-3 space-y-1">
|
||||
<div className="flex items-center gap-2 flex-wrap">
|
||||
<Label className="text-sm">{t('hw.steppirRange')}</Label>
|
||||
<input type="number" min={1} max={60} value={ultrabeam.freq_min_mhz}
|
||||
onChange={(e) => setUltrabeam((s) => ({ ...s, freq_min_mhz: parseInt(e.target.value, 10) || 0 }))}
|
||||
className="h-8 w-16 rounded-md border border-input bg-background px-2 text-sm" />
|
||||
<span className="text-xs text-muted-foreground">–</span>
|
||||
<input type="number" min={1} max={60} value={ultrabeam.freq_max_mhz}
|
||||
onChange={(e) => setUltrabeam((s) => ({ ...s, freq_max_mhz: parseInt(e.target.value, 10) || 0 }))}
|
||||
className="h-8 w-16 rounded-md border border-input bg-background px-2 text-sm" />
|
||||
<span className="text-xs text-muted-foreground">MHz</span>
|
||||
{(isSteppir || ultrabeam.type === 'ultrabeam') && (
|
||||
<div className="border-t border-border/60 pt-3 space-y-2">
|
||||
<Label className="text-sm">{t('hw.motorBands')}</Label>
|
||||
<div className="flex items-center gap-1.5 flex-wrap">
|
||||
{MOTOR_BANDS.map((b) => {
|
||||
const on = ultrabeam.bands.includes(b);
|
||||
return (
|
||||
<button key={b} type="button"
|
||||
onClick={() => setUltrabeam((s) => ({
|
||||
...s,
|
||||
bands: on ? s.bands.filter((x) => x !== b) : [...s.bands, b],
|
||||
}))}
|
||||
className={`h-8 min-w-[3rem] rounded-md border px-2 text-sm font-medium transition-colors ${
|
||||
on
|
||||
? 'border-primary bg-primary/15 text-primary'
|
||||
: 'border-input bg-background text-muted-foreground hover:bg-muted'
|
||||
}`}>
|
||||
{b}
|
||||
</button>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
<p className="text-xs text-muted-foreground">{t('hw.steppirRangeHint')}</p>
|
||||
</div>
|
||||
)}
|
||||
<div className="border-t border-border/60 pt-3 space-y-1">
|
||||
@@ -3387,6 +3541,8 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
const dev = d as any;
|
||||
const isRG = dev.type === 'rotgenius';
|
||||
const isARCO = dev.type === 'arco';
|
||||
const isDCU1 = dev.type === 'dcu1';
|
||||
const isSerialCap = isARCO || isDCU1; // COM-port or serial-over-IP controllers
|
||||
const transport = dev.transport ?? 'tcp';
|
||||
return (
|
||||
<div key={dev.id || i} className="rounded-xl border border-border bg-card/40 p-3 space-y-3">
|
||||
@@ -3405,12 +3561,13 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
{/* Each backend gets its default port: Rotator Genius 9006, ARCO 4001
|
||||
(placeholder — must match the ARCO's LAN menu), PstRotator 12000. */}
|
||||
<Select value={dev.type ?? 'pst'}
|
||||
onValueChange={(v) => patch(i, { type: v as any, port: v === 'rotgenius' ? 9006 : v === 'arco' ? 4001 : 12000 })}>
|
||||
onValueChange={(v) => patch(i, { type: v as any, port: v === 'rotgenius' ? 9006 : (v === 'arco' || v === 'dcu1') ? 4001 : 12000, ...(v === 'dcu1' ? { transport: 'serial' } : {}) })}>
|
||||
<SelectTrigger className="h-9"><SelectValue /></SelectTrigger>
|
||||
<SelectContent>
|
||||
<SelectItem value="pst">PstRotator (UDP)</SelectItem>
|
||||
<SelectItem value="rotgenius">Rotator Genius (4O3A, native)</SelectItem>
|
||||
<SelectItem value="arco">GS-232A controller (microHAM ARCO, ERC…)</SelectItem>
|
||||
<SelectItem value="dcu1">Hy-Gain DCU-1 (RotorCard DXA, Rotor-EZ, Green Heron)</SelectItem>
|
||||
</SelectContent>
|
||||
</Select>
|
||||
</div>
|
||||
@@ -3427,8 +3584,8 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
</Select>
|
||||
</div>
|
||||
)}
|
||||
{/* The ARCO is reachable over the LAN (TCP) or its USB virtual COM. */}
|
||||
{isARCO && (
|
||||
{/* ARCO and DCU-1 controllers reach over the LAN (TCP) or a serial COM. */}
|
||||
{isSerialCap && (
|
||||
<div className="space-y-1">
|
||||
<Label>Connection</Label>
|
||||
<Select value={transport} onValueChange={(v) => patch(i, { transport: v as any })}>
|
||||
@@ -3448,7 +3605,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
{t('rot.rgDual')}
|
||||
</label>
|
||||
)}
|
||||
{isARCO && transport === 'serial' ? (
|
||||
{isSerialCap && transport === 'serial' ? (
|
||||
<div className="space-y-1 max-w-xs">
|
||||
<Label>COM port</Label>
|
||||
<div className="flex items-center gap-2">
|
||||
@@ -3477,16 +3634,16 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
<div className="space-y-1 col-span-2">
|
||||
<Label>Host / IP</Label>
|
||||
<Input value={dev.host ?? ''} onChange={(e) => patch(i, { host: e.target.value })}
|
||||
placeholder={isRG || isARCO ? '192.168.1.60' : '127.0.0.1'} className="font-mono" />
|
||||
placeholder={isRG || isSerialCap ? '192.168.1.60' : '127.0.0.1'} className="font-mono" />
|
||||
</div>
|
||||
<div className="space-y-1">
|
||||
<Label>{isRG || isARCO ? 'TCP port' : 'UDP port'}</Label>
|
||||
<Label>{isRG || isSerialCap ? 'TCP port' : 'UDP port'}</Label>
|
||||
<PortInput value={dev.port} onChange={(n) => patch(i, { port: n })}
|
||||
fallback={isRG ? 9006 : isARCO ? 4001 : 12000} className="font-mono" />
|
||||
fallback={isRG ? 9006 : isSerialCap ? 4001 : 12000} className="font-mono" />
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
{!isRG && !isARCO && (
|
||||
{!isRG && !isSerialCap && (
|
||||
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
||||
<Checkbox checked={!!dev.has_elevation} onCheckedChange={(c) => patch(i, { has_elevation: !!c })} />
|
||||
This rotator supports elevation (VHF / satellite)
|
||||
@@ -3494,6 +3651,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
)}
|
||||
{isRG && <p className="text-xs text-muted-foreground">{t('rot.rgHint')}</p>}
|
||||
{isARCO && <p className="text-xs text-muted-foreground">{t('rot.arcoHint')}</p>}
|
||||
{isDCU1 && <p className="text-xs text-muted-foreground">{t('rot.dcu1Hint')}</p>}
|
||||
{/* Which antenna this rotor carries — only relevant with >1 rotor. */}
|
||||
{multi && (
|
||||
<div className="space-y-1 max-w-xs">
|
||||
@@ -4000,6 +4158,87 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
<span className="font-mono">dx.maritimecontestclub.net:7300</span>,{' '}
|
||||
<span className="font-mono">w8avi.net:7300</span>.
|
||||
</p>
|
||||
<label className="flex items-start gap-2 text-sm cursor-pointer border-t border-border/60 pt-3">
|
||||
<Checkbox checked={clusterWorkedSameSlot} className="mt-0.5"
|
||||
onCheckedChange={(c) => { const v = !!c; setClusterWorkedSameSlot(v); writeUiPref('opslog.clusterWorkedSameSlot', v ? '1' : '0'); }} />
|
||||
<span>{t('clu.workedSameSlot')} <span className="text-xs text-muted-foreground">{t('clu.workedSameSlotHint')}</span></span>
|
||||
</label>
|
||||
{/* "No colour on worked" and "colour what is unworked here" used to live
|
||||
here. They moved to the Cluster tab's filter panel, next to Hide
|
||||
worked: they are things an operator changes while working a run, not
|
||||
things set up once. A preferences dialog you reopen every ten minutes
|
||||
is a filter in the wrong place. */}
|
||||
|
||||
{/* Band-opening watch. It lives HERE, with the cluster nodes, because
|
||||
switching it on adds two of them — the operator should see that
|
||||
happen where it happens rather than find nodes they did not add. */}
|
||||
<div className="border-t border-border/60 pt-3 space-y-2">
|
||||
<label className="flex items-start gap-2 text-sm cursor-pointer">
|
||||
<Checkbox checked={bandOpen.enabled} className="mt-0.5"
|
||||
onCheckedChange={(c) => saveBandOpen({ ...bandOpen, enabled: !!c })} />
|
||||
<span>{t('bo.enable')} <span className="text-xs text-muted-foreground">{t('bo.enableHint')}</span></span>
|
||||
</label>
|
||||
{bandOpen.enabled && (
|
||||
<div className="pl-6 space-y-2">
|
||||
<div className="flex flex-wrap gap-1.5">
|
||||
{(bandOpen.available ?? []).map((b: string) => {
|
||||
const on = (bandOpen.bands ?? []).includes(b);
|
||||
return (
|
||||
<button key={b} type="button"
|
||||
onClick={() => saveBandOpen({
|
||||
...bandOpen,
|
||||
bands: on ? bandOpen.bands.filter((x: string) => x !== b) : [...(bandOpen.bands ?? []), b],
|
||||
})}
|
||||
className={cn('px-2 py-0.5 rounded-md border text-[11px] font-bold tracking-wider font-mono',
|
||||
on ? 'bg-primary text-primary-foreground border-primary' : 'text-muted-foreground border-border hover:bg-muted')}>
|
||||
{b}
|
||||
</button>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
{/* A live count, because a feed that is connected but silent looks
|
||||
exactly like one that is broken until a number moves. */}
|
||||
<p className="text-xs text-muted-foreground">
|
||||
{pskrStatus?.running
|
||||
? t('bo.feedUp', { n: pskrStatus.received ?? 0 })
|
||||
: t('bo.feedDown')}
|
||||
</p>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* Self-spot. The interval only shows once it's on — an interval for
|
||||
something switched off is just a question the operator can't act on. */}
|
||||
<div className="border-t border-border/60 pt-3 space-y-2">
|
||||
<div className="flex items-center gap-3 flex-wrap">
|
||||
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
||||
<Checkbox checked={selfSpot.enabled}
|
||||
onCheckedChange={(c) => setSelfSpot((s) => ({ ...s, enabled: !!c }))} />
|
||||
{t('clu.selfSpot')}
|
||||
</label>
|
||||
{selfSpot.enabled && (
|
||||
<div className="flex items-center gap-2 text-sm">
|
||||
<span className="text-muted-foreground">{t('clu.selfSpotEvery')}</span>
|
||||
<Input
|
||||
type="number"
|
||||
min={SELF_SPOT_MIN_MIN}
|
||||
max={240}
|
||||
className="w-20 h-8 font-mono text-xs"
|
||||
value={selfSpotText}
|
||||
onChange={(e) => setSelfSpotText(e.target.value)}
|
||||
onBlur={() => {
|
||||
const n = Math.floor(Number(selfSpotText));
|
||||
const v = Number.isFinite(n) && n > SELF_SPOT_MIN_MIN ? Math.min(n, 240) : SELF_SPOT_MIN_MIN;
|
||||
setSelfSpotText(String(v));
|
||||
setSelfSpot((s) => ({ ...s, minutes: v }));
|
||||
}}
|
||||
/>
|
||||
<span className="text-muted-foreground">{t('clu.selfSpotMinutes')}</span>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
<p className="text-xs text-muted-foreground leading-relaxed">{t('clu.selfSpotHint')}</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{editingServer && (
|
||||
@@ -4197,7 +4436,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
title={t('sec.backup')}
|
||||
hint={mysqlCfg.enabled ? t('bk.hintMysql') : t('bk.hint')}
|
||||
/>
|
||||
<div className="space-y-4 max-w-xl">
|
||||
<div className="space-y-5 max-w-2xl">
|
||||
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
||||
<Checkbox
|
||||
checked={!!backupCfg.enabled}
|
||||
@@ -4238,7 +4477,6 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="flex items-end gap-3">
|
||||
<div className="space-y-1.5">
|
||||
<Label className="text-xs text-muted-foreground">{t('bk.rotation')}</Label>
|
||||
<Input
|
||||
@@ -4253,13 +4491,39 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
<label className="flex items-center gap-2 text-sm cursor-pointer pb-2">
|
||||
|
||||
{/* Stacked, not one flex row: these labels are full sentences and the
|
||||
"keep every backup" hint is two lines — side by side they wrapped
|
||||
into unreadable slivers. It also puts keep-all under the option it
|
||||
depends on rather than beside it. */}
|
||||
<div className="space-y-2.5">
|
||||
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
||||
<Checkbox
|
||||
checked={!!backupCfg.zip}
|
||||
onCheckedChange={(c) => setBackupCfg((b) => ({ ...b, zip: !!c }))}
|
||||
/>
|
||||
<span>{t('bk.zip')}</span>
|
||||
</label>
|
||||
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
||||
<Checkbox
|
||||
checked={!!(backupCfg as any).every_exit}
|
||||
onCheckedChange={(c) => setBackupCfg((b) => ({ ...b, every_exit: !!c } as any))}
|
||||
/>
|
||||
<span>{t('bk.everyExit')}</span>
|
||||
</label>
|
||||
{!!(backupCfg as any).every_exit && (
|
||||
<label className="flex items-start gap-2 text-sm cursor-pointer pl-6">
|
||||
<Checkbox
|
||||
className="mt-0.5"
|
||||
checked={!!(backupCfg as any).keep_all}
|
||||
onCheckedChange={(c) => setBackupCfg((b) => ({ ...b, keep_all: !!c } as any))}
|
||||
/>
|
||||
<span>
|
||||
{t('bk.keepAll')}
|
||||
<span className="block text-xs text-muted-foreground mt-0.5 leading-relaxed">{t('bk.keepAllHint')}</span>
|
||||
</span>
|
||||
</label>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div className="border-t border-border/60 pt-3 flex items-center gap-3">
|
||||
@@ -5071,8 +5335,23 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
</div>
|
||||
<p className="text-[11px] text-muted-foreground">{t('db.appDbHint')}</p>
|
||||
<div className="flex flex-wrap gap-2">
|
||||
<Button variant="outline" size="sm" onClick={createNew}><Plus className="size-3.5" /> {t('db.newDb')}</Button>
|
||||
<Button variant="outline" size="sm" onClick={openExisting}><Database className="size-3.5" /> {t('db.openExisting')}</Button>
|
||||
<Button variant="outline" size="sm" onClick={saveCopy}><Copy className="size-3.5" /> {t('db.saveCopy')}</Button>
|
||||
<Button variant="outline" size="sm" onClick={renameDb} title={t('db.renameTip')}><Pencil className="size-3.5" /> {t('db.rename')}</Button>
|
||||
<Button variant="outline" size="sm" onClick={revealFolder}><FolderOpen className="size-3.5" /> {t('db.openFolder')}</Button>
|
||||
{dbSettings.is_custom && <Button variant="ghost" size="sm" onClick={resetDefault}>{t('db.resetDefault')}</Button>}
|
||||
</div>
|
||||
{/* The DB pointer is only read at startup, so offer the restart inline. */}
|
||||
{dbMsg && (
|
||||
<div className="text-[11px] text-success space-y-1 pt-1">
|
||||
<div>{t('db.savedRestart')} <span className="font-mono break-all">{dbMsg}</span></div>
|
||||
<Button size="sm" className="h-7" onClick={() => RestartApp().catch((e: any) => setErr(String(e?.message ?? e)))}>
|
||||
<Power className="size-3.5" /> {t('db.restartNow')}
|
||||
</Button>
|
||||
<span className="ml-2 text-muted-foreground">{t('db.restartHint')}</span>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* Logbook (QSOs) — this profile: default SQLite file, a dedicated file, or MySQL. */}
|
||||
@@ -5469,6 +5748,13 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
<Checkbox checked={autofocusWB} onCheckedChange={(c) => { const v = !!c; setAutofocusWB(v); writeUiPref('opslog.autofocusWB', v ? '1' : '0'); }} />
|
||||
{t('gen.autofocusWB')}
|
||||
</label>
|
||||
{/* Backend setting, not a UI pref: the fold happens in the SQL. Saved
|
||||
instantly like the rest of this panel. */}
|
||||
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
||||
<Checkbox checked={workedVariants}
|
||||
onCheckedChange={(c) => { const v = !!c; setWorkedVariants(v); SetWorkedCallVariants(v).catch((e: any) => setErr(String(e?.message ?? e))); }} />
|
||||
{t('gen.workedVariants')} <span className="text-xs text-muted-foreground">{t('gen.workedVariantsHint')}</span>
|
||||
</label>
|
||||
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
||||
<Checkbox checked={showBeamMap} onCheckedChange={(c) => { const v = !!c; setShowBeamMap(v); writeUiPref('opslog.showBeamOnMap', v ? '1' : '0'); }} />
|
||||
{t('gen.showBeam')}
|
||||
@@ -5694,6 +5980,17 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
<span className="text-[11px] text-muted-foreground">{emailMsg}</span>
|
||||
</div>
|
||||
|
||||
<div className="pt-2 mt-2 border-t border-border space-y-2">
|
||||
<Label className="text-sm font-semibold">{t('em.recEmail')}</Label>
|
||||
<div className="text-[11px] text-muted-foreground">
|
||||
{t('em.recVarsHint')} {'{CALL}'} {'{DATE}'} {'{BAND}'} {'{MODE}'} {'{MYCALL}'}.
|
||||
</div>
|
||||
<Input className="h-8" placeholder={t('em.subject')} value={emailCfg.subject}
|
||||
onChange={(e) => setEmailField({ subject: e.target.value })} />
|
||||
<Textarea rows={3} className="text-sm" placeholder={t('em.body')} value={emailCfg.body}
|
||||
onChange={(e) => setEmailField({ body: e.target.value })} />
|
||||
</div>
|
||||
|
||||
<div className="pt-2 mt-2 border-t border-border space-y-2">
|
||||
<Label className="text-sm font-semibold">{t('em.qslCardEmail')}</Label>
|
||||
<div className="text-[11px] text-muted-foreground">
|
||||
@@ -5710,6 +6007,12 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
<div className="text-[11px] text-muted-foreground">
|
||||
{t('em.autoSendHint')}
|
||||
</div>
|
||||
<div className="pt-2 space-y-1">
|
||||
<Label className="text-sm">{t('em.qslDefaultMsg')}</Label>
|
||||
<Input className="h-8" placeholder={t('em.qslDefaultMsgPh')} value={eqslCfg.default_message ?? ''}
|
||||
onChange={(e) => setEqslField({ default_message: e.target.value })} />
|
||||
<div className="text-[11px] text-muted-foreground">{t('em.qslDefaultMsgHint')}</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</>
|
||||
@@ -5796,12 +6099,13 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
// — useState/useEffect/useI18n — get a proper component context; PANELS[x]()
|
||||
// is a plain call and hook-holding panels must go through JSX like this.
|
||||
adifmon: () => <ADIFMonitorPanel />,
|
||||
webpublish: () => <WebPublishPanel />,
|
||||
relayauto: () => <RelayAutoPanel />,
|
||||
backup: BackupPanel,
|
||||
database: DatabasePanel,
|
||||
uscounties: USCountiesPanel,
|
||||
autostart: () => <AutostartPanelComponent />,
|
||||
awards: () => <ComingSoon id="awards" icon={Award} />,
|
||||
awards: () => <AwardsSelectionPanel profile={activeProfile ?? undefined} />,
|
||||
cat: CATPanel,
|
||||
rotator: RotatorPanel,
|
||||
winkeyer: WinkeyerPanel,
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react';
|
||||
import { Plus, Pencil, Trash2, Power, PlugZap, Loader2, Check, X, Compass, Square, Antenna as AntennaIcon, ArrowDownToLine, Minus, RefreshCw, GripVertical } from 'lucide-react';
|
||||
import { Plus, Pencil, Trash2, Power, PlugZap, Loader2, Check, X, Compass, Square, Antenna as AntennaIcon, ArrowDownToLine, Minus, RefreshCw, GripVertical, ChevronUp, ChevronDown } from 'lucide-react';
|
||||
import { Button } from '@/components/ui/button';
|
||||
import { Input } from '@/components/ui/input';
|
||||
import { Label } from '@/components/ui/label';
|
||||
@@ -15,6 +15,7 @@ import {
|
||||
GetStationDevices, SaveStationDevices, GetStationStatus, StationSetRelay,
|
||||
GetRotatorHeading, RotatorGoTo, RotatorStop, SetActiveRotor,
|
||||
GetUltrabeamStatus, SetUltrabeamDirection, UltrabeamRetract, MotorSetElement, MotorReadElements,
|
||||
MotorTuneKHz, MotorNudgeKHz, SetMotorFollow,
|
||||
ListDenkoviDevices, ListSerialPorts, TestStationDevice,
|
||||
GetAmpStatuses, GetFlexState,
|
||||
GetTunerGeniusStatus, GetTunerGeniusSettings,
|
||||
@@ -115,7 +116,37 @@ 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[] };
|
||||
type AntStatus = { enabled: boolean; type: string; connected: boolean; direction: number; frequency: number; moving: boolean; elements: number[]; follow?: boolean; step_khz?: number; bands?: string[] };
|
||||
|
||||
// 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
|
||||
@@ -203,6 +234,70 @@ function MotorAntennaWidget({ ant, refetch, t }: { ant: AntStatus; refetch: () =
|
||||
))}
|
||||
</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) => {
|
||||
const khz = 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. The step only shows when tracking is on: a threshold for
|
||||
something switched off is a question the operator cannot act on. */}
|
||||
<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 && (
|
||||
<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>
|
||||
|
||||
<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">
|
||||
@@ -672,6 +767,7 @@ function DeviceEditor({ device, onChange, onSave, onCancel, t }: {
|
||||
<div className={cn('space-y-1', (isKM || isDingtian) ? '' : 'max-w-xs')}>
|
||||
<Label>{t('station.host')}</Label>
|
||||
<Input className="font-mono" value={device.host} placeholder="192.168.1.100" onChange={(e) => onChange({ ...device, host: e.target.value })} />
|
||||
<span className="text-[10px] text-muted-foreground">{t('station.hostHint')}</span>
|
||||
</div>
|
||||
{/* Dingtian: both are OFF on a factory board — the session ID only when
|
||||
"HTTP Session" is enabled in its web page, the password only when a
|
||||
|
||||
@@ -0,0 +1,275 @@
|
||||
import { useEffect, useState } from 'react';
|
||||
import { Upload, FolderOpen, Loader2, ChevronsUpDown } from 'lucide-react';
|
||||
import {
|
||||
GetWebPublishConfig, SaveWebPublishConfig, WebPublishColumns,
|
||||
TestWebPublishFTP, PublishLogNow, GetWebPublishStatus, PickBackupFolder,
|
||||
} from '../../wailsjs/go/main/App';
|
||||
import { Button } from '@/components/ui/button';
|
||||
import { Input } from '@/components/ui/input';
|
||||
import { Label } from '@/components/ui/label';
|
||||
import { Checkbox } from '@/components/ui/checkbox';
|
||||
import { Select, SelectTrigger, SelectValue, SelectContent, SelectItem } from '@/components/ui/select';
|
||||
import {
|
||||
DropdownMenu, DropdownMenuTrigger, DropdownMenuContent, DropdownMenuCheckboxItem,
|
||||
} from '@/components/ui/dropdown-menu';
|
||||
import { useI18n } from '@/lib/i18n';
|
||||
import { cn } from '@/lib/utils';
|
||||
|
||||
type Cfg = {
|
||||
enabled: boolean; format: string; folder: string; file_name: string; title: string;
|
||||
count: number; interval_min: number; columns: string[];
|
||||
ftp_enabled: boolean; ftp_host: string; ftp_port: number; ftp_user: string;
|
||||
ftp_password: string; ftp_tls: boolean; ftp_folder: string; ftp_file_name: string;
|
||||
};
|
||||
type Col = { key: string; header: string; group: string };
|
||||
|
||||
export function WebPublishPanel() {
|
||||
const { t } = useI18n();
|
||||
const [cfg, setCfg] = useState<Cfg | null>(null);
|
||||
const [cols, setCols] = useState<Col[]>([]);
|
||||
// The catalogue is 123 fields, so the picker is a dropdown with a search box
|
||||
// rather than anything laid out on the page. Chosen columns stay visible above
|
||||
// it, in publication order: after picking eight out of a hundred the question
|
||||
// stops being 'what exists' and becomes 'what did I pick, and how will it print'.
|
||||
const [colSearch, setColSearch] = useState('');
|
||||
const [busy, setBusy] = useState<'' | 'test' | 'publish'>('');
|
||||
const [msg, setMsg] = useState('');
|
||||
const [err, setErr] = useState('');
|
||||
// Raw text for the two numeric boxes: bound straight to the number they could
|
||||
// not be cleared, the same trap as the Recent-QSOs Max field.
|
||||
const [countText, setCountText] = useState('');
|
||||
const [everyText, setEveryText] = useState('');
|
||||
|
||||
useEffect(() => {
|
||||
(async () => {
|
||||
try {
|
||||
const [c, k, st] = await Promise.all([GetWebPublishConfig(), WebPublishColumns(), GetWebPublishStatus()]);
|
||||
setCfg(c as any);
|
||||
setCols((k ?? []) as Col[]);
|
||||
setCountText(String((c as any).count ?? 100));
|
||||
setEveryText(String((c as any).interval_min ?? 0));
|
||||
const s: any = st;
|
||||
if (s?.last_err) setErr(s.last_err);
|
||||
else if (s?.last_run) setMsg(t('wpub.lastRun') + ' ' + s.last_run);
|
||||
} catch (e: any) { setErr(String(e?.message ?? e)); }
|
||||
})();
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
}, []);
|
||||
|
||||
if (!cfg) return <p className="text-xs text-muted-foreground">…</p>;
|
||||
const set = (p: Partial<Cfg>) => setCfg((c) => (c ? { ...c, ...p } : c));
|
||||
|
||||
// Every control saves immediately: this panel has no Save button of its own,
|
||||
// matching the other "saved instantly" panels.
|
||||
const save = async (next: Cfg) => {
|
||||
setCfg(next);
|
||||
try { await SaveWebPublishConfig(next as any); setErr(''); }
|
||||
catch (e: any) { setErr(String(e?.message ?? e)); }
|
||||
};
|
||||
const patch = (p: Partial<Cfg>) => save({ ...cfg, ...p });
|
||||
|
||||
const toggleCol = (key: string) => {
|
||||
const has = cfg.columns?.includes(key);
|
||||
patch({ columns: has ? cfg.columns.filter((c) => c !== key) : [...(cfg.columns ?? []), key] });
|
||||
};
|
||||
|
||||
const run = async (what: 'test' | 'publish') => {
|
||||
setBusy(what); setMsg(''); setErr('');
|
||||
try {
|
||||
const r = what === 'test' ? await TestWebPublishFTP(cfg as any) : await PublishLogNow();
|
||||
setMsg(String(r));
|
||||
} catch (e: any) { setErr(String(e?.message ?? e)); }
|
||||
finally { setBusy(''); }
|
||||
};
|
||||
|
||||
return (
|
||||
<div className="space-y-4 max-w-3xl">
|
||||
<p className="text-xs text-muted-foreground leading-relaxed">{t('wpub.hint')}</p>
|
||||
|
||||
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
||||
<Checkbox checked={cfg.enabled} onCheckedChange={(c) => patch({ enabled: !!c })} />
|
||||
{t('wpub.enable')}
|
||||
</label>
|
||||
|
||||
{cfg.enabled && (<>
|
||||
{/* ── The file ── */}
|
||||
<div className="space-y-2 border-t border-border/60 pt-3">
|
||||
<Label className="text-xs font-semibold">{t('wpub.fileSection')}</Label>
|
||||
<div className="grid grid-cols-[130px_1fr] gap-2 items-center">
|
||||
<Label className="text-sm">{t('wpub.format')}</Label>
|
||||
<Select value={cfg.format} onValueChange={(v) => patch({ format: v })}>
|
||||
<SelectTrigger className="h-8 w-56"><SelectValue /></SelectTrigger>
|
||||
<SelectContent>
|
||||
<SelectItem value="html">{t('wpub.formatHtml')}</SelectItem>
|
||||
<SelectItem value="csv">{t('wpub.formatCsv')}</SelectItem>
|
||||
</SelectContent>
|
||||
</Select>
|
||||
|
||||
<Label className="text-sm">{t('wpub.folder')}</Label>
|
||||
<div className="flex gap-2">
|
||||
<Input className="h-8 font-mono text-xs flex-1" value={cfg.folder}
|
||||
onChange={(e) => set({ folder: e.target.value })} onBlur={() => patch({ folder: cfg.folder })} />
|
||||
<Button variant="outline" size="sm" className="h-8" onClick={async () => {
|
||||
try { const p = await PickBackupFolder(); if (p) patch({ folder: p }); } catch { /* cancelled */ }
|
||||
}}><FolderOpen className="size-3.5" /> {t('wpub.browse')}</Button>
|
||||
</div>
|
||||
|
||||
<Label className="text-sm">{t('wpub.fileName')}</Label>
|
||||
<Input className="h-8 w-56 font-mono text-xs" value={cfg.file_name}
|
||||
onChange={(e) => set({ file_name: e.target.value })} onBlur={() => patch({ file_name: cfg.file_name })} />
|
||||
|
||||
<Label className="text-sm">{t('wpub.title')}</Label>
|
||||
<Input className="h-8" placeholder={t('wpub.titlePh')} value={cfg.title}
|
||||
onChange={(e) => set({ title: e.target.value })} onBlur={() => patch({ title: cfg.title })} />
|
||||
|
||||
<Label className="text-sm">{t('wpub.count')}</Label>
|
||||
<Input type="number" min={1} max={100000} className="h-8 w-28 font-mono text-xs" value={countText}
|
||||
onChange={(e) => setCountText(e.target.value)}
|
||||
onBlur={() => {
|
||||
const n = Math.floor(Number(countText));
|
||||
if (Number.isFinite(n) && n > 0) patch({ count: n }); else setCountText(String(cfg.count));
|
||||
}} />
|
||||
|
||||
<Label className="text-sm">{t('wpub.every')}</Label>
|
||||
<div className="flex items-center gap-2">
|
||||
<Input type="number" min={0} max={1440} className="h-8 w-28 font-mono text-xs" value={everyText}
|
||||
onChange={(e) => setEveryText(e.target.value)}
|
||||
onBlur={() => {
|
||||
const n = Math.floor(Number(everyText));
|
||||
if (Number.isFinite(n) && n >= 0) patch({ interval_min: n }); else setEveryText(String(cfg.interval_min));
|
||||
}} />
|
||||
<span className="text-xs text-muted-foreground">{t('wpub.everyHint')}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* ── Columns ── */}
|
||||
<div className="space-y-2 border-t border-border/60 pt-3">
|
||||
<div className="flex items-center justify-between">
|
||||
<Label className="text-xs font-semibold">{t('wpub.columns')}</Label>
|
||||
<span className="text-[11px] text-muted-foreground">
|
||||
{t('wpub.columnsCount', { n: cfg.columns?.length ?? 0, total: cols.length })}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
{/* CHOSEN, in publication order — this is the list that answers "what
|
||||
will the page look like", which a sectioned catalogue cannot. */}
|
||||
{(cfg.columns?.length ?? 0) > 0 && (
|
||||
<div className="flex flex-wrap gap-1.5">
|
||||
{cfg.columns.map((k) => {
|
||||
const c = cols.find((x) => x.key === k);
|
||||
return (
|
||||
<button key={k} type="button" onClick={() => toggleCol(k)}
|
||||
title={t('wpub.removeColumn')}
|
||||
className="px-2 py-0.5 rounded-full border border-primary bg-primary text-primary-foreground text-[11px] font-medium">
|
||||
{c?.header ?? k} ×
|
||||
</button>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* One dropdown, alphabetical, filtered as you type. The catalogue is
|
||||
123 fields: laid out on the page it buries every other setting, and
|
||||
sorting by anything but the alphabet means hunting. The menu stays
|
||||
open while ticking — picking eight columns should be one visit. */}
|
||||
<DropdownMenu>
|
||||
<DropdownMenuTrigger asChild>
|
||||
<Button variant="outline" size="sm" className="w-full justify-between h-8 text-xs font-normal">
|
||||
{t('wpub.columnsPick')}
|
||||
<ChevronsUpDown className="size-3.5 opacity-60" />
|
||||
</Button>
|
||||
</DropdownMenuTrigger>
|
||||
{/* The search box is OUTSIDE the scrolling area, not sticky inside it.
|
||||
Sticky kept it in place but the rows scrolled over it: a menu item
|
||||
carries its own background and its own stacking, so it wins over a
|
||||
sticky sibling however high its z-index. A header that never
|
||||
scrolls has nothing to lose the fight with. */}
|
||||
<DropdownMenuContent align="start" className="w-72 p-0 flex flex-col max-h-80">
|
||||
<div className="p-1.5 border-b border-border/60 bg-popover shrink-0">
|
||||
<Input className="h-7 text-xs" placeholder={t('wpub.columnsSearch')}
|
||||
value={colSearch}
|
||||
onChange={(e) => setColSearch(e.target.value)}
|
||||
onKeyDown={(e) => e.stopPropagation()} />
|
||||
</div>
|
||||
<div className="overflow-y-auto p-1">
|
||||
{[...cols]
|
||||
.sort((a, b) => a.header.localeCompare(b.header))
|
||||
.filter((c) => {
|
||||
const q = colSearch.trim().toLowerCase();
|
||||
return !q || c.header.toLowerCase().includes(q) || c.key.toLowerCase().includes(q);
|
||||
})
|
||||
.map((c) => (
|
||||
<DropdownMenuCheckboxItem
|
||||
key={c.key}
|
||||
checked={cfg.columns?.includes(c.key) ?? false}
|
||||
onCheckedChange={() => toggleCol(c.key)}
|
||||
onSelect={(e) => e.preventDefault()}
|
||||
className="text-xs"
|
||||
>
|
||||
{c.header}
|
||||
<span className="ml-auto pl-2 text-[10px] text-muted-foreground font-mono">{c.group}</span>
|
||||
</DropdownMenuCheckboxItem>
|
||||
))}
|
||||
</div>
|
||||
</DropdownMenuContent>
|
||||
</DropdownMenu>
|
||||
<p className="text-[11px] text-muted-foreground">{t('wpub.columnsHint')}</p>
|
||||
</div>
|
||||
|
||||
{/* ── Upload ── */}
|
||||
<div className="space-y-2 border-t border-border/60 pt-3">
|
||||
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
||||
<Checkbox checked={cfg.ftp_enabled} onCheckedChange={(c) => patch({ ftp_enabled: !!c })} />
|
||||
{t('wpub.ftpEnable')}
|
||||
</label>
|
||||
{cfg.ftp_enabled && (
|
||||
<div className="grid grid-cols-[130px_1fr] gap-2 items-center">
|
||||
<Label className="text-sm">{t('wpub.ftpHost')}</Label>
|
||||
<div className="flex gap-2">
|
||||
<Input className="h-8 flex-1" placeholder="ftp.example.com" value={cfg.ftp_host}
|
||||
onChange={(e) => set({ ftp_host: e.target.value })} onBlur={() => patch({ ftp_host: cfg.ftp_host })} />
|
||||
<Input type="number" className="h-8 w-24 font-mono text-xs" value={cfg.ftp_port}
|
||||
onChange={(e) => set({ ftp_port: Number(e.target.value) || 21 })}
|
||||
onBlur={() => patch({ ftp_port: cfg.ftp_port })} />
|
||||
</div>
|
||||
<Label className="text-sm">{t('wpub.ftpUser')}</Label>
|
||||
<Input className="h-8" value={cfg.ftp_user}
|
||||
onChange={(e) => set({ ftp_user: e.target.value })} onBlur={() => patch({ ftp_user: cfg.ftp_user })} />
|
||||
<Label className="text-sm">{t('wpub.ftpPassword')}</Label>
|
||||
<Input type="password" className="h-8" value={cfg.ftp_password}
|
||||
onChange={(e) => set({ ftp_password: e.target.value })} onBlur={() => patch({ ftp_password: cfg.ftp_password })} />
|
||||
<Label className="text-sm">{t('wpub.ftpFolder')}</Label>
|
||||
<Input className="h-8 font-mono text-xs" placeholder="/www/log" value={cfg.ftp_folder}
|
||||
onChange={(e) => set({ ftp_folder: e.target.value })} onBlur={() => patch({ ftp_folder: cfg.ftp_folder })} />
|
||||
<Label className="text-sm">{t('wpub.ftpFileName')}</Label>
|
||||
<Input className="h-8 w-56 font-mono text-xs" value={cfg.ftp_file_name}
|
||||
onChange={(e) => set({ ftp_file_name: e.target.value })} onBlur={() => patch({ ftp_file_name: cfg.ftp_file_name })} />
|
||||
<span />
|
||||
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
||||
<Checkbox checked={cfg.ftp_tls} onCheckedChange={(c) => patch({ ftp_tls: !!c })} />
|
||||
{t('wpub.ftpTls')}
|
||||
</label>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div className="flex items-center gap-3 border-t border-border/60 pt-3 flex-wrap">
|
||||
<Button size="sm" onClick={() => run('publish')} disabled={busy !== ''}>
|
||||
{busy === 'publish' ? <Loader2 className="size-3.5 animate-spin" /> : <Upload className="size-3.5" />}
|
||||
{t('wpub.publishNow')}
|
||||
</Button>
|
||||
{cfg.ftp_enabled && (
|
||||
<Button variant="outline" size="sm" onClick={() => run('test')} disabled={busy !== ''}>
|
||||
{busy === 'test' ? <Loader2 className="size-3.5 animate-spin" /> : null}
|
||||
{t('wpub.testFtp')}
|
||||
</Button>
|
||||
)}
|
||||
</div>
|
||||
</>)}
|
||||
|
||||
{msg && <p className="text-xs text-success break-all">{msg}</p>}
|
||||
{err && <p className="text-xs text-danger break-all">{err}</p>}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
+60
-40
File diff suppressed because one or more lines are too long
@@ -0,0 +1,66 @@
|
||||
// Two operator options that change how a spot LOOKS, shared by the DX-cluster
|
||||
// list and the band map so the two panels can never disagree about the same
|
||||
// spot — the lesson already learnt with the marker colours.
|
||||
//
|
||||
// muteWorked — a station already worked gets no colour and no badge. It
|
||||
// stays in the list, it simply stops competing for attention.
|
||||
// slotHighlight — a callsign not yet worked on THIS band and mode is coloured,
|
||||
// whatever the entity says. For an operator filling slots, a
|
||||
// common entity on a new band+mode is the whole point, and the
|
||||
// entity-level status calls it "worked".
|
||||
//
|
||||
// They compose deliberately: mute what is done, light up what is not.
|
||||
|
||||
export type SpotDisplayOptions = { muteWorked: boolean; slotHighlight: boolean };
|
||||
|
||||
export function readSpotDisplayOptions(): SpotDisplayOptions {
|
||||
try {
|
||||
return {
|
||||
muteWorked: localStorage.getItem('opslog.clusterMuteWorked') === '1',
|
||||
slotHighlight: localStorage.getItem('opslog.clusterSlotHighlight') === '1',
|
||||
};
|
||||
} catch {
|
||||
return { muteWorked: false, slotHighlight: false };
|
||||
}
|
||||
}
|
||||
|
||||
type Entry = {
|
||||
status?: string;
|
||||
worked_call?: boolean;
|
||||
worked_slot?: boolean;
|
||||
new_county?: boolean;
|
||||
new_pota?: boolean;
|
||||
new_pfx?: boolean;
|
||||
new_grid?: boolean;
|
||||
} | undefined;
|
||||
|
||||
// applySpotDisplay rewrites a status entry per the options, so every consumer —
|
||||
// colour, badge, status text — follows from one decision instead of each panel
|
||||
// re-deriving it.
|
||||
export function applySpotDisplay<T extends Entry>(s: T, o: SpotDisplayOptions): T {
|
||||
if (!s) return s;
|
||||
let e = s;
|
||||
|
||||
// Slot promotion runs first: a callsign not yet worked on this band and mode
|
||||
// is not done, whatever the entity says, so it earns a status before the mute
|
||||
// below can take its colour away.
|
||||
if (o.slotHighlight && e.worked_slot === false && (!e.status || e.status === 'worked')) {
|
||||
e = { ...e, status: 'new-call' } as NonNullable<T>;
|
||||
}
|
||||
|
||||
// Mute drops the blue already-worked-callsign mark, and NOTHING else.
|
||||
//
|
||||
// It used to blank the status as well, on the theory that a spot bringing no
|
||||
// novelty should stop painting entirely. That was wrong twice over. The status
|
||||
// is what the cluster list reads to DIM a row, so blanking it turned every
|
||||
// quiet grey row bright white — the option made the list louder, not quieter.
|
||||
// And an empty status means "entity not resolved" everywhere else, so muted
|
||||
// spots had to carry a flag saying they did not really mean that.
|
||||
//
|
||||
// Leaving the status alone costs nothing: a worked entity already renders with
|
||||
// no colour and gets dimmed, so removing the blue is the entire job.
|
||||
if (o.muteWorked) {
|
||||
e = { ...e, worked_call: false } as NonNullable<T>;
|
||||
}
|
||||
return e;
|
||||
}
|
||||
@@ -0,0 +1,45 @@
|
||||
// The "extra" spot markers — the ones ORTHOGONAL to the entity status.
|
||||
//
|
||||
// A spot's entity status (new DXCC / new band / new slot / worked) answers one
|
||||
// question. These answer others that can be true at the same time: the park is
|
||||
// new even if the entity is worked, the county is new even if the band is not.
|
||||
// Both the DX-cluster list and the band map show them, and they have to agree —
|
||||
// the same fact must not be green in one panel and violet in the next, so the
|
||||
// colours live HERE and nowhere else. This is also the table a per-marker colour
|
||||
// setting will drive, which is why it is a table rather than three constants.
|
||||
//
|
||||
// Colour choices:
|
||||
// POTA green — parks; the association is worth keeping
|
||||
// county violet — a chart hue, because every semantic token was already
|
||||
// spoken for: red, orange and yellow are the entity
|
||||
// statuses, blue is "callsign worked", green is POTA
|
||||
// worked blue — matches the WKD-CALL badge the cluster list has always used
|
||||
// prefix yellow — unchanged
|
||||
// grid magenta — the last hue in the categorical set that is not already
|
||||
// spoken for here and does not read as a status; a grid is
|
||||
// never urgent the way a new entity is
|
||||
export type SpotMarkerKey = 'new_pota' | 'new_county' | 'new_pfx' | 'worked_call' | 'new_grid';
|
||||
|
||||
export type SpotMarker = {
|
||||
key: SpotMarkerKey;
|
||||
colour: string; // a CSS colour — a var() reference, so it follows the theme
|
||||
labelKey: string; // i18n key, short form (badge / legend)
|
||||
};
|
||||
|
||||
// Order is the display order, in both panels.
|
||||
export const SPOT_MARKERS: SpotMarker[] = [
|
||||
{ key: 'new_pota', colour: 'var(--success)', labelKey: 'clg2.newPota' },
|
||||
{ key: 'new_county', colour: 'var(--chart-5)', labelKey: 'clg2.newCounty' },
|
||||
{ key: 'new_pfx', colour: 'var(--caution)', labelKey: 'clg2.newPfx' },
|
||||
{ key: 'new_grid', colour: 'var(--chart-7)', labelKey: 'clg2.newGrid' },
|
||||
{ key: 'worked_call', colour: 'var(--info)', labelKey: 'clg2.wkdCall' },
|
||||
];
|
||||
|
||||
export const markerColour = (key: SpotMarkerKey): string =>
|
||||
SPOT_MARKERS.find((m) => m.key === key)?.colour ?? 'var(--muted-foreground)';
|
||||
|
||||
// activeMarkers returns the markers set on a status entry, in display order.
|
||||
export function activeMarkers(e: Record<string, unknown> | undefined): SpotMarker[] {
|
||||
if (!e) return [];
|
||||
return SPOT_MARKERS.filter((m) => !!e[m.key]);
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
// Capitalisation helpers for the free-text QSO fields (Name / QTH / Comment /
|
||||
// Note).
|
||||
//
|
||||
// The same station reaches the log SHOUTED by QRZ, lower-cased by a hurried
|
||||
// operator, and in whatever case the other logger stored it in an imported
|
||||
// ADIF — so one callsign ends up as "JEAN", "jean" and "Jean" across a log,
|
||||
// and sorting or reading a QTH column becomes a mess.
|
||||
//
|
||||
// Both helpers are meant to run on BLUR, never per keystroke: rewriting the
|
||||
// value while the operator is still typing a word fights them mid-word (see
|
||||
// the controlled-input note in CLAUDE.md).
|
||||
|
||||
// titleCase upper-cases the first letter of every word and lower-cases the
|
||||
// rest. Separators are kept, so "SAINT-JULIEN" → "Saint-Julien" and
|
||||
// "o'brien" → "O'Brien".
|
||||
export function titleCase(s: string): string {
|
||||
return s
|
||||
.toLowerCase()
|
||||
.replace(/(^|[\s\-'’/.])(\p{L})/gu, (_m, sep: string, ch: string) => sep + ch.toUpperCase());
|
||||
}
|
||||
|
||||
// sentenceCase upper-cases the first letter and leaves everything after it as
|
||||
// typed. A comment routinely carries callsigns, modes and abbreviations
|
||||
// ("TNX QSO F5ABC, FT8 59") that lower-casing would quietly destroy — which is
|
||||
// why this is NOT titleCase.
|
||||
export function sentenceCase(s: string): string {
|
||||
return s.replace(/^(\s*)(\p{L})/u, (_m, sp: string, ch: string) => sp + ch.toUpperCase());
|
||||
}
|
||||
@@ -6,11 +6,16 @@ import { GetUIPref } from '../../wailsjs/go/main/App';
|
||||
// CSS variables in style.css key off of. 'auto' follows the OS light/dark
|
||||
// preference. The choice is persisted (localStorage + portable UI pref, so it
|
||||
// travels with the data/ folder like the language).
|
||||
export type ThemeChoice = 'auto' | 'light-warm' | 'light-cool' | 'light-sage' | 'dim-slate' | 'dark-warm' | 'dark-graphite' | 'high-contrast';
|
||||
export type ThemeChoice = 'auto' | 'light-warm' | 'light-cool' | 'light-sage' | 'light-nordic'
|
||||
| 'dim-slate' | 'dark-warm' | 'dark-graphite' | 'dark-indigo' | 'dark-teal' | 'dark-plum' | 'high-contrast';
|
||||
|
||||
// Selectable, concrete themes (excludes 'auto') in display order.
|
||||
// Selectable, concrete themes (excludes 'auto') in display order: lights first,
|
||||
// then darks, with high-contrast last — it is an accessibility choice, not a
|
||||
// taste one, and listing it among the moods buries it.
|
||||
export const CONCRETE_THEMES: Exclude<ThemeChoice, 'auto'>[] = [
|
||||
'light-warm', 'light-cool', 'light-sage', 'dim-slate', 'dark-warm', 'dark-graphite', 'high-contrast',
|
||||
'light-warm', 'light-cool', 'light-sage', 'light-nordic',
|
||||
'dim-slate', 'dark-warm', 'dark-graphite', 'dark-indigo', 'dark-teal', 'dark-plum',
|
||||
'high-contrast',
|
||||
];
|
||||
|
||||
export const LS_KEY = 'opslog.theme';
|
||||
|
||||
@@ -39,6 +39,10 @@ const PORTABLE_KEYS = [
|
||||
'opslog.clusterModeFilter', 'opslog.clusterSearch', 'opslog.clusterHideWorked',
|
||||
'opslog.activeTab', // last selected tab
|
||||
'opslog.mainSplit', // Main tab: width share of the left pane (percent)
|
||||
'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.bandMapWidth', // docked band map: column width (px)
|
||||
'opslog.bandMapTabWidth', // Band map tab: shared card width (px)
|
||||
// NOTE: 'hamlog.awardColsShown' and the grid column layouts are NOT listed here.
|
||||
// They are handled by lib/gridPrefs, which scopes the localStorage cache PER
|
||||
// PROFILE and mirrors to the DB (already per-profile) itself — mirroring them
|
||||
|
||||
+288
-3
@@ -495,6 +495,286 @@
|
||||
color-scheme: dark;
|
||||
}
|
||||
|
||||
/* ---- Theme 5: Indigo — deep blue-violet, electric accent ----------------
|
||||
The first seven themes are all neutral (beige, slate, graphite, black) with an
|
||||
orange accent, so "another dark theme" only ever meant another grey. These
|
||||
four carry a real hue in the SURFACES, not just in the accent, and each takes
|
||||
a different primary — violet, cyan, pink, indigo — so they are told apart at a
|
||||
glance in the picker.
|
||||
|
||||
Every one keeps the same contract: the semantic colours (success / warning /
|
||||
caution / danger / info) must stay recognisable as themselves. A logger is
|
||||
read for hours and "red = a problem" cannot become a decorative choice, so the
|
||||
hue budget is spent on the surfaces and the primary, never on the meanings. */
|
||||
[data-theme="dark-indigo"] {
|
||||
--background: #0e0f1f;
|
||||
--foreground: #e4e5f2;
|
||||
--card: #181a30;
|
||||
--card-foreground: #e4e5f2;
|
||||
--popover: #181a30;
|
||||
--popover-foreground: #e4e5f2;
|
||||
--primary: #7c6cff; /* electric violet */
|
||||
--primary-foreground: #0b0a1a;
|
||||
--secondary: #222542;
|
||||
--secondary-foreground: #e4e5f2;
|
||||
--muted: #1e2038;
|
||||
--muted-foreground: #9d9fbe;
|
||||
--accent: #2a2d51;
|
||||
--accent-foreground: #c7c9ee;
|
||||
--destructive: #f2555a;
|
||||
--destructive-foreground: #12030a;
|
||||
--destructive-muted: #34131c;
|
||||
--destructive-muted-foreground: #fca5a5;
|
||||
--border: #2a2d4c;
|
||||
--input: #2a2d4c;
|
||||
--ring: #9b8dff;
|
||||
|
||||
--success: #34d399;
|
||||
--success-foreground: #052018;
|
||||
--success-muted: #0e2f27;
|
||||
--success-muted-foreground: #6ee7b7;
|
||||
--success-border: #165241;
|
||||
|
||||
--warning: #fbbf24;
|
||||
--warning-foreground: #221803;
|
||||
--warning-muted: #33280f;
|
||||
--warning-muted-foreground: #fcd34d;
|
||||
--warning-border: #4f3e15;
|
||||
|
||||
--caution: #facc15;
|
||||
--caution-foreground: #221e04;
|
||||
--caution-muted: #322d0e;
|
||||
--caution-muted-foreground: #fde047;
|
||||
--caution-border: #4b4315;
|
||||
|
||||
--danger: #fb7185;
|
||||
--danger-foreground: #250912;
|
||||
--danger-muted: #37151f;
|
||||
--danger-muted-foreground: #fda4af;
|
||||
--danger-border: #562533;
|
||||
|
||||
--info: #38bdf8;
|
||||
--info-foreground: #051d29;
|
||||
--info-muted: #0b2a3a;
|
||||
--info-muted-foreground: #7dd3fc;
|
||||
--info-border: #12475c;
|
||||
|
||||
/* The entity ramp moves to CYAN here: violet is the primary, and a violet
|
||||
"entity confirmed" cell would read as a button. */
|
||||
--mx-call-conf: #22c55e;
|
||||
--mx-call-work: #2c7a52;
|
||||
--mx-dx-conf: #22d3ee;
|
||||
--mx-dx-work: #1b6b7c;
|
||||
--mx-none: #2c2f4d;
|
||||
|
||||
--scrollbar-thumb: #383c63;
|
||||
--scrollbar-thumb-hover: #4c5182;
|
||||
--card-shadow: 0 1px 2px rgba(0, 0, 0, 0.5), 0 0 0 1px rgba(228, 229, 242, 0.05);
|
||||
color-scheme: dark;
|
||||
}
|
||||
|
||||
/* ---- Theme 6: Ocean — deep teal, cyan accent --------------------------- */
|
||||
[data-theme="dark-teal"] {
|
||||
--background: #061c21;
|
||||
--foreground: #dcecee;
|
||||
--card: #0d2c33;
|
||||
--card-foreground: #dcecee;
|
||||
--popover: #0d2c33;
|
||||
--popover-foreground: #dcecee;
|
||||
--primary: #22d3ee; /* cyan */
|
||||
--primary-foreground: #041d24;
|
||||
--secondary: #143b44;
|
||||
--secondary-foreground: #dcecee;
|
||||
--muted: #10333b;
|
||||
--muted-foreground: #92b4ba;
|
||||
--accent: #15424c;
|
||||
--accent-foreground: #a5d8e0;
|
||||
--destructive: #f2555a;
|
||||
--destructive-foreground: #12030a;
|
||||
--destructive-muted: #35161a;
|
||||
--destructive-muted-foreground: #fca5a5;
|
||||
--border: #1a4652;
|
||||
--input: #1a4652;
|
||||
--ring: #5fe3f5;
|
||||
|
||||
--success: #4ade80;
|
||||
--success-foreground: #04220f;
|
||||
--success-muted: #0e3020;
|
||||
--success-muted-foreground: #86efac;
|
||||
--success-border: #17593a;
|
||||
|
||||
--warning: #fbbf24;
|
||||
--warning-foreground: #221803;
|
||||
--warning-muted: #33280f;
|
||||
--warning-muted-foreground: #fcd34d;
|
||||
--warning-border: #4f3e15;
|
||||
|
||||
--caution: #facc15;
|
||||
--caution-foreground: #221e04;
|
||||
--caution-muted: #312d0e;
|
||||
--caution-muted-foreground: #fde047;
|
||||
--caution-border: #4a4315;
|
||||
|
||||
--danger: #fb7185;
|
||||
--danger-foreground: #250912;
|
||||
--danger-muted: #38161f;
|
||||
--danger-muted-foreground: #fda4af;
|
||||
--danger-border: #572634;
|
||||
|
||||
/* Info moves to a BLUE: a cyan "info" would be the primary colour again. */
|
||||
--info: #7aa2f7;
|
||||
--info-foreground: #04122e;
|
||||
--info-muted: #16233f;
|
||||
--info-muted-foreground: #a9c2fb;
|
||||
--info-border: #2b3d66;
|
||||
|
||||
--mx-call-conf: #4ade80;
|
||||
--mx-call-work: #2b7a4d;
|
||||
--mx-dx-conf: #a78bfa;
|
||||
--mx-dx-work: #5b4a9c;
|
||||
--mx-none: #1c4550;
|
||||
|
||||
--scrollbar-thumb: #235a68;
|
||||
--scrollbar-thumb-hover: #31788a;
|
||||
--card-shadow: 0 1px 2px rgba(0, 0, 0, 0.5), 0 0 0 1px rgba(220, 236, 238, 0.05);
|
||||
color-scheme: dark;
|
||||
}
|
||||
|
||||
/* ---- Theme 7: Plum — aubergine, magenta accent ------------------------- */
|
||||
[data-theme="dark-plum"] {
|
||||
--background: #180f1e;
|
||||
--foreground: #eee0f0;
|
||||
--card: #251830;
|
||||
--card-foreground: #eee0f0;
|
||||
--popover: #251830;
|
||||
--popover-foreground: #eee0f0;
|
||||
--primary: #f472b6; /* magenta-pink */
|
||||
--primary-foreground: #250518;
|
||||
--secondary: #33203f;
|
||||
--secondary-foreground: #eee0f0;
|
||||
--muted: #2b1b36;
|
||||
--muted-foreground: #b39dbd;
|
||||
--accent: #3b2648;
|
||||
--accent-foreground: #dcc2e6;
|
||||
--destructive: #f2555a;
|
||||
--destructive-foreground: #12030a;
|
||||
--destructive-muted: #3a1620;
|
||||
--destructive-muted-foreground: #fca5a5;
|
||||
--border: #3a2547;
|
||||
--input: #3a2547;
|
||||
--ring: #f9a8d4;
|
||||
|
||||
--success: #34d399;
|
||||
--success-foreground: #052018;
|
||||
--success-muted: #10302a;
|
||||
--success-muted-foreground: #6ee7b7;
|
||||
--success-border: #1a5745;
|
||||
|
||||
--warning: #fbbf24;
|
||||
--warning-foreground: #221803;
|
||||
--warning-muted: #352a12;
|
||||
--warning-muted-foreground: #fcd34d;
|
||||
--warning-border: #524019;
|
||||
|
||||
--caution: #facc15;
|
||||
--caution-foreground: #221e04;
|
||||
--caution-muted: #342e12;
|
||||
--caution-muted-foreground: #fde047;
|
||||
--caution-border: #4e4519;
|
||||
|
||||
/* Danger goes RED here, not rose: a rose "danger" beside a pink primary is
|
||||
indistinguishable, and this is the one colour that must never be missed. */
|
||||
--danger: #f43f3f;
|
||||
--danger-foreground: #2a0606;
|
||||
--danger-muted: #3d1418;
|
||||
--danger-muted-foreground: #fca5a5;
|
||||
--danger-border: #5c2128;
|
||||
|
||||
--info: #38bdf8;
|
||||
--info-foreground: #051d29;
|
||||
--info-muted: #0f2b3a;
|
||||
--info-muted-foreground: #7dd3fc;
|
||||
--info-border: #16485d;
|
||||
|
||||
--mx-call-conf: #22c55e;
|
||||
--mx-call-work: #2f7d55;
|
||||
--mx-dx-conf: #60a5fa;
|
||||
--mx-dx-work: #35538c;
|
||||
--mx-none: #3a2647;
|
||||
|
||||
--scrollbar-thumb: #4a3159;
|
||||
--scrollbar-thumb-hover: #644176;
|
||||
--card-shadow: 0 1px 2px rgba(0, 0, 0, 0.5), 0 0 0 1px rgba(238, 224, 240, 0.05);
|
||||
color-scheme: dark;
|
||||
}
|
||||
|
||||
/* ---- Theme 8: Nordic light — crisp cool white, indigo accent ----------- */
|
||||
[data-theme="light-nordic"] {
|
||||
--background: #eef1f7;
|
||||
--foreground: #1b2130;
|
||||
--card: #ffffff;
|
||||
--card-foreground: #1b2130;
|
||||
--popover: #ffffff;
|
||||
--popover-foreground: #1b2130;
|
||||
--primary: #4f46e5; /* indigo */
|
||||
--primary-foreground: #ffffff;
|
||||
--secondary: #dfe4ee;
|
||||
--secondary-foreground: #1b2130;
|
||||
--muted: #e2e7f0;
|
||||
--muted-foreground: #4a5468;
|
||||
--accent: #dcdcfb;
|
||||
--accent-foreground: #312a91;
|
||||
--destructive: #b91c1c;
|
||||
--destructive-foreground: #ffffff;
|
||||
--destructive-muted: #fef2f2;
|
||||
--destructive-muted-foreground: #b91c1c;
|
||||
--border: #c9d1e0;
|
||||
--input: #c9d1e0;
|
||||
--ring: #6366f1;
|
||||
|
||||
--success: #15803d;
|
||||
--success-foreground: #ffffff;
|
||||
--success-muted: #dcfce7;
|
||||
--success-muted-foreground: #14532d;
|
||||
--success-border: #86efac;
|
||||
|
||||
--warning: #b45309;
|
||||
--warning-foreground: #ffffff;
|
||||
--warning-muted: #fef3c7;
|
||||
--warning-muted-foreground: #92400e;
|
||||
--warning-border: #fcd34d;
|
||||
|
||||
--caution: #a16207;
|
||||
--caution-foreground: #ffffff;
|
||||
--caution-muted: #fef9c3;
|
||||
--caution-muted-foreground: #854d0e;
|
||||
--caution-border: #fde047;
|
||||
|
||||
--danger: #dc2626;
|
||||
--danger-foreground: #ffffff;
|
||||
--danger-muted: #fee2e2;
|
||||
--danger-muted-foreground: #991b1b;
|
||||
--danger-border: #fca5a5;
|
||||
|
||||
--info: #0369a1;
|
||||
--info-foreground: #ffffff;
|
||||
--info-muted: #e0f2fe;
|
||||
--info-muted-foreground: #075985;
|
||||
--info-border: #7dd3fc;
|
||||
|
||||
/* Entity ramp shifts to TEAL: indigo is the primary here. */
|
||||
--mx-call-conf: #15803d;
|
||||
--mx-call-work: #86efac;
|
||||
--mx-dx-conf: #0f766e;
|
||||
--mx-dx-work: #99f6e4;
|
||||
--mx-none: #dde3ec;
|
||||
|
||||
--scrollbar-thumb: #b6c0d2;
|
||||
--scrollbar-thumb-hover: #93a0b8;
|
||||
--card-shadow: 0 1px 2px rgba(27, 33, 48, 0.06), 0 0 0 1px rgba(27, 33, 48, 0.03);
|
||||
color-scheme: light;
|
||||
}
|
||||
|
||||
/* ── Data-viz palette (Statistics dashboard) ────────────────────────────────
|
||||
A VALIDATED categorical palette, not hand-picked: the slot ORDER is what makes
|
||||
it colour-blind-safe (worst adjacent ΔE 24.2 light / 10.3 dark), so never
|
||||
@@ -512,7 +792,8 @@
|
||||
:root,
|
||||
[data-theme="light-warm"],
|
||||
[data-theme="light-cool"],
|
||||
[data-theme="light-sage"] {
|
||||
[data-theme="light-sage"],
|
||||
[data-theme="light-nordic"] {
|
||||
--chart-1: #2a78d6; /* blue — default single-series hue */
|
||||
--chart-2: #1baf7a; /* aqua */
|
||||
--chart-3: #eda100; /* yellow */
|
||||
@@ -533,7 +814,10 @@
|
||||
[data-theme="dim-slate"],
|
||||
[data-theme="dark-warm"],
|
||||
[data-theme="dark-graphite"],
|
||||
[data-theme="high-contrast"] {
|
||||
[data-theme="high-contrast"],
|
||||
[data-theme="dark-indigo"],
|
||||
[data-theme="dark-teal"],
|
||||
[data-theme="dark-plum"] {
|
||||
--chart-1: #3987e5;
|
||||
--chart-2: #199e70;
|
||||
--chart-3: #c98500;
|
||||
@@ -681,7 +965,8 @@
|
||||
help. */
|
||||
Every temporal input carries the same glyph, so the rule names them all:
|
||||
datetime-local was left out at first and its icon stayed invisible. */
|
||||
:is([data-theme='dim-slate'], [data-theme='dark-warm'], [data-theme='dark-graphite'], [data-theme='high-contrast'])
|
||||
:is([data-theme='dim-slate'], [data-theme='dark-warm'], [data-theme='dark-graphite'], [data-theme='high-contrast'],
|
||||
[data-theme='dark-indigo'], [data-theme='dark-teal'], [data-theme='dark-plum'])
|
||||
:is(input[type='date'], input[type='datetime-local'], input[type='time'], input[type='month'], input[type='week'])::-webkit-calendar-picker-indicator {
|
||||
filter: invert(1) brightness(1.8);
|
||||
opacity: 0.9;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// Single source of truth for the app version shown in the UI (header + About).
|
||||
// Bump this on a release (the release script updates it alongside telemetry.go).
|
||||
export const APP_VERSION = '0.23.3';
|
||||
export const APP_VERSION = '0.24.5';
|
||||
|
||||
// Author / credits, shown in Help -> About.
|
||||
export const APP_AUTHOR = 'F4BPO';
|
||||
|
||||
Vendored
+49
@@ -10,12 +10,15 @@ import {catemu} from '../models';
|
||||
import {antgenius} from '../models';
|
||||
import {award} from '../models';
|
||||
import {awardref} from '../models';
|
||||
import {bandopen} from '../models';
|
||||
import {cluster} from '../models';
|
||||
import {extsvc} from '../models';
|
||||
import {powergenius} from '../models';
|
||||
import {pskr} from '../models';
|
||||
import {spe} from '../models';
|
||||
import {solar} from '../models';
|
||||
import {tunergenius} from '../models';
|
||||
import {webpub} from '../models';
|
||||
import {winkeyer} from '../models';
|
||||
import {alerts} from '../models';
|
||||
import {audio} from '../models';
|
||||
@@ -87,6 +90,8 @@ export function AwardsFolder():Promise<string>;
|
||||
|
||||
export function BackfillUSCounties():Promise<main.BackfillUSCountiesResult>;
|
||||
|
||||
export function BandSlotQSOs(arg1:string,arg2:number,arg3:string,arg4:string):Promise<Array<qso.QSO>>;
|
||||
|
||||
export function BrowseExecutable():Promise<string>;
|
||||
|
||||
export function BulkUpdateField(arg1:Array<number>,arg2:string,arg3:string):Promise<number>;
|
||||
@@ -97,6 +102,8 @@ export function CIVTraceEnabled():Promise<boolean>;
|
||||
|
||||
export function CWDecoderRunning():Promise<boolean>;
|
||||
|
||||
export function CancelConfirmations():Promise<void>;
|
||||
|
||||
export function ChatAvailable():Promise<boolean>;
|
||||
|
||||
export function CheckForUpdate():Promise<main.UpdateInfo>;
|
||||
@@ -381,6 +388,10 @@ export function GetAwards():Promise<Array<award.Result>>;
|
||||
|
||||
export function GetBackupSettings():Promise<main.BackupSettings>;
|
||||
|
||||
export function GetBandOpenSettings():Promise<main.BandOpenSettings>;
|
||||
|
||||
export function GetBandOpenings():Promise<Array<bandopen.Opening>>;
|
||||
|
||||
export function GetCATSettings():Promise<main.CATSettings>;
|
||||
|
||||
export function GetCATState():Promise<cat.RigState>;
|
||||
@@ -431,6 +442,8 @@ export function GetIcomState():Promise<cat.IcomTXState>;
|
||||
|
||||
export function GetListsSettings():Promise<main.ListsSettings>;
|
||||
|
||||
export function GetLiveOpenings():Promise<Array<bandopen.Opening>>;
|
||||
|
||||
export function GetLiveStations():Promise<Array<main.LiveStation>>;
|
||||
|
||||
export function GetLoTWUsersStatus():Promise<main.LoTWUsersStatus>;
|
||||
@@ -457,6 +470,8 @@ export function GetPGXLStatus():Promise<powergenius.Status>;
|
||||
|
||||
export function GetPOTAToken():Promise<string>;
|
||||
|
||||
export function GetPSKReporterStatus():Promise<pskr.Status>;
|
||||
|
||||
export function GetPendingQSOs():Promise<Array<qso.QSO>>;
|
||||
|
||||
export function GetQSLDefaults():Promise<main.QSLDefaults>;
|
||||
@@ -477,6 +492,8 @@ export function GetScpStatus():Promise<main.ScpStatus>;
|
||||
|
||||
export function GetSecretStatus():Promise<main.SecretStatus>;
|
||||
|
||||
export function GetSelfSpotSettings():Promise<main.SelfSpotSettings>;
|
||||
|
||||
export function GetSlotStats():Promise<qso.SlotStats>;
|
||||
|
||||
export function GetSolarData():Promise<solar.Data>;
|
||||
@@ -491,6 +508,8 @@ export function GetStationStatus():Promise<Array<main.StationDeviceStatus>>;
|
||||
|
||||
export function GetTelemetryEnabled():Promise<boolean>;
|
||||
|
||||
export function GetTrackedAwards():Promise<Array<string>>;
|
||||
|
||||
export function GetTunerGeniusSettings():Promise<main.TunerGeniusSettings>;
|
||||
|
||||
export function GetTunerGeniusStatus():Promise<tunergenius.Status>;
|
||||
@@ -501,12 +520,18 @@ export function GetUltrabeamSettings():Promise<main.UltrabeamSettings>;
|
||||
|
||||
export function GetUltrabeamStatus():Promise<main.UltrabeamStatusInfo>;
|
||||
|
||||
export function GetWebPublishConfig():Promise<webpub.Config>;
|
||||
|
||||
export function GetWebPublishStatus():Promise<main.WebPublishStatus>;
|
||||
|
||||
export function GetWhatsNew():Promise<Array<main.ChangelogEntry>>;
|
||||
|
||||
export function GetWinkeyerSettings():Promise<main.WinkeyerSettings>;
|
||||
|
||||
export function GetWinkeyerStatus():Promise<winkeyer.Status>;
|
||||
|
||||
export function GetWorkedCallVariants():Promise<boolean>;
|
||||
|
||||
export function GetYaesuState():Promise<cat.YaesuTXState>;
|
||||
|
||||
export function HasBuiltinReferences(arg1:string):Promise<boolean>;
|
||||
@@ -657,10 +682,14 @@ export function LookupCallsign(arg1:string):Promise<lookup.Result>;
|
||||
|
||||
export function LookupCallsignFresh(arg1:string):Promise<lookup.Result>;
|
||||
|
||||
export function MotorNudgeKHz(arg1:number):Promise<void>;
|
||||
|
||||
export function MotorReadElements():Promise<Array<number>>;
|
||||
|
||||
export function MotorSetElement(arg1:number,arg2:number):Promise<void>;
|
||||
|
||||
export function MotorTuneKHz(arg1:number):Promise<void>;
|
||||
|
||||
export function MoveDatabase(arg1:string):Promise<void>;
|
||||
|
||||
export function NetActivate(arg1:string):Promise<qso.QSO>;
|
||||
@@ -727,6 +756,8 @@ export function PickSaveDatabase():Promise<string>;
|
||||
|
||||
export function PopulateBuiltinReferences(arg1:string):Promise<number>;
|
||||
|
||||
export function PublishLogNow():Promise<string>;
|
||||
|
||||
export function QSLDefaultTemplateID():Promise<number>;
|
||||
|
||||
export function QSLDeleteTemplate(arg1:number):Promise<void>;
|
||||
@@ -853,6 +884,8 @@ export function SaveAwardReference(arg1:string,arg2:awardref.Ref):Promise<void>;
|
||||
|
||||
export function SaveBackupSettings(arg1:main.BackupSettings):Promise<void>;
|
||||
|
||||
export function SaveBandOpenSettings(arg1:main.BandOpenSettings):Promise<void>;
|
||||
|
||||
export function SaveCATSettings(arg1:main.CATSettings):Promise<void>;
|
||||
|
||||
export function SaveCabrilloFile():Promise<string>;
|
||||
@@ -889,16 +922,22 @@ export function SaveRelayAuto(arg1:main.RelayAutoConfig):Promise<void>;
|
||||
|
||||
export function SaveRotators(arg1:Array<main.RotatorDevice>):Promise<void>;
|
||||
|
||||
export function SaveSelfSpotSettings(arg1:main.SelfSpotSettings):Promise<void>;
|
||||
|
||||
export function SaveStationDevices(arg1:Array<main.StationDevice>):Promise<void>;
|
||||
|
||||
export function SaveStationSettings(arg1:main.StationSettings):Promise<void>;
|
||||
|
||||
export function SaveTrackedAwards(arg1:Array<string>):Promise<void>;
|
||||
|
||||
export function SaveTunerGeniusSettings(arg1:main.TunerGeniusSettings):Promise<void>;
|
||||
|
||||
export function SaveUDPIntegration(arg1:udp.Config):Promise<udp.Config>;
|
||||
|
||||
export function SaveUltrabeamSettings(arg1:main.UltrabeamSettings):Promise<void>;
|
||||
|
||||
export function SaveWebPublishConfig(arg1:webpub.Config):Promise<void>;
|
||||
|
||||
export function SaveWinkeyerSettings(arg1:main.WinkeyerSettings):Promise<void>;
|
||||
|
||||
export function ScpLookup(arg1:string):Promise<scp.Result>;
|
||||
@@ -941,6 +980,10 @@ export function SetDVKLabel(arg1:number,arg2:string):Promise<void>;
|
||||
|
||||
export function SetKenwoodKeySpeed(arg1:number):Promise<void>;
|
||||
|
||||
export function SetMotorFollow(arg1:boolean,arg2:number):Promise<void>;
|
||||
|
||||
export function SetOpsLogQSLReceived(arg1:number,arg2:boolean):Promise<void>;
|
||||
|
||||
export function SetPassphrase(arg1:string):Promise<void>;
|
||||
|
||||
export function SetScpEnabled(arg1:boolean):Promise<void>;
|
||||
@@ -953,6 +996,8 @@ export function SetUltrabeamDirection(arg1:number):Promise<void>;
|
||||
|
||||
export function SetWinkeyerTrace(arg1:boolean):Promise<void>;
|
||||
|
||||
export function SetWorkedCallVariants(arg1:boolean):Promise<void>;
|
||||
|
||||
export function SetYaesuAFGain(arg1:number):Promise<void>;
|
||||
|
||||
export function SetYaesuAGC(arg1:string):Promise<void>;
|
||||
@@ -1029,6 +1074,8 @@ export function TestStationDevice(arg1:main.StationDevice):Promise<main.StationT
|
||||
|
||||
export function TestUltrabeam(arg1:main.UltrabeamSettings):Promise<void>;
|
||||
|
||||
export function TestWebPublishFTP(arg1:webpub.Config):Promise<string>;
|
||||
|
||||
export function TuneYaesuATU():Promise<void>;
|
||||
|
||||
export function TunerGeniusActivate(arg1:number):Promise<void>;
|
||||
@@ -1061,6 +1108,8 @@ export function UploadCallsign(arg1:string):Promise<string>;
|
||||
|
||||
export function UploadQSOsManual(arg1:string,arg2:Array<number>):Promise<void>;
|
||||
|
||||
export function WebPublishColumns():Promise<Array<Record<string, string>>>;
|
||||
|
||||
export function WinkeyerBackspace():Promise<void>;
|
||||
|
||||
export function WinkeyerConnect():Promise<void>;
|
||||
|
||||
@@ -122,6 +122,10 @@ export function BackfillUSCounties() {
|
||||
return window['go']['main']['App']['BackfillUSCounties']();
|
||||
}
|
||||
|
||||
export function BandSlotQSOs(arg1, arg2, arg3, arg4) {
|
||||
return window['go']['main']['App']['BandSlotQSOs'](arg1, arg2, arg3, arg4);
|
||||
}
|
||||
|
||||
export function BrowseExecutable() {
|
||||
return window['go']['main']['App']['BrowseExecutable']();
|
||||
}
|
||||
@@ -142,6 +146,10 @@ export function CWDecoderRunning() {
|
||||
return window['go']['main']['App']['CWDecoderRunning']();
|
||||
}
|
||||
|
||||
export function CancelConfirmations() {
|
||||
return window['go']['main']['App']['CancelConfirmations']();
|
||||
}
|
||||
|
||||
export function ChatAvailable() {
|
||||
return window['go']['main']['App']['ChatAvailable']();
|
||||
}
|
||||
@@ -710,6 +718,14 @@ export function GetBackupSettings() {
|
||||
return window['go']['main']['App']['GetBackupSettings']();
|
||||
}
|
||||
|
||||
export function GetBandOpenSettings() {
|
||||
return window['go']['main']['App']['GetBandOpenSettings']();
|
||||
}
|
||||
|
||||
export function GetBandOpenings() {
|
||||
return window['go']['main']['App']['GetBandOpenings']();
|
||||
}
|
||||
|
||||
export function GetCATSettings() {
|
||||
return window['go']['main']['App']['GetCATSettings']();
|
||||
}
|
||||
@@ -810,6 +826,10 @@ export function GetListsSettings() {
|
||||
return window['go']['main']['App']['GetListsSettings']();
|
||||
}
|
||||
|
||||
export function GetLiveOpenings() {
|
||||
return window['go']['main']['App']['GetLiveOpenings']();
|
||||
}
|
||||
|
||||
export function GetLiveStations() {
|
||||
return window['go']['main']['App']['GetLiveStations']();
|
||||
}
|
||||
@@ -862,6 +882,10 @@ export function GetPOTAToken() {
|
||||
return window['go']['main']['App']['GetPOTAToken']();
|
||||
}
|
||||
|
||||
export function GetPSKReporterStatus() {
|
||||
return window['go']['main']['App']['GetPSKReporterStatus']();
|
||||
}
|
||||
|
||||
export function GetPendingQSOs() {
|
||||
return window['go']['main']['App']['GetPendingQSOs']();
|
||||
}
|
||||
@@ -902,6 +926,10 @@ export function GetSecretStatus() {
|
||||
return window['go']['main']['App']['GetSecretStatus']();
|
||||
}
|
||||
|
||||
export function GetSelfSpotSettings() {
|
||||
return window['go']['main']['App']['GetSelfSpotSettings']();
|
||||
}
|
||||
|
||||
export function GetSlotStats() {
|
||||
return window['go']['main']['App']['GetSlotStats']();
|
||||
}
|
||||
@@ -930,6 +958,10 @@ export function GetTelemetryEnabled() {
|
||||
return window['go']['main']['App']['GetTelemetryEnabled']();
|
||||
}
|
||||
|
||||
export function GetTrackedAwards() {
|
||||
return window['go']['main']['App']['GetTrackedAwards']();
|
||||
}
|
||||
|
||||
export function GetTunerGeniusSettings() {
|
||||
return window['go']['main']['App']['GetTunerGeniusSettings']();
|
||||
}
|
||||
@@ -950,6 +982,14 @@ export function GetUltrabeamStatus() {
|
||||
return window['go']['main']['App']['GetUltrabeamStatus']();
|
||||
}
|
||||
|
||||
export function GetWebPublishConfig() {
|
||||
return window['go']['main']['App']['GetWebPublishConfig']();
|
||||
}
|
||||
|
||||
export function GetWebPublishStatus() {
|
||||
return window['go']['main']['App']['GetWebPublishStatus']();
|
||||
}
|
||||
|
||||
export function GetWhatsNew() {
|
||||
return window['go']['main']['App']['GetWhatsNew']();
|
||||
}
|
||||
@@ -962,6 +1002,10 @@ export function GetWinkeyerStatus() {
|
||||
return window['go']['main']['App']['GetWinkeyerStatus']();
|
||||
}
|
||||
|
||||
export function GetWorkedCallVariants() {
|
||||
return window['go']['main']['App']['GetWorkedCallVariants']();
|
||||
}
|
||||
|
||||
export function GetYaesuState() {
|
||||
return window['go']['main']['App']['GetYaesuState']();
|
||||
}
|
||||
@@ -1262,6 +1306,10 @@ export function LookupCallsignFresh(arg1) {
|
||||
return window['go']['main']['App']['LookupCallsignFresh'](arg1);
|
||||
}
|
||||
|
||||
export function MotorNudgeKHz(arg1) {
|
||||
return window['go']['main']['App']['MotorNudgeKHz'](arg1);
|
||||
}
|
||||
|
||||
export function MotorReadElements() {
|
||||
return window['go']['main']['App']['MotorReadElements']();
|
||||
}
|
||||
@@ -1270,6 +1318,10 @@ export function MotorSetElement(arg1, arg2) {
|
||||
return window['go']['main']['App']['MotorSetElement'](arg1, arg2);
|
||||
}
|
||||
|
||||
export function MotorTuneKHz(arg1) {
|
||||
return window['go']['main']['App']['MotorTuneKHz'](arg1);
|
||||
}
|
||||
|
||||
export function MoveDatabase(arg1) {
|
||||
return window['go']['main']['App']['MoveDatabase'](arg1);
|
||||
}
|
||||
@@ -1402,6 +1454,10 @@ export function PopulateBuiltinReferences(arg1) {
|
||||
return window['go']['main']['App']['PopulateBuiltinReferences'](arg1);
|
||||
}
|
||||
|
||||
export function PublishLogNow() {
|
||||
return window['go']['main']['App']['PublishLogNow']();
|
||||
}
|
||||
|
||||
export function QSLDefaultTemplateID() {
|
||||
return window['go']['main']['App']['QSLDefaultTemplateID']();
|
||||
}
|
||||
@@ -1654,6 +1710,10 @@ export function SaveBackupSettings(arg1) {
|
||||
return window['go']['main']['App']['SaveBackupSettings'](arg1);
|
||||
}
|
||||
|
||||
export function SaveBandOpenSettings(arg1) {
|
||||
return window['go']['main']['App']['SaveBandOpenSettings'](arg1);
|
||||
}
|
||||
|
||||
export function SaveCATSettings(arg1) {
|
||||
return window['go']['main']['App']['SaveCATSettings'](arg1);
|
||||
}
|
||||
@@ -1726,6 +1786,10 @@ export function SaveRotators(arg1) {
|
||||
return window['go']['main']['App']['SaveRotators'](arg1);
|
||||
}
|
||||
|
||||
export function SaveSelfSpotSettings(arg1) {
|
||||
return window['go']['main']['App']['SaveSelfSpotSettings'](arg1);
|
||||
}
|
||||
|
||||
export function SaveStationDevices(arg1) {
|
||||
return window['go']['main']['App']['SaveStationDevices'](arg1);
|
||||
}
|
||||
@@ -1734,6 +1798,10 @@ export function SaveStationSettings(arg1) {
|
||||
return window['go']['main']['App']['SaveStationSettings'](arg1);
|
||||
}
|
||||
|
||||
export function SaveTrackedAwards(arg1) {
|
||||
return window['go']['main']['App']['SaveTrackedAwards'](arg1);
|
||||
}
|
||||
|
||||
export function SaveTunerGeniusSettings(arg1) {
|
||||
return window['go']['main']['App']['SaveTunerGeniusSettings'](arg1);
|
||||
}
|
||||
@@ -1746,6 +1814,10 @@ export function SaveUltrabeamSettings(arg1) {
|
||||
return window['go']['main']['App']['SaveUltrabeamSettings'](arg1);
|
||||
}
|
||||
|
||||
export function SaveWebPublishConfig(arg1) {
|
||||
return window['go']['main']['App']['SaveWebPublishConfig'](arg1);
|
||||
}
|
||||
|
||||
export function SaveWinkeyerSettings(arg1) {
|
||||
return window['go']['main']['App']['SaveWinkeyerSettings'](arg1);
|
||||
}
|
||||
@@ -1830,6 +1902,14 @@ export function SetKenwoodKeySpeed(arg1) {
|
||||
return window['go']['main']['App']['SetKenwoodKeySpeed'](arg1);
|
||||
}
|
||||
|
||||
export function SetMotorFollow(arg1, arg2) {
|
||||
return window['go']['main']['App']['SetMotorFollow'](arg1, arg2);
|
||||
}
|
||||
|
||||
export function SetOpsLogQSLReceived(arg1, arg2) {
|
||||
return window['go']['main']['App']['SetOpsLogQSLReceived'](arg1, arg2);
|
||||
}
|
||||
|
||||
export function SetPassphrase(arg1) {
|
||||
return window['go']['main']['App']['SetPassphrase'](arg1);
|
||||
}
|
||||
@@ -1854,6 +1934,10 @@ export function SetWinkeyerTrace(arg1) {
|
||||
return window['go']['main']['App']['SetWinkeyerTrace'](arg1);
|
||||
}
|
||||
|
||||
export function SetWorkedCallVariants(arg1) {
|
||||
return window['go']['main']['App']['SetWorkedCallVariants'](arg1);
|
||||
}
|
||||
|
||||
export function SetYaesuAFGain(arg1) {
|
||||
return window['go']['main']['App']['SetYaesuAFGain'](arg1);
|
||||
}
|
||||
@@ -2006,6 +2090,10 @@ export function TestUltrabeam(arg1) {
|
||||
return window['go']['main']['App']['TestUltrabeam'](arg1);
|
||||
}
|
||||
|
||||
export function TestWebPublishFTP(arg1) {
|
||||
return window['go']['main']['App']['TestWebPublishFTP'](arg1);
|
||||
}
|
||||
|
||||
export function TuneYaesuATU() {
|
||||
return window['go']['main']['App']['TuneYaesuATU']();
|
||||
}
|
||||
@@ -2070,6 +2158,10 @@ export function UploadQSOsManual(arg1, arg2) {
|
||||
return window['go']['main']['App']['UploadQSOsManual'](arg1, arg2);
|
||||
}
|
||||
|
||||
export function WebPublishColumns() {
|
||||
return window['go']['main']['App']['WebPublishColumns']();
|
||||
}
|
||||
|
||||
export function WinkeyerBackspace() {
|
||||
return window['go']['main']['App']['WinkeyerBackspace']();
|
||||
}
|
||||
|
||||
@@ -315,6 +315,7 @@ export namespace award {
|
||||
pattern: string;
|
||||
leading_str?: string;
|
||||
trailing_str?: string;
|
||||
prefix?: string;
|
||||
dynamic?: boolean;
|
||||
one_ref_per_qso?: boolean;
|
||||
or_rules?: OrRule[];
|
||||
@@ -324,6 +325,8 @@ export namespace award {
|
||||
emission?: string[];
|
||||
confirm: string[];
|
||||
validate?: string[];
|
||||
confirm_field?: string;
|
||||
confirm_value?: string;
|
||||
grant_codes?: string;
|
||||
export_credit_granted?: boolean;
|
||||
total: number;
|
||||
@@ -356,6 +359,7 @@ export namespace award {
|
||||
this.pattern = source["pattern"];
|
||||
this.leading_str = source["leading_str"];
|
||||
this.trailing_str = source["trailing_str"];
|
||||
this.prefix = source["prefix"];
|
||||
this.dynamic = source["dynamic"];
|
||||
this.one_ref_per_qso = source["one_ref_per_qso"];
|
||||
this.or_rules = this.convertValues(source["or_rules"], OrRule);
|
||||
@@ -365,6 +369,8 @@ export namespace award {
|
||||
this.emission = source["emission"];
|
||||
this.confirm = source["confirm"];
|
||||
this.validate = source["validate"];
|
||||
this.confirm_field = source["confirm_field"];
|
||||
this.confirm_value = source["confirm_value"];
|
||||
this.grant_codes = source["grant_codes"];
|
||||
this.export_credit_granted = source["export_credit_granted"];
|
||||
this.total = source["total"];
|
||||
@@ -671,6 +677,58 @@ export namespace awardref {
|
||||
|
||||
}
|
||||
|
||||
export namespace bandopen {
|
||||
|
||||
export class Opening {
|
||||
band: string;
|
||||
calls: number;
|
||||
median_km: number;
|
||||
bearing_min: number;
|
||||
bearing_max: number;
|
||||
compass: string;
|
||||
in_season: boolean;
|
||||
// Go type: time
|
||||
at: any;
|
||||
examples: string[];
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new Opening(source);
|
||||
}
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.band = source["band"];
|
||||
this.calls = source["calls"];
|
||||
this.median_km = source["median_km"];
|
||||
this.bearing_min = source["bearing_min"];
|
||||
this.bearing_max = source["bearing_max"];
|
||||
this.compass = source["compass"];
|
||||
this.in_season = source["in_season"];
|
||||
this.at = this.convertValues(source["at"], null);
|
||||
this.examples = source["examples"];
|
||||
}
|
||||
|
||||
convertValues(a: any, classs: any, asMap: boolean = false): any {
|
||||
if (!a) {
|
||||
return a;
|
||||
}
|
||||
if (a.slice && a.map) {
|
||||
return (a as any[]).map(elem => this.convertValues(elem, classs));
|
||||
} else if ("object" === typeof a) {
|
||||
if (asMap) {
|
||||
for (const key of Object.keys(a)) {
|
||||
a[key] = new classs(a[key]);
|
||||
}
|
||||
return a;
|
||||
}
|
||||
return new classs(a);
|
||||
}
|
||||
return a;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
export namespace cat {
|
||||
|
||||
export class FlexMeter {
|
||||
@@ -1894,6 +1952,8 @@ export namespace main {
|
||||
folder: string;
|
||||
rotation: number;
|
||||
zip: boolean;
|
||||
every_exit: boolean;
|
||||
keep_all: boolean;
|
||||
last_backup_at: string;
|
||||
default_folder: string;
|
||||
|
||||
@@ -1907,10 +1967,28 @@ export namespace main {
|
||||
this.folder = source["folder"];
|
||||
this.rotation = source["rotation"];
|
||||
this.zip = source["zip"];
|
||||
this.every_exit = source["every_exit"];
|
||||
this.keep_all = source["keep_all"];
|
||||
this.last_backup_at = source["last_backup_at"];
|
||||
this.default_folder = source["default_folder"];
|
||||
}
|
||||
}
|
||||
export class BandOpenSettings {
|
||||
enabled: boolean;
|
||||
bands: string[];
|
||||
available: string[];
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new BandOpenSettings(source);
|
||||
}
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.enabled = source["enabled"];
|
||||
this.bands = source["bands"];
|
||||
this.available = source["available"];
|
||||
}
|
||||
}
|
||||
export class CATSettings {
|
||||
enabled: boolean;
|
||||
backend: string;
|
||||
@@ -1930,6 +2008,7 @@ export namespace main {
|
||||
kenwood_host: string;
|
||||
kenwood_port: string;
|
||||
kenwood_baud: number;
|
||||
kenwood_data_mode: string;
|
||||
yaesu_low_lines: boolean;
|
||||
kenwood_low_lines: boolean;
|
||||
icom_port: string;
|
||||
@@ -1975,6 +2054,7 @@ export namespace main {
|
||||
this.kenwood_host = source["kenwood_host"];
|
||||
this.kenwood_port = source["kenwood_port"];
|
||||
this.kenwood_baud = source["kenwood_baud"];
|
||||
this.kenwood_data_mode = source["kenwood_data_mode"];
|
||||
this.yaesu_low_lines = source["yaesu_low_lines"];
|
||||
this.kenwood_low_lines = source["kenwood_low_lines"];
|
||||
this.icom_port = source["icom_port"];
|
||||
@@ -2633,6 +2713,7 @@ export namespace main {
|
||||
subject: string;
|
||||
body: string;
|
||||
auto_send: boolean;
|
||||
default_message: string;
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new QSLEmailTemplates(source);
|
||||
@@ -2643,6 +2724,7 @@ export namespace main {
|
||||
this.subject = source["subject"];
|
||||
this.body = source["body"];
|
||||
this.auto_send = source["auto_send"];
|
||||
this.default_message = source["default_message"];
|
||||
}
|
||||
}
|
||||
export class QSLFontInfo {
|
||||
@@ -2904,11 +2986,26 @@ export namespace main {
|
||||
this.unlocked = source["unlocked"];
|
||||
}
|
||||
}
|
||||
export class SelfSpotSettings {
|
||||
enabled: boolean;
|
||||
minutes: number;
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new SelfSpotSettings(source);
|
||||
}
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.enabled = source["enabled"];
|
||||
this.minutes = source["minutes"];
|
||||
}
|
||||
}
|
||||
export class SpotQuery {
|
||||
call: string;
|
||||
band: string;
|
||||
mode: string;
|
||||
pota_ref?: string;
|
||||
spotter?: string;
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new SpotQuery(source);
|
||||
@@ -2920,6 +3017,7 @@ export namespace main {
|
||||
this.band = source["band"];
|
||||
this.mode = source["mode"];
|
||||
this.pota_ref = source["pota_ref"];
|
||||
this.spotter = source["spotter"];
|
||||
}
|
||||
}
|
||||
export class SpotStatus {
|
||||
@@ -2931,9 +3029,16 @@ export namespace main {
|
||||
status: string;
|
||||
worked_call: boolean;
|
||||
new_county: boolean;
|
||||
county?: string;
|
||||
state?: string;
|
||||
new_pota: boolean;
|
||||
grid?: string;
|
||||
new_grid: boolean;
|
||||
spotter_continent?: string;
|
||||
lotw: boolean;
|
||||
new_pfx: boolean;
|
||||
pfx?: string;
|
||||
worked_slot: boolean;
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new SpotStatus(source);
|
||||
@@ -2949,9 +3054,16 @@ export namespace main {
|
||||
this.status = source["status"];
|
||||
this.worked_call = source["worked_call"];
|
||||
this.new_county = source["new_county"];
|
||||
this.county = source["county"];
|
||||
this.state = source["state"];
|
||||
this.new_pota = source["new_pota"];
|
||||
this.grid = source["grid"];
|
||||
this.new_grid = source["new_grid"];
|
||||
this.spotter_continent = source["spotter_continent"];
|
||||
this.lotw = source["lotw"];
|
||||
this.new_pfx = source["new_pfx"];
|
||||
this.pfx = source["pfx"];
|
||||
this.worked_slot = source["worked_slot"];
|
||||
}
|
||||
}
|
||||
export class StartupStatus {
|
||||
@@ -3082,6 +3194,7 @@ export namespace main {
|
||||
my_country: string;
|
||||
my_sota_ref: string;
|
||||
my_pota_ref: string;
|
||||
my_iota: string;
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new StationSettings(source);
|
||||
@@ -3095,6 +3208,7 @@ export namespace main {
|
||||
this.my_country = source["my_country"];
|
||||
this.my_sota_ref = source["my_sota_ref"];
|
||||
this.my_pota_ref = source["my_pota_ref"];
|
||||
this.my_iota = source["my_iota"];
|
||||
}
|
||||
}
|
||||
export class StationTestResult {
|
||||
@@ -3154,6 +3268,7 @@ export namespace main {
|
||||
follow: boolean;
|
||||
step_khz: number;
|
||||
tx_inhibit: boolean;
|
||||
bands: string[];
|
||||
freq_min_mhz: number;
|
||||
freq_max_mhz: number;
|
||||
|
||||
@@ -3173,6 +3288,7 @@ export namespace main {
|
||||
this.follow = source["follow"];
|
||||
this.step_khz = source["step_khz"];
|
||||
this.tx_inhibit = source["tx_inhibit"];
|
||||
this.bands = source["bands"];
|
||||
this.freq_min_mhz = source["freq_min_mhz"];
|
||||
this.freq_max_mhz = source["freq_max_mhz"];
|
||||
}
|
||||
@@ -3186,6 +3302,9 @@ export namespace main {
|
||||
band: number;
|
||||
moving: boolean;
|
||||
elements: number[];
|
||||
follow: boolean;
|
||||
step_khz: number;
|
||||
bands: string[];
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new UltrabeamStatusInfo(source);
|
||||
@@ -3201,6 +3320,9 @@ export namespace main {
|
||||
this.band = source["band"];
|
||||
this.moving = source["moving"];
|
||||
this.elements = source["elements"];
|
||||
this.follow = source["follow"];
|
||||
this.step_khz = source["step_khz"];
|
||||
this.bands = source["bands"];
|
||||
}
|
||||
}
|
||||
export class UpdateInfo {
|
||||
@@ -3237,6 +3359,20 @@ export namespace main {
|
||||
this.text = source["text"];
|
||||
}
|
||||
}
|
||||
export class WebPublishStatus {
|
||||
last_run: string;
|
||||
last_err: string;
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new WebPublishStatus(source);
|
||||
}
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.last_run = source["last_run"];
|
||||
this.last_err = source["last_err"];
|
||||
}
|
||||
}
|
||||
export class WinkeyerSettings {
|
||||
enabled: boolean;
|
||||
port: string;
|
||||
@@ -3603,6 +3739,7 @@ export namespace profile {
|
||||
my_city: string;
|
||||
my_postal_code: string;
|
||||
my_sota_ref: string;
|
||||
my_iota: string;
|
||||
my_pota_ref: string;
|
||||
my_rig: string;
|
||||
my_antenna: string;
|
||||
@@ -3640,6 +3777,7 @@ export namespace profile {
|
||||
this.my_city = source["my_city"];
|
||||
this.my_postal_code = source["my_postal_code"];
|
||||
this.my_sota_ref = source["my_sota_ref"];
|
||||
this.my_iota = source["my_iota"];
|
||||
this.my_pota_ref = source["my_pota_ref"];
|
||||
this.my_rig = source["my_rig"];
|
||||
this.my_antenna = source["my_antenna"];
|
||||
@@ -3677,6 +3815,52 @@ export namespace profile {
|
||||
|
||||
}
|
||||
|
||||
export namespace pskr {
|
||||
|
||||
export class Status {
|
||||
running: boolean;
|
||||
received: number;
|
||||
// Go type: time
|
||||
last_at: any;
|
||||
last_err?: string;
|
||||
broker: string;
|
||||
bands: string[];
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new Status(source);
|
||||
}
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.running = source["running"];
|
||||
this.received = source["received"];
|
||||
this.last_at = this.convertValues(source["last_at"], null);
|
||||
this.last_err = source["last_err"];
|
||||
this.broker = source["broker"];
|
||||
this.bands = source["bands"];
|
||||
}
|
||||
|
||||
convertValues(a: any, classs: any, asMap: boolean = false): any {
|
||||
if (!a) {
|
||||
return a;
|
||||
}
|
||||
if (a.slice && a.map) {
|
||||
return (a as any[]).map(elem => this.convertValues(elem, classs));
|
||||
} else if ("object" === typeof a) {
|
||||
if (asMap) {
|
||||
for (const key of Object.keys(a)) {
|
||||
a[key] = new classs(a[key]);
|
||||
}
|
||||
return a;
|
||||
}
|
||||
return new classs(a);
|
||||
}
|
||||
return a;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
export namespace qslcard {
|
||||
|
||||
export class Bevel {
|
||||
@@ -4783,6 +4967,53 @@ export namespace udp {
|
||||
|
||||
}
|
||||
|
||||
export namespace webpub {
|
||||
|
||||
export class Config {
|
||||
enabled: boolean;
|
||||
format: string;
|
||||
folder: string;
|
||||
file_name: string;
|
||||
title: string;
|
||||
count: number;
|
||||
interval_min: number;
|
||||
columns: string[];
|
||||
ftp_enabled: boolean;
|
||||
ftp_host: string;
|
||||
ftp_port: number;
|
||||
ftp_user: string;
|
||||
ftp_password: string;
|
||||
ftp_tls: boolean;
|
||||
ftp_folder: string;
|
||||
ftp_file_name: string;
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new Config(source);
|
||||
}
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.enabled = source["enabled"];
|
||||
this.format = source["format"];
|
||||
this.folder = source["folder"];
|
||||
this.file_name = source["file_name"];
|
||||
this.title = source["title"];
|
||||
this.count = source["count"];
|
||||
this.interval_min = source["interval_min"];
|
||||
this.columns = source["columns"];
|
||||
this.ftp_enabled = source["ftp_enabled"];
|
||||
this.ftp_host = source["ftp_host"];
|
||||
this.ftp_port = source["ftp_port"];
|
||||
this.ftp_user = source["ftp_user"];
|
||||
this.ftp_password = source["ftp_password"];
|
||||
this.ftp_tls = source["ftp_tls"];
|
||||
this.ftp_folder = source["ftp_folder"];
|
||||
this.ftp_file_name = source["ftp_file_name"];
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
export namespace winkeyer {
|
||||
|
||||
export class Status {
|
||||
|
||||
@@ -4,14 +4,16 @@ go 1.25.0
|
||||
|
||||
require (
|
||||
github.com/braheezy/shine-mp3 v0.1.0
|
||||
github.com/eclipse/paho.mqtt.golang v1.5.1
|
||||
github.com/go-ole/go-ole v1.3.0
|
||||
github.com/go-sql-driver/mysql v1.10.0
|
||||
github.com/gorilla/websocket v1.5.3
|
||||
github.com/jlaffaye/ftp v0.2.2
|
||||
github.com/moutend/go-wca v0.3.0
|
||||
github.com/wailsapp/wails/v2 v2.11.0
|
||||
github.com/wneessen/go-mail v0.7.3
|
||||
go.bug.st/serial v1.7.1
|
||||
golang.org/x/net v0.35.0
|
||||
golang.org/x/net v0.44.0
|
||||
golang.org/x/sys v0.45.0
|
||||
golang.org/x/text v0.37.0
|
||||
modernc.org/sqlite v1.50.1
|
||||
@@ -43,7 +45,8 @@ require (
|
||||
github.com/valyala/fasttemplate v1.2.2 // indirect
|
||||
github.com/wailsapp/go-webview2 v1.0.22 // indirect
|
||||
github.com/wailsapp/mimetype v1.4.1 // indirect
|
||||
golang.org/x/crypto v0.33.0 // indirect
|
||||
golang.org/x/crypto v0.42.0 // indirect
|
||||
golang.org/x/sync v0.20.0 // indirect
|
||||
modernc.org/libc v1.72.3 // indirect
|
||||
modernc.org/mathutil v1.7.1 // indirect
|
||||
modernc.org/memory v1.11.0 // indirect
|
||||
|
||||
@@ -8,6 +8,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
|
||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
|
||||
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
|
||||
github.com/eclipse/paho.mqtt.golang v1.5.1 h1:/VSOv3oDLlpqR2Epjn1Q7b2bSTplJIeV2ISgCl2W7nE=
|
||||
github.com/eclipse/paho.mqtt.golang v1.5.1/go.mod h1:1/yJCneuyOoCOzKSsOTUc0AJfpsItBGWvYpBLimhArU=
|
||||
github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
|
||||
github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
|
||||
github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
|
||||
@@ -25,6 +27,8 @@ github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs
|
||||
github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
|
||||
github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e h1:Q3+PugElBCf4PFpxhErSzU3/PY5sFL5Z6rfv4AbGAck=
|
||||
github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e/go.mod h1:alcuEEnZsY1WQsagKhZDsoPCRoOijYqhZvPwLG0kzVs=
|
||||
github.com/jlaffaye/ftp v0.2.2 h1:JwjrXCAIjN9ZYrF1/8qlmHFXDteh9MHYaiEIh/Oqtd8=
|
||||
github.com/jlaffaye/ftp v0.2.2/go.mod h1:zuLAKdqFqFvNgkCrH0SC7K1XyUiydS7BFCmmoHUWWg0=
|
||||
github.com/labstack/echo/v4 v4.13.3 h1:pwhpCPrTl5qry5HRdM5FwdXnhXSLSY+WE+YQSeCaafY=
|
||||
github.com/labstack/echo/v4 v4.13.3/go.mod h1:o90YNEeQWjDozo584l7AwhJMHN0bOC4tAfg+Xox9q5g=
|
||||
github.com/labstack/gommon v0.4.2 h1:F8qTUNXgG1+6WQmqoUWnz8WiEU60mXVVw0P4ht1WRA0=
|
||||
@@ -64,8 +68,8 @@ github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
|
||||
github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
|
||||
github.com/samber/lo v1.49.1 h1:4BIFyVfuQSEpluc7Fua+j1NolZHiEHEpaSEKdsH0tew=
|
||||
github.com/samber/lo v1.49.1/go.mod h1:dO6KHFzUKXgP8LDhU0oI8d2hekjXnGOu0DB8Jecxd6o=
|
||||
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
|
||||
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
|
||||
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
|
||||
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
|
||||
github.com/tkrajina/go-reflector v0.5.8 h1:yPADHrwmUbMq4RGEyaOUpz2H90sRsETNVpjzo3DLVQQ=
|
||||
github.com/tkrajina/go-reflector v0.5.8/go.mod h1:ECbqLgccecY5kPmPmXg1MrHW585yMcDkVl6IvJe64T4=
|
||||
github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
|
||||
@@ -82,13 +86,13 @@ github.com/wneessen/go-mail v0.7.3 h1:g3DravXC5SMlVdboFrQA8Jx95A8sOzoBeS5F+vzNRK
|
||||
github.com/wneessen/go-mail v0.7.3/go.mod h1:QGhBX0yNbc1J+Mkjcu7z2rpj4B4l+BmDY8gYznPC9sk=
|
||||
go.bug.st/serial v1.7.1 h1:5aP8wYL0UjEYOVs3oPAGscjaSfRQLHtCvBFXNN/rwtc=
|
||||
go.bug.st/serial v1.7.1/go.mod h1:d0MmS16Qt9b1m06yoYRNUXhRRTJV5Qg2S5EKqQtnayQ=
|
||||
golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus=
|
||||
golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
|
||||
golang.org/x/crypto v0.42.0 h1:chiH31gIWm57EkTXpwnqf8qeuMUi0yekh6mT2AvFlqI=
|
||||
golang.org/x/crypto v0.42.0/go.mod h1:4+rDnOTJhQCx2q7/j6rAN5XDw8kPjeaXEUR2eL94ix8=
|
||||
golang.org/x/mod v0.35.0 h1:Ww1D637e6Pg+Zb2KrWfHQUnH2dQRLBQyAtpr/haaJeM=
|
||||
golang.org/x/mod v0.35.0/go.mod h1:+GwiRhIInF8wPm+4AoT6L0FA1QWAad3OMdTRx4tFYlU=
|
||||
golang.org/x/net v0.0.0-20210505024714-0287a6fb4125/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
||||
golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8=
|
||||
golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk=
|
||||
golang.org/x/net v0.44.0 h1:evd8IRDyfNBMBTTY5XRF1vaZlD+EmWx6x8PkhR04H/I=
|
||||
golang.org/x/net v0.44.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY=
|
||||
golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
|
||||
golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
|
||||
golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
|
||||
+95
-7
@@ -74,6 +74,7 @@ type Def struct {
|
||||
Pattern string `json:"pattern"` // award-level Go regexp; group 1 = reference
|
||||
LeadingStr string `json:"leading_str,omitempty"` // strip this prefix before matching
|
||||
TrailingStr string `json:"trailing_str,omitempty"` // strip this suffix before matching
|
||||
Prefix string `json:"prefix,omitempty"` // prepended to each found reference (e.g. captured "01" + "D" → "D01"), same as OrRule.Prefix
|
||||
Dynamic bool `json:"dynamic,omitempty"` // references not predefined (any value counts)
|
||||
// OneRefPerQSO refuses an AMBIGUOUS match rather than guessing.
|
||||
//
|
||||
@@ -110,6 +111,18 @@ type Def struct {
|
||||
// --- Confirmation ---
|
||||
Confirm []string `json:"confirm"` // worked-confirmed: lotw|qsl|eqsl|qrzcom|custom
|
||||
Validate []string `json:"validate,omitempty"` // validated/granted sources
|
||||
// The "custom" source, for confirmations OpsLog has no dedicated column for:
|
||||
// ConfirmField names a QSO field or an ADIF extras key, ConfirmValue the
|
||||
// value(s) that count (comma-separated, case-insensitive).
|
||||
//
|
||||
// An EMPTY ConfirmValue means "any non-empty value confirms" — which is what
|
||||
// the OpsLog card marker needs: APP_OPSLOG_QSL_RCVD stores the timestamp of
|
||||
// the day the card arrived, not a Y/N flag. The same shape serves a key
|
||||
// stamped by an outside source (a club's CSV imported into an extras field),
|
||||
// so one mechanism covers every "confirmed somewhere else" case instead of a
|
||||
// new checkbox per site.
|
||||
ConfirmField string `json:"confirm_field,omitempty"`
|
||||
ConfirmValue string `json:"confirm_value,omitempty"`
|
||||
// NOT IMPLEMENTED. Kept so the values operators already typed are not lost, but
|
||||
// nothing reads them: no ADIF export has ever written CREDIT_GRANTED. Their
|
||||
// controls have been removed from the editor — a checkbox that quietly does
|
||||
@@ -522,8 +535,8 @@ func Compute(defs []Def, qsos []qso.QSO, refMetas map[string][]RefMeta, nameOf N
|
||||
}
|
||||
band := strings.ToLower(strings.TrimSpace(q.Band))
|
||||
modeClass := ModeClass(q.Mode)
|
||||
isConf := confirmed(q, d.Confirm)
|
||||
isVal := confirmed(q, d.Validate)
|
||||
isConf := confirmed(q, d.Confirm, d)
|
||||
isVal := confirmed(q, d.Validate, d)
|
||||
for _, ref := range refs {
|
||||
a := agg[i][ref]
|
||||
if a == nil {
|
||||
@@ -684,8 +697,9 @@ func manualRefs(q *qso.QSO, code string) []string {
|
||||
}
|
||||
|
||||
// Confirmed reports whether a QSO satisfies any of the given confirmation
|
||||
// sources (lotw|qsl|eqsl). Exported for the statistics view.
|
||||
func Confirmed(q *qso.QSO, sources []string) bool { return confirmed(q, sources) }
|
||||
// sources (lotw|qsl|eqsl|qrzcom|custom). Exported for the statistics view.
|
||||
// The Def is needed for the "custom" source, which reads the field IT names.
|
||||
func Confirmed(q *qso.QSO, d Def, sources []string) bool { return confirmed(q, sources, &d) }
|
||||
|
||||
// InScope reports whether a QSO falls within an award's scope (DXCC entity,
|
||||
// bands, modes, emission, dates) — independent of whether a reference was
|
||||
@@ -779,6 +793,10 @@ func searchOne(field, matchBy string, re *regexp.Regexp, exact bool, leading, tr
|
||||
byDesc := predefined && strings.EqualFold(strings.TrimSpace(matchBy), "description")
|
||||
|
||||
var found []string
|
||||
// codesAreFinal: this branch produced references straight from the award's
|
||||
// LIST, so they are already whole codes. The blanket prefix at the end must
|
||||
// leave them alone — prefixing a code that is already "D74" yields "DD74".
|
||||
codesAreFinal := false
|
||||
switch {
|
||||
case re != nil:
|
||||
// Award-level regex: capture group 1 (or whole match) for each hit.
|
||||
@@ -787,6 +805,7 @@ func searchOne(field, matchBy string, re *regexp.Regexp, exact bool, leading, tr
|
||||
// Match references by their DESCRIPTION/name appearing in the field
|
||||
// (e.g. WAJA finds the prefecture name inside the QTH). ExactMatch means
|
||||
// the field equals the name; otherwise the name is a substring of it.
|
||||
codesAreFinal = true
|
||||
up := strings.ToUpper(raw)
|
||||
for _, nc := range rl.names {
|
||||
if exact {
|
||||
@@ -809,9 +828,23 @@ func searchOne(field, matchBy string, re *regexp.Regexp, exact bool, leading, tr
|
||||
// "Search reference inside the field": look up each token of the field in
|
||||
// the list — O(tokens), not O(all references) — plus test the few
|
||||
// references that declare a regex.
|
||||
codesAreFinal = true
|
||||
for _, tok := range tokenize(raw) {
|
||||
if _, ok := rl.byCode[tok]; ok {
|
||||
found = append(found, tok)
|
||||
continue
|
||||
}
|
||||
// The field may carry the reference WITHOUT the award's letter: a French
|
||||
// operator writes "74" in STATE while the DDFM codes are "D74". Prefix is
|
||||
// exactly what that case is for, so try the prefixed form HERE — applying
|
||||
// it after the lookup (as the blanket pass below used to) could never
|
||||
// help, because the lookup is the step that failed. Without this, the
|
||||
// only way to match a bare department was to write a regex, in a mode
|
||||
// where the operator had chosen "code" and not "pattern".
|
||||
if prefix != "" {
|
||||
if _, ok := rl.byCode[prefix+tok]; ok {
|
||||
found = append(found, prefix+tok)
|
||||
}
|
||||
}
|
||||
}
|
||||
for _, code := range rl.withPattern {
|
||||
@@ -825,7 +858,7 @@ func searchOne(field, matchBy string, re *regexp.Regexp, exact bool, leading, tr
|
||||
// counts each reference separately.
|
||||
found = splitRefs(raw)
|
||||
}
|
||||
if prefix != "" {
|
||||
if prefix != "" && !codesAreFinal {
|
||||
for i := range found {
|
||||
found[i] = prefix + found[i]
|
||||
}
|
||||
@@ -960,7 +993,7 @@ func candidatesTrace(d *Def, re *regexp.Regexp, q *qso.QSO, rl refList, hasList
|
||||
// Testing the raw candidate would call that a hit, skip every fallback, and
|
||||
// only then drop it as unlisted — leaving the QSO unmatched even though the
|
||||
// next rule ("find the code inside the QTH") would have found BG.
|
||||
found := run("primary", d.Field, d.MatchBy, d.Pattern, re, d.ExactMatch, d.LeadingStr, d.TrailingStr, "")
|
||||
found := run("primary", d.Field, d.MatchBy, d.Pattern, re, d.ExactMatch, d.LeadingStr, d.TrailingStr, d.Prefix)
|
||||
for i := range d.OrRules {
|
||||
r := &d.OrRules[i]
|
||||
label := fmt.Sprintf("OR %d", i+1)
|
||||
@@ -1373,7 +1406,7 @@ func dxccAllowed(dxcc *int, filter []int) bool {
|
||||
|
||||
// confirmed reports whether the QSO satisfies any accepted confirmation source.
|
||||
// ADIF *_QSL_RCVD values Y (confirmed) and V (verified) both count.
|
||||
func confirmed(q *qso.QSO, sources []string) bool {
|
||||
func confirmed(q *qso.QSO, sources []string, d *Def) bool {
|
||||
for _, s := range sources {
|
||||
switch s {
|
||||
case "lotw":
|
||||
@@ -1388,11 +1421,66 @@ func confirmed(q *qso.QSO, sources []string) bool {
|
||||
if isYes(q.EQSLRcvd) {
|
||||
return true
|
||||
}
|
||||
case "qrzcom":
|
||||
// The DOWNLOAD status, not the upload one: uploading a QSO to QRZ is
|
||||
// us telling them, not them confirming it back.
|
||||
if isYes(q.QRZComDownloadStatus) {
|
||||
return true
|
||||
}
|
||||
case "custom":
|
||||
if customConfirmed(q, d) {
|
||||
return true
|
||||
}
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
// customConfirmed answers the operator-defined confirmation source: the field
|
||||
// named by ConfirmField, optionally required to hold one of ConfirmValue's
|
||||
// comma-separated values.
|
||||
//
|
||||
// A source that names no field confirms NOTHING. That is deliberate: ticking
|
||||
// "custom" without saying what it means used to mark every QSO as unconfirmed
|
||||
// anyway, and silently marking them all CONFIRMED instead would be far worse.
|
||||
func customConfirmed(q *qso.QSO, d *Def) bool {
|
||||
if d == nil {
|
||||
return false
|
||||
}
|
||||
field := strings.TrimSpace(d.ConfirmField)
|
||||
if field == "" {
|
||||
return false
|
||||
}
|
||||
got := strings.TrimSpace(customFieldValue(q, field))
|
||||
if got == "" {
|
||||
return false
|
||||
}
|
||||
want := strings.TrimSpace(d.ConfirmValue)
|
||||
if want == "" {
|
||||
return true // any value at all counts — see ConfirmField's doc
|
||||
}
|
||||
for _, w := range strings.Split(want, ",") {
|
||||
if w = strings.TrimSpace(w); w != "" && strings.EqualFold(w, got) {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
// customFieldValue resolves the field a custom confirmation names: one of the
|
||||
// engine's known QSO fields first, then the ADIF extras — which is where the
|
||||
// OpsLog card marker (APP_OPSLOG_QSL_RCVD) and anything stamped by an outside
|
||||
// import actually live.
|
||||
func customFieldValue(q *qso.QSO, field string) string {
|
||||
if v := strings.TrimSpace(fieldRaw(field, q)); v != "" {
|
||||
return v
|
||||
}
|
||||
if q.Extras == nil {
|
||||
return ""
|
||||
}
|
||||
return q.Extras[strings.ToUpper(strings.TrimSpace(field))]
|
||||
}
|
||||
|
||||
func isYes(v string) bool {
|
||||
switch strings.ToUpper(strings.TrimSpace(v)) {
|
||||
case "Y", "V":
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,66 @@
|
||||
package award
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"hamlog/internal/qso"
|
||||
)
|
||||
|
||||
// Every source the editor offers must actually do something. "qrzcom" and
|
||||
// "custom" were listed in the UI and in Def's doc comment but had no case in the
|
||||
// switch, so ticking either marked nothing as confirmed — a checkbox that is
|
||||
// trusted and silently inert.
|
||||
func TestConfirmedSources(t *testing.T) {
|
||||
cases := []struct {
|
||||
name string
|
||||
q qso.QSO
|
||||
d Def
|
||||
sources []string
|
||||
want bool
|
||||
}{
|
||||
{"lotw", qso.QSO{LOTWRcvd: "Y"}, Def{}, []string{"lotw"}, true},
|
||||
{"qsl", qso.QSO{QSLRcvd: "Y"}, Def{}, []string{"qsl"}, true},
|
||||
{"eqsl", qso.QSO{EQSLRcvd: "Y"}, Def{}, []string{"eqsl"}, true},
|
||||
|
||||
// QRZ confirms on the DOWNLOAD status. The upload one is us telling QRZ
|
||||
// about the QSO, which is not a confirmation of anything.
|
||||
{"qrz download", qso.QSO{QRZComDownloadStatus: "Y"}, Def{}, []string{"qrzcom"}, true},
|
||||
{"qrz upload only", qso.QSO{QRZComUploadStatus: "Y"}, Def{}, []string{"qrzcom"}, false},
|
||||
|
||||
// Custom, no value required: any non-empty value counts. This is the
|
||||
// OpsLog card case — the marker holds a timestamp, not a flag.
|
||||
{"custom any value",
|
||||
qso.QSO{Extras: map[string]string{"APP_OPSLOG_QSL_RCVD": "2026-08-09T01:00:00Z"}},
|
||||
Def{ConfirmField: "APP_OPSLOG_QSL_RCVD"}, []string{"custom"}, true},
|
||||
{"custom field empty",
|
||||
qso.QSO{Extras: map[string]string{"APP_OPSLOG_QSL_RCVD": ""}},
|
||||
Def{ConfirmField: "APP_OPSLOG_QSL_RCVD"}, []string{"custom"}, false},
|
||||
|
||||
// Custom with an explicit value list, matched case-insensitively.
|
||||
{"custom value match",
|
||||
qso.QSO{Extras: map[string]string{"APP_CLUB_CONF": "v"}},
|
||||
Def{ConfirmField: "APP_CLUB_CONF", ConfirmValue: "Y,V"}, []string{"custom"}, true},
|
||||
{"custom value mismatch",
|
||||
qso.QSO{Extras: map[string]string{"APP_CLUB_CONF": "N"}},
|
||||
Def{ConfirmField: "APP_CLUB_CONF", ConfirmValue: "Y,V"}, []string{"custom"}, false},
|
||||
|
||||
// A custom source naming no field must confirm NOTHING — never everything.
|
||||
{"custom without a field",
|
||||
qso.QSO{Extras: map[string]string{"APP_OPSLOG_QSL_RCVD": "x"}},
|
||||
Def{}, []string{"custom"}, false},
|
||||
|
||||
// Known QSO fields resolve too, not just extras.
|
||||
{"custom on a known field", qso.QSO{State: "TX"},
|
||||
Def{ConfirmField: "state", ConfirmValue: "TX"}, []string{"custom"}, true},
|
||||
|
||||
// Any source in the list is enough.
|
||||
{"first source misses, second hits", qso.QSO{EQSLRcvd: "Y"}, Def{},
|
||||
[]string{"lotw", "eqsl"}, true},
|
||||
{"no source set", qso.QSO{LOTWRcvd: "Y"}, Def{}, nil, false},
|
||||
}
|
||||
for _, c := range cases {
|
||||
if got := Confirmed(&c.q, c.d, c.sources); got != c.want {
|
||||
t.Errorf("%s: Confirmed = %v, want %v", c.name, got, c.want)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,81 @@
|
||||
package award
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"hamlog/internal/qso"
|
||||
)
|
||||
|
||||
// ddfmLike is a small stand-in for the French departments award: predefined
|
||||
// references whose codes carry a letter the operator does not type.
|
||||
func ddfmLike() []Def {
|
||||
return []Def{{
|
||||
Code: "DDFM", Name: "Departments", Type: TypeQSOFields,
|
||||
Field: "state", MatchBy: "code", Prefix: "D",
|
||||
}}
|
||||
}
|
||||
|
||||
func ddfmRefs() map[string][]RefMeta {
|
||||
return map[string][]RefMeta{"DDFM": {
|
||||
{Code: "D29", Name: "Finistère", Valid: true},
|
||||
{Code: "D49", Name: "Maine-et-Loire", Valid: true},
|
||||
{Code: "D74", Name: "Haute-Savoie", Valid: true},
|
||||
}}
|
||||
}
|
||||
|
||||
func refsOf(t *testing.T, defs []Def, q qso.QSO) []string {
|
||||
t.Helper()
|
||||
res := Compute(defs, []qso.QSO{q}, ddfmRefs(), nil)
|
||||
if len(res) != 1 {
|
||||
t.Fatalf("want 1 result, got %d", len(res))
|
||||
}
|
||||
var out []string
|
||||
for _, r := range res[0].Refs {
|
||||
if r.Worked {
|
||||
out = append(out, r.Ref)
|
||||
}
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// The reported case: the operator writes just "74" in STATE, the award's codes
|
||||
// are "D74", match-by is "code" and a Prefix of "D" is set. That found nothing —
|
||||
// the prefix was applied only AFTER the list lookup, i.e. after the step that
|
||||
// had already failed — so the only workaround was a regex, in a mode where the
|
||||
// operator had explicitly chosen "code" rather than "pattern".
|
||||
func TestPrefixCompletesABareReference(t *testing.T) {
|
||||
got := refsOf(t, ddfmLike(), qso.QSO{Callsign: "F5AYE", State: "74"})
|
||||
if len(got) != 1 || got[0] != "D74" {
|
||||
t.Errorf("bare state 74 with prefix D → %v, want [D74]", got)
|
||||
}
|
||||
}
|
||||
|
||||
// And a field that ALREADY holds the whole code must not be prefixed twice.
|
||||
// The blanket pass turned "D74" into "DD74" whenever a prefix was configured.
|
||||
func TestPrefixDoesNotDoubleUpOnACompleteCode(t *testing.T) {
|
||||
got := refsOf(t, ddfmLike(), qso.QSO{Callsign: "F5AYE", State: "D74"})
|
||||
if len(got) != 1 || got[0] != "D74" {
|
||||
t.Errorf("state D74 with prefix D → %v, want [D74]", got)
|
||||
}
|
||||
}
|
||||
|
||||
// A token that is neither a code nor a prefixable one stays unmatched: the
|
||||
// prefix must not invent references.
|
||||
func TestPrefixDoesNotInventReferences(t *testing.T) {
|
||||
if got := refsOf(t, ddfmLike(), qso.QSO{Callsign: "F5AYE", State: "99"}); len(got) != 0 {
|
||||
t.Errorf("unknown department 99 → %v, want none", got)
|
||||
}
|
||||
}
|
||||
|
||||
// Without a prefix nothing changes: a bare number matches nothing, a full code
|
||||
// matches itself.
|
||||
func TestNoPrefixKeepsExactCodeMatching(t *testing.T) {
|
||||
defs := ddfmLike()
|
||||
defs[0].Prefix = ""
|
||||
if got := refsOf(t, defs, qso.QSO{Callsign: "F5AYE", State: "74"}); len(got) != 0 {
|
||||
t.Errorf("no prefix, state 74 → %v, want none", got)
|
||||
}
|
||||
if got := refsOf(t, defs, qso.QSO{Callsign: "F5AYE", State: "D74"}); len(got) != 1 || got[0] != "D74" {
|
||||
t.Errorf("no prefix, state D74 → %v, want [D74]", got)
|
||||
}
|
||||
}
|
||||
+17
-11
@@ -44,7 +44,7 @@ func DefaultFolder(dataDir string) string {
|
||||
// statement (no torn-copy window while the app keeps writing), and compacts
|
||||
// the destination as a bonus. It replaces the old "checkpoint + raw io.Copy",
|
||||
// which could capture a half-written page during a concurrent write.
|
||||
func Run(ctx context.Context, dbConn *sql.DB, dbPath, folder string, rotation int, doZip bool) (string, error) {
|
||||
func Run(ctx context.Context, dbConn *sql.DB, dbPath, folder string, rotation int, doZip bool, prefix string, unique bool) (string, error) {
|
||||
if dbConn == nil {
|
||||
return "", fmt.Errorf("nil db connection")
|
||||
}
|
||||
@@ -54,12 +54,20 @@ func Run(ctx context.Context, dbConn *sql.DB, dbPath, folder string, rotation in
|
||||
if folder == "" {
|
||||
return "", fmt.Errorf("backup folder not set")
|
||||
}
|
||||
if prefix == "" {
|
||||
prefix = "opslog"
|
||||
}
|
||||
if err := os.MkdirAll(folder, 0o755); err != nil {
|
||||
return "", fmt.Errorf("create backup folder: %w", err)
|
||||
}
|
||||
|
||||
// One file per DAY by default (same-day runs overwrite). With `unique`, add the
|
||||
// time so every run is a distinct file — rotation still keeps the newest N.
|
||||
stamp := time.Now().Format("2006-01-02")
|
||||
base := fmt.Sprintf("opslog-%s", stamp)
|
||||
if unique {
|
||||
stamp = time.Now().Format("2006-01-02-150405")
|
||||
}
|
||||
base := fmt.Sprintf("%s-%s", prefix, stamp)
|
||||
|
||||
// VACUUM INTO requires a non-existent target → use a temp file, then
|
||||
// move/zip it into place.
|
||||
@@ -92,7 +100,7 @@ func Run(ctx context.Context, dbConn *sql.DB, dbPath, folder string, rotation in
|
||||
}
|
||||
}
|
||||
|
||||
if err := rotate(folder, rotation); err != nil {
|
||||
if err := rotateMatch(folder, rotation, prefix+"-", ".db", ".db.zip"); err != nil {
|
||||
// Rotation errors are non-fatal — the backup itself succeeded.
|
||||
return dstPath, fmt.Errorf("rotate: %w (backup OK at %s)", err, dstPath)
|
||||
}
|
||||
@@ -103,7 +111,7 @@ func Run(ctx context.Context, dbConn *sql.DB, dbPath, folder string, rotation in
|
||||
// log lives on a shared MySQL server, where VACUUM INTO can't snapshot it — an
|
||||
// ADIF export is a portable, re-importable backup of the actual contacts.
|
||||
// writeADIF must write the full ADIF to the path it's handed.
|
||||
func RunADIF(folder string, rotation int, doZip bool, writeADIF func(path string) error) (string, error) {
|
||||
func RunADIF(folder string, rotation int, doZip bool, unique bool, writeADIF func(path string) error) (string, error) {
|
||||
if rotation <= 0 {
|
||||
rotation = 5
|
||||
}
|
||||
@@ -113,7 +121,11 @@ func RunADIF(folder string, rotation int, doZip bool, writeADIF func(path string
|
||||
if err := os.MkdirAll(folder, 0o755); err != nil {
|
||||
return "", fmt.Errorf("create backup folder: %w", err)
|
||||
}
|
||||
base := "opslog-log-" + time.Now().Format("2006-01-02")
|
||||
stamp := time.Now().Format("2006-01-02")
|
||||
if unique {
|
||||
stamp = time.Now().Format("2006-01-02-150405")
|
||||
}
|
||||
base := "opslog-log-" + stamp
|
||||
tmp := filepath.Join(folder, base+".adi.tmp")
|
||||
_ = os.Remove(tmp)
|
||||
if err := writeADIF(tmp); err != nil {
|
||||
@@ -203,12 +215,6 @@ func copyZipped(src, dst, innerName string) error {
|
||||
return out.Close()
|
||||
}
|
||||
|
||||
// rotate keeps the most recent `keep` SQLite backups (opslog-*.db /
|
||||
// opslog-*.db.zip) and deletes the rest.
|
||||
func rotate(folder string, keep int) error {
|
||||
return rotateMatch(folder, keep, "opslog-", ".db", ".db.zip")
|
||||
}
|
||||
|
||||
// rotateMatch keeps the most recent `keep` files in folder whose name has the
|
||||
// given prefix and one of the given suffixes, deleting older ones. Only matching
|
||||
// files are touched — never unrelated user files in the same folder. The suffix
|
||||
|
||||
@@ -0,0 +1,355 @@
|
||||
// Package bandopen spots a band OPENING in the cluster stream — sporadic-E on
|
||||
// 6 m, 4 m and 2 m above all.
|
||||
//
|
||||
// This is observation, not prediction. Every spot OpsLog receives is already
|
||||
// enriched with the great-circle distance and bearing from the operator's own
|
||||
// grid, so the signature of a single-hop Es opening is directly measurable:
|
||||
// several distinct stations appearing on a VHF band, all at single-hop range,
|
||||
// all in the same bearing sector, within a few minutes. That combination does
|
||||
// not happen by chance — scattered spots at random distances and bearings are
|
||||
// just a busy band.
|
||||
//
|
||||
// The season is REPORTED, never used to suppress. Es peaks in late spring and
|
||||
// summer, so an opening in November is unusual — and an unusual opening is
|
||||
// precisely the one an operator must not be told about last. InSeason only
|
||||
// labels the announcement.
|
||||
package bandopen
|
||||
|
||||
import (
|
||||
"math"
|
||||
"sort"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
)
|
||||
|
||||
// Spot is the little a detection needs, taken from an enriched cluster spot.
|
||||
type Spot struct {
|
||||
Call string
|
||||
Band string
|
||||
DistKm int
|
||||
Bearing int // degrees from the operator, short path
|
||||
At time.Time
|
||||
}
|
||||
|
||||
// Config tunes the detector. The defaults describe single-hop sporadic E.
|
||||
type Config struct {
|
||||
Window time.Duration // how far back a burst may span
|
||||
MinCalls int // distinct DX calls before it counts as an opening
|
||||
MinKm, MaxKm int // path length accepted; MaxKm 0 = no ceiling
|
||||
BearingSpread int // widest arc (degrees) the spots may cover
|
||||
Requiet time.Duration // silence after announcing a band, so it is announced once
|
||||
}
|
||||
|
||||
// DefaultConfig is the Es envelope.
|
||||
//
|
||||
// Below ~500 km a 6 m contact is ordinary tropo or ground wave and says nothing
|
||||
// about the ionosphere, so that floor stays.
|
||||
//
|
||||
// There is NO ceiling. There used to be one at 2400 km, on the reasoning that
|
||||
// past a single hop the bearing test stops meaning anything. That was wrong, and
|
||||
// it silently threw away exactly the openings worth hearing about: multi-hop Es
|
||||
// is ordinary on 6 m, 5000 km paths are common and 10000 km happens. Those are
|
||||
// still directional — a double hop leaves the same sector it entered — so the
|
||||
// bearing test holds perfectly well, and it is the test doing the real work here.
|
||||
//
|
||||
// 90° of spread because a genuine Es cloud illuminates a sector, not the whole
|
||||
// horizon: the constraint that separates an opening from a merely busy evening.
|
||||
func DefaultConfig() Config {
|
||||
return Config{
|
||||
Window: 12 * time.Minute,
|
||||
MinCalls: 4,
|
||||
MinKm: 500,
|
||||
MaxKm: 0, // no ceiling — see above
|
||||
BearingSpread: 90,
|
||||
Requiet: 45 * time.Minute,
|
||||
}
|
||||
}
|
||||
|
||||
// Bands watched.
|
||||
//
|
||||
// 10 m is in, and it is HF. The line is not "HF versus VHF" but "is an opening
|
||||
// here an event": 20 m being open is the normal state of the band and saying so
|
||||
// is noise, while 10 m spends most of a solar cycle shut and opens sharply when
|
||||
// it goes — which is what an operator wants interrupting them for.
|
||||
//
|
||||
// 12 m was tried and dropped. It behaves too much like 20 m at this point in the
|
||||
// cycle: open often enough that announcing it is a notification rather than
|
||||
// news, and every band that cries wolf costs the ones that do not.
|
||||
var watched = map[string]bool{"10m": true, "6m": true, "4m": true, "2m": true}
|
||||
|
||||
// Watched reports whether a band is one the detector looks at.
|
||||
func Watched(band string) bool { return watched[strings.ToLower(strings.TrimSpace(band))] }
|
||||
|
||||
// Opening is a detected opening, ready to be announced.
|
||||
type Opening struct {
|
||||
Band string `json:"band"`
|
||||
Calls int `json:"calls"` // distinct DX stations seen
|
||||
MedianKm int `json:"median_km"` // typical hop length
|
||||
BearingMin int `json:"bearing_min"` // sector, degrees
|
||||
BearingMax int `json:"bearing_max"`
|
||||
// Compass is the sector as a point of the compass ("NE"), computed here so
|
||||
// the UI never has to redo the wrap-round-north arithmetic that Sector()
|
||||
// already gets right — two answers to that question is how a badge ends up
|
||||
// naming the opposite direction.
|
||||
Compass string `json:"compass"`
|
||||
InSeason bool `json:"in_season"` // false = unusual for the time of year
|
||||
At time.Time `json:"at"`
|
||||
Examples []string `json:"examples"` // a few callsigns, for the announcement
|
||||
}
|
||||
|
||||
// Detector keeps the rolling window and the per-band quiet period.
|
||||
type Detector struct {
|
||||
cfg Config
|
||||
recent []Spot
|
||||
lastFire map[string]time.Time
|
||||
}
|
||||
|
||||
func New(cfg Config) *Detector {
|
||||
if cfg.Window <= 0 {
|
||||
cfg = DefaultConfig()
|
||||
}
|
||||
return &Detector{cfg: cfg, lastFire: map[string]time.Time{}}
|
||||
}
|
||||
|
||||
// Add records a spot and returns an Opening when this spot completes one.
|
||||
//
|
||||
// Returns nil far more often than not; that is the point. lat is the operator's
|
||||
// latitude, for the hemisphere the season depends on.
|
||||
func (d *Detector) Add(s Spot, lat float64) *Opening {
|
||||
if !Watched(s.Band) {
|
||||
return nil
|
||||
}
|
||||
band := strings.ToLower(strings.TrimSpace(s.Band))
|
||||
s.Band = band
|
||||
if s.At.IsZero() {
|
||||
s.At = time.Now()
|
||||
}
|
||||
// Out-of-range spots are dropped rather than stored: they can never be part
|
||||
// of a single-hop detection, and keeping them only grows the window.
|
||||
if s.DistKm < d.cfg.MinKm || (d.cfg.MaxKm > 0 && s.DistKm > d.cfg.MaxKm) {
|
||||
return nil
|
||||
}
|
||||
d.recent = append(d.recent, s)
|
||||
d.prune(s.At)
|
||||
|
||||
if last, ok := d.lastFire[band]; ok && s.At.Sub(last) < d.cfg.Requiet {
|
||||
return nil // already announced this band recently
|
||||
}
|
||||
|
||||
inBand := make([]Spot, 0, len(d.recent))
|
||||
for _, r := range d.recent {
|
||||
if r.Band == band {
|
||||
inBand = append(inBand, r)
|
||||
}
|
||||
}
|
||||
op := evaluate(band, inBand, d.cfg)
|
||||
if op == nil {
|
||||
return nil
|
||||
}
|
||||
op.At = s.At
|
||||
op.InSeason = InSeason(band, s.At, lat)
|
||||
d.lastFire[band] = s.At
|
||||
return op
|
||||
}
|
||||
|
||||
func (d *Detector) prune(now time.Time) {
|
||||
cut := now.Add(-d.cfg.Window)
|
||||
keep := d.recent[:0]
|
||||
for _, r := range d.recent {
|
||||
if r.At.After(cut) {
|
||||
keep = append(keep, r)
|
||||
}
|
||||
}
|
||||
d.recent = keep
|
||||
}
|
||||
|
||||
// evaluate decides whether a band's recent spots look like one opening.
|
||||
func evaluate(band string, spots []Spot, cfg Config) *Opening {
|
||||
// Distinct callsigns, not spot count: one station spotted by six skimmers is
|
||||
// six spots and one station, and it is not an opening.
|
||||
seen := map[string]Spot{}
|
||||
for _, s := range spots {
|
||||
c := strings.ToUpper(strings.TrimSpace(s.Call))
|
||||
if c == "" {
|
||||
continue
|
||||
}
|
||||
if _, dup := seen[c]; !dup {
|
||||
seen[c] = s
|
||||
}
|
||||
}
|
||||
if len(seen) < cfg.MinCalls {
|
||||
return nil
|
||||
}
|
||||
bearings := make([]int, 0, len(seen))
|
||||
dists := make([]int, 0, len(seen))
|
||||
calls := make([]string, 0, len(seen))
|
||||
for c, s := range seen {
|
||||
bearings = append(bearings, ((s.Bearing%360)+360)%360)
|
||||
dists = append(dists, s.DistKm)
|
||||
calls = append(calls, c)
|
||||
}
|
||||
// The DENSEST sector, not the sector covering everything.
|
||||
//
|
||||
// This used to demand that EVERY station fit inside one 90° arc, which is the
|
||||
// right shape for a sporadic-E cloud and hopeless for anything else. With 10
|
||||
// and 12 m open on F2 the reports come from all round the compass, the arc is
|
||||
// 360°, and the test can never pass — so the busier the band, the less likely
|
||||
// an opening was announced. Backwards.
|
||||
//
|
||||
// Finding the busiest 90° instead keeps the Es signature intact — a cloud
|
||||
// still makes one direction dense — and lets an F2 opening toward South
|
||||
// America be seen through the handful of Europeans that are always there.
|
||||
lo, hi, n := densestSector(bearings, cfg.BearingSpread)
|
||||
if n < cfg.MinCalls {
|
||||
return nil // nothing concentrated anywhere: a busy band, not an opening
|
||||
}
|
||||
sort.Ints(dists)
|
||||
sort.Strings(calls)
|
||||
if len(calls) > 5 {
|
||||
calls = calls[:5]
|
||||
}
|
||||
op := &Opening{
|
||||
Band: band, Calls: len(seen), MedianKm: dists[len(dists)/2],
|
||||
BearingMin: lo, BearingMax: hi, Examples: calls,
|
||||
}
|
||||
op.Compass = compass(midBearing(lo, hi))
|
||||
return op
|
||||
}
|
||||
|
||||
// arc returns the smallest compass sector containing every bearing, coping with
|
||||
// the wrap at north: 350° and 10° are 20° apart, not 340°.
|
||||
// densestSector returns the width-degree arc containing the most bearings, as
|
||||
// its start, end and count.
|
||||
//
|
||||
// Brute force over each bearing as a starting edge. n is at most a few hundred
|
||||
// distinct callsigns in a twelve-minute window, so n² is nothing, and it runs
|
||||
// once per accepted spot rather than once per decode.
|
||||
//
|
||||
// The arc STARTS on a real bearing rather than sweeping every degree: the
|
||||
// densest window can always be slid until its leading edge sits on a station, so
|
||||
// nothing is missed and there are 360 fewer positions to try.
|
||||
func densestSector(b []int, width int) (lo, hi, count int) {
|
||||
if len(b) == 0 {
|
||||
return 0, 0, 0
|
||||
}
|
||||
s := append([]int(nil), b...)
|
||||
sort.Ints(s)
|
||||
best, bestAt := 0, 0
|
||||
for i, start := range s {
|
||||
n := 0
|
||||
for _, x := range s {
|
||||
// Distance clockwise from start to x, so the wrap through 0° needs no
|
||||
// special case — which is where the old arc() logic earned its keep and
|
||||
// this one has to match it.
|
||||
d := x - start
|
||||
if d < 0 {
|
||||
d += 360
|
||||
}
|
||||
if d <= width {
|
||||
n++
|
||||
}
|
||||
}
|
||||
if n > best {
|
||||
best, bestAt = n, i
|
||||
}
|
||||
}
|
||||
lo = s[bestAt]
|
||||
// The end is the furthest station actually inside the window, not lo+width:
|
||||
// reporting an empty 90° when every station sits in the first 20° would
|
||||
// overstate the opening's width by four times.
|
||||
hi = lo
|
||||
for _, x := range s {
|
||||
d := x - lo
|
||||
if d < 0 {
|
||||
d += 360
|
||||
}
|
||||
if d <= width {
|
||||
if e := (lo + d) % 360; d >= ((hi-lo)+360)%360 {
|
||||
hi = e
|
||||
}
|
||||
}
|
||||
}
|
||||
return lo, hi, best
|
||||
}
|
||||
|
||||
func arc(b []int) (lo, hi, spread int) {
|
||||
if len(b) == 0 {
|
||||
return 0, 0, 0
|
||||
}
|
||||
s := append([]int(nil), b...)
|
||||
sort.Ints(s)
|
||||
// The widest GAP between consecutive bearings (round the circle) is the part
|
||||
// NOT covered; the sector is everything else.
|
||||
worst, at := -1, 0
|
||||
for i := range s {
|
||||
next := s[(i+1)%len(s)]
|
||||
gap := next - s[i]
|
||||
if i == len(s)-1 {
|
||||
gap = next + 360 - s[i]
|
||||
}
|
||||
if gap > worst {
|
||||
worst, at = gap, i
|
||||
}
|
||||
}
|
||||
lo = s[(at+1)%len(s)]
|
||||
hi = s[at]
|
||||
spread = 360 - worst
|
||||
return lo, hi, spread
|
||||
}
|
||||
|
||||
// InSeason reports whether the time of year is one where sporadic E is common
|
||||
// at the operator's latitude.
|
||||
//
|
||||
// Each hemisphere has a strong summer peak AND a smaller winter one, and both
|
||||
// count as expected: a December opening in Europe surprises nobody. What the
|
||||
// label marks is the genuinely odd month — an equinox opening.
|
||||
//
|
||||
// This LABELS a detection, it never gates one. Out-of-season Es exists, and it
|
||||
// is precisely the opening an operator must not be told about last.
|
||||
func InSeason(band string, t time.Time, lat float64) bool {
|
||||
m := t.UTC().Month()
|
||||
var months map[time.Month]bool
|
||||
if lat >= 0 {
|
||||
months = map[time.Month]bool{
|
||||
time.May: true, time.June: true, time.July: true, time.August: true, // main
|
||||
time.December: true, time.January: true, // lesser winter peak
|
||||
}
|
||||
} else {
|
||||
months = map[time.Month]bool{
|
||||
time.November: true, time.December: true, time.January: true, time.February: true,
|
||||
time.June: true, time.July: true,
|
||||
}
|
||||
}
|
||||
return months[m]
|
||||
}
|
||||
|
||||
// Sector renders the bearing range for a human, e.g. "NE (35–75°)".
|
||||
func (o *Opening) Sector() string {
|
||||
return compass(midBearing(o.BearingMin, o.BearingMax)) +
|
||||
" (" + strconv.Itoa(o.BearingMin) + "–" + strconv.Itoa(o.BearingMax) + "°)"
|
||||
}
|
||||
|
||||
// midBearing is the middle of the arc running CLOCKWISE from min to max.
|
||||
//
|
||||
// Not the arithmetic mean, which is wrong for every sector crossing north and
|
||||
// wrong by the worst possible amount: an opening reported as 353–61° averaged to
|
||||
// 207° and was announced as SW when it was NE — the exact opposite direction, to
|
||||
// an operator who might turn a beam on it. The detector itself has handled the
|
||||
// 0/360 wrap since it was written; only this label did not.
|
||||
func midBearing(min, max int) float64 {
|
||||
span := max - min
|
||||
if span < 0 {
|
||||
span += 360
|
||||
}
|
||||
return math.Mod(float64(min)+float64(span)/2, 360)
|
||||
}
|
||||
|
||||
func compass(deg float64) string {
|
||||
names := []string{"N", "NE", "E", "SE", "S", "SW", "W", "NW"}
|
||||
i := int(math.Round(deg/45)) % 8
|
||||
if i < 0 {
|
||||
i += 8
|
||||
}
|
||||
return names[i]
|
||||
}
|
||||
@@ -0,0 +1,310 @@
|
||||
package bandopen
|
||||
|
||||
import (
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
func at(min int) time.Time {
|
||||
return time.Date(2026, time.June, 15, 12, min, 0, 0, time.UTC)
|
||||
}
|
||||
|
||||
// feed pushes spots and returns the last Opening produced, if any.
|
||||
func feed(d *Detector, lat float64, spots ...Spot) *Opening {
|
||||
var last *Opening
|
||||
for _, s := range spots {
|
||||
if o := d.Add(s, lat); o != nil {
|
||||
last = o
|
||||
}
|
||||
}
|
||||
return last
|
||||
}
|
||||
|
||||
// The signature that must fire: several distinct stations, single-hop range,
|
||||
// one bearing sector, within the window.
|
||||
func TestDetectsSingleHopEs(t *testing.T) {
|
||||
d := New(DefaultConfig())
|
||||
o := feed(d, 46,
|
||||
Spot{Call: "I0ABC", Band: "6m", DistKm: 1100, Bearing: 140, At: at(0)},
|
||||
Spot{Call: "IK1DEF", Band: "6m", DistKm: 900, Bearing: 150, At: at(1)},
|
||||
Spot{Call: "9A2GHI", Band: "6m", DistKm: 1200, Bearing: 120, At: at(2)},
|
||||
Spot{Call: "S51JKL", Band: "6m", DistKm: 1000, Bearing: 130, At: at(3)},
|
||||
)
|
||||
if o == nil {
|
||||
t.Fatal("four stations at single-hop range in one sector must read as an opening")
|
||||
}
|
||||
if o.Band != "6m" || o.Calls != 4 {
|
||||
t.Errorf("got band=%s calls=%d, want 6m/4", o.Band, o.Calls)
|
||||
}
|
||||
if o.MedianKm < 900 || o.MedianKm > 1200 {
|
||||
t.Errorf("median %d km outside the fed range", o.MedianKm)
|
||||
}
|
||||
if !o.InSeason {
|
||||
t.Error("June in the northern hemisphere is Es season")
|
||||
}
|
||||
}
|
||||
|
||||
// Spots all round the compass are a busy band, not an opening — the bearing
|
||||
// test is what separates the two.
|
||||
func TestScatteredBearingsAreNotAnOpening(t *testing.T) {
|
||||
d := New(DefaultConfig())
|
||||
if o := feed(d, 46,
|
||||
Spot{Call: "A", Band: "6m", DistKm: 1100, Bearing: 10, At: at(0)},
|
||||
Spot{Call: "B", Band: "6m", DistKm: 900, Bearing: 110, At: at(1)},
|
||||
Spot{Call: "C", Band: "6m", DistKm: 1200, Bearing: 210, At: at(2)},
|
||||
Spot{Call: "D", Band: "6m", DistKm: 1000, Bearing: 300, At: at(3)},
|
||||
); o != nil {
|
||||
t.Errorf("bearings spread round the compass must not fire (got %+v)", o)
|
||||
}
|
||||
}
|
||||
|
||||
// One station spotted by six skimmers is six spots and one station.
|
||||
func TestRepeatedSpotsOfOneStationDoNotFire(t *testing.T) {
|
||||
d := New(DefaultConfig())
|
||||
var spots []Spot
|
||||
for i := 0; i < 6; i++ {
|
||||
spots = append(spots, Spot{Call: "I0ABC", Band: "6m", DistKm: 1100, Bearing: 140, At: at(i)})
|
||||
}
|
||||
if o := feed(d, 46, spots...); o != nil {
|
||||
t.Error("one distinct callsign is not an opening however often it is spotted")
|
||||
}
|
||||
}
|
||||
|
||||
// Out of the single-hop window there is nothing to conclude: under ~500 km a
|
||||
// 6 m contact is ordinary tropo.
|
||||
func TestTropoRangeIsIgnored(t *testing.T) {
|
||||
d := New(DefaultConfig())
|
||||
if o := feed(d, 46,
|
||||
Spot{Call: "A", Band: "6m", DistKm: 120, Bearing: 140, At: at(0)},
|
||||
Spot{Call: "B", Band: "6m", DistKm: 200, Bearing: 145, At: at(1)},
|
||||
Spot{Call: "C", Band: "6m", DistKm: 90, Bearing: 150, At: at(2)},
|
||||
Spot{Call: "D", Band: "6m", DistKm: 150, Bearing: 135, At: at(3)},
|
||||
); o != nil {
|
||||
t.Error("short-range spots must not read as sporadic E")
|
||||
}
|
||||
}
|
||||
|
||||
// Spread over more than the window is not one burst.
|
||||
func TestSpotsOutsideTheWindowDoNotAccumulate(t *testing.T) {
|
||||
d := New(DefaultConfig())
|
||||
if o := feed(d, 46,
|
||||
Spot{Call: "A", Band: "6m", DistKm: 1100, Bearing: 140, At: at(0)},
|
||||
Spot{Call: "B", Band: "6m", DistKm: 900, Bearing: 150, At: at(20)},
|
||||
Spot{Call: "C", Band: "6m", DistKm: 1200, Bearing: 120, At: at(40)},
|
||||
Spot{Call: "D", Band: "6m", DistKm: 1000, Bearing: 130, At: at(60)},
|
||||
); o != nil {
|
||||
t.Error("spots an hour apart are not one opening")
|
||||
}
|
||||
}
|
||||
|
||||
// HF is never announced: an "opening" on 20 m is the band's normal state.
|
||||
func TestHFIsNotWatched(t *testing.T) {
|
||||
if Watched("20m") || Watched("40m") {
|
||||
t.Error("HF must not be watched")
|
||||
}
|
||||
if !Watched("6m") || !Watched("2m") || !Watched("4m") {
|
||||
t.Error("6/4/2 m must be watched")
|
||||
}
|
||||
}
|
||||
|
||||
// Announced once, then quiet — an opening lasts hours and produces hundreds of
|
||||
// spots; one alert is information, forty is noise.
|
||||
func TestOneAnnouncementPerOpening(t *testing.T) {
|
||||
d := New(DefaultConfig())
|
||||
base := []Spot{
|
||||
{Call: "A", Band: "6m", DistKm: 1100, Bearing: 140, At: at(0)},
|
||||
{Call: "B", Band: "6m", DistKm: 900, Bearing: 150, At: at(1)},
|
||||
{Call: "C", Band: "6m", DistKm: 1200, Bearing: 120, At: at(2)},
|
||||
{Call: "D", Band: "6m", DistKm: 1000, Bearing: 130, At: at(3)},
|
||||
}
|
||||
if o := feed(d, 46, base...); o == nil {
|
||||
t.Fatal("expected the first opening")
|
||||
}
|
||||
if o := d.Add(Spot{Call: "E", Band: "6m", DistKm: 1050, Bearing: 135, At: at(4)}, 46); o != nil {
|
||||
t.Error("a second alert inside the quiet period is noise")
|
||||
}
|
||||
}
|
||||
|
||||
// Out-of-season openings still fire — they are the ones worth knowing about —
|
||||
// and are simply labelled as unusual.
|
||||
func TestOutOfSeasonStillFiresButIsLabelled(t *testing.T) {
|
||||
d := New(DefaultConfig())
|
||||
nov := func(m int) time.Time { return time.Date(2026, time.November, 3, 9, m, 0, 0, time.UTC) }
|
||||
o := feed(d, 46,
|
||||
Spot{Call: "A", Band: "6m", DistKm: 1100, Bearing: 140, At: nov(0)},
|
||||
Spot{Call: "B", Band: "6m", DistKm: 900, Bearing: 150, At: nov(1)},
|
||||
Spot{Call: "C", Band: "6m", DistKm: 1200, Bearing: 120, At: nov(2)},
|
||||
Spot{Call: "D", Band: "6m", DistKm: 1000, Bearing: 130, At: nov(3)},
|
||||
)
|
||||
if o == nil {
|
||||
t.Fatal("an out-of-season opening must still be announced")
|
||||
}
|
||||
if o.InSeason {
|
||||
t.Error("November in the north is not Es season — it must be flagged unusual")
|
||||
}
|
||||
}
|
||||
|
||||
// Both hemispheres have a summer peak and a lesser winter one, and both read as
|
||||
// expected. What must come out as UNUSUAL is an equinox month.
|
||||
func TestSeasonFollowsTheHemisphere(t *testing.T) {
|
||||
on := func(m time.Month) time.Time { return time.Date(2026, m, 15, 0, 0, 0, 0, time.UTC) }
|
||||
const north, south = 46.0, -33.0
|
||||
|
||||
if !InSeason("6m", on(time.June), north) {
|
||||
t.Error("June is the northern main season")
|
||||
}
|
||||
if !InSeason("6m", on(time.December), north) {
|
||||
t.Error("December is the northern winter peak — not a surprise")
|
||||
}
|
||||
if !InSeason("6m", on(time.December), south) {
|
||||
t.Error("December is the southern main season")
|
||||
}
|
||||
if !InSeason("6m", on(time.June), south) {
|
||||
t.Error("June is the southern winter peak")
|
||||
}
|
||||
// The equinoxes are the quiet months in both hemispheres.
|
||||
for _, lat := range []float64{north, south} {
|
||||
for _, m := range []time.Month{time.March, time.April, time.September, time.October} {
|
||||
if InSeason("6m", on(m), lat) {
|
||||
t.Errorf("%v at lat %.0f should read as unusual", m, lat)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// The sector must cope with the wrap at north: 350° and 10° are 20° apart.
|
||||
func TestBearingArcWrapsAtNorth(t *testing.T) {
|
||||
lo, hi, spread := arc([]int{350, 10, 0, 355})
|
||||
if spread > 30 {
|
||||
t.Errorf("spread %d° across north should be small (lo=%d hi=%d)", spread, lo, hi)
|
||||
}
|
||||
if _, _, s := arc([]int{0, 90, 180, 270}); s < 270 {
|
||||
t.Errorf("bearings on all four quadrants should span nearly the circle, got %d", s)
|
||||
}
|
||||
}
|
||||
|
||||
// Multi-hop must be detected, not thrown away.
|
||||
//
|
||||
// The detector used to cap paths at 2400 km, on the reasoning that past one hop
|
||||
// the bearing test stops meaning anything. Nexus flagged a 6 m opening at
|
||||
// 5477 km that OpsLog never saw: the spots were discarded before any test ran.
|
||||
// Multi-hop Es is directional — a second hop leaves the sector the first one
|
||||
// entered — so distance is not what tells an opening from noise. The sector is.
|
||||
func TestMultiHopOpeningIsDetected(t *testing.T) {
|
||||
d := New(DefaultConfig())
|
||||
base := time.Date(2026, 6, 15, 18, 0, 0, 0, time.UTC)
|
||||
var got *Opening
|
||||
for i, call := range []string{"LU1AA", "PY2BB", "LU3CC", "PY4DD"} {
|
||||
if op := d.Add(Spot{
|
||||
Call: call, Band: "6m",
|
||||
DistKm: 5400 + i*40, // double hop, far past the old ceiling
|
||||
Bearing: +i * 5, // one sector, as a real cloud illuminates
|
||||
At: base.Add(time.Duration(i) * time.Minute),
|
||||
}, 47.0); op != nil {
|
||||
got = op
|
||||
}
|
||||
}
|
||||
if got == nil {
|
||||
t.Fatal("a four-station 5400 km burst in one sector was not reported as an opening")
|
||||
}
|
||||
if got.Band != "6m" {
|
||||
t.Errorf("band = %q, want 6m", got.Band)
|
||||
}
|
||||
}
|
||||
|
||||
// The floor stays: a short path says nothing about the ionosphere.
|
||||
func TestGroundWaveIsStillIgnored(t *testing.T) {
|
||||
d := New(DefaultConfig())
|
||||
base := time.Date(2026, 6, 15, 18, 0, 0, 0, time.UTC)
|
||||
for i, call := range []string{"F1AA", "F2BB", "F3CC", "F4DD"} {
|
||||
if op := d.Add(Spot{
|
||||
Call: call, Band: "6m", DistKm: 120, Bearing: 90,
|
||||
At: base.Add(time.Duration(i) * time.Minute),
|
||||
}, 47.0); op != nil {
|
||||
t.Fatalf("a 120 km burst was reported as an opening: %+v", op)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// A sector crossing north must not be labelled by its opposite.
|
||||
//
|
||||
// Sector() averaged the two bearings arithmetically, so 353–61° — plainly north
|
||||
// — came out as (353+61)/2 = 207°, announced as SW. The worst possible error:
|
||||
// not vague, but exactly reversed, to an operator who may turn a beam on it.
|
||||
func TestSectorAcrossNorth(t *testing.T) {
|
||||
cases := []struct {
|
||||
min, max int
|
||||
want string
|
||||
}{
|
||||
{353, 61, "NE"}, // the one seen in the field
|
||||
{303, 11, "NW"}, // the other one
|
||||
{35, 75, "NE"}, // no wrap, unchanged
|
||||
{170, 190, "S"}, // due south, no wrap
|
||||
{340, 20, "N"}, // straddling north evenly
|
||||
{260, 300, "W"}, // due west
|
||||
}
|
||||
for _, c := range cases {
|
||||
o := Opening{BearingMin: c.min, BearingMax: c.max}
|
||||
got := o.Sector()
|
||||
if !strings.HasPrefix(got, c.want+" ") {
|
||||
t.Errorf("Sector(%d–%d°) = %q, want it to start with %q", c.min, c.max, got, c.want)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// A band open in one direction must be found THROUGH the everyday noise.
|
||||
//
|
||||
// The detector used to demand that every station fit inside one 90° arc. On 10
|
||||
// and 12 m with F2 open, reports arrive from all round the compass, the arc is
|
||||
// 360°, and the test could never pass: the busier the band, the less likely an
|
||||
// opening was announced. Reported from the field — 70 000 decodes, 10 and 12 m
|
||||
// plainly open, nothing said.
|
||||
func TestOpeningFoundThroughAllRoundNoise(t *testing.T) {
|
||||
d := New(DefaultConfig())
|
||||
base := time.Date(2026, 8, 11, 14, 0, 0, 0, time.UTC)
|
||||
// Four stations concentrated to the south-west — the opening.
|
||||
south := []struct {
|
||||
call string
|
||||
deg int
|
||||
}{{"PY2AA", 220}, {"LU3BB", 228}, {"PY5CC", 235}, {"CX4DD", 240}}
|
||||
// And the usual Europeans scattered everywhere, which is what used to veto it.
|
||||
noise := []struct {
|
||||
call string
|
||||
deg int
|
||||
}{{"DL1XX", 40}, {"SM2YY", 20}, {"EA3ZZ", 190}, {"UA9QQ", 70}, {"G4WW", 320}}
|
||||
|
||||
var got *Opening
|
||||
for i, s := range noise {
|
||||
d.Add(Spot{Call: s.call, Band: "10m", DistKm: 1200, Bearing: s.deg,
|
||||
At: base.Add(time.Duration(i) * time.Second)}, 47.0)
|
||||
}
|
||||
for i, s := range south {
|
||||
if op := d.Add(Spot{Call: s.call, Band: "10m", DistKm: 9800, Bearing: s.deg,
|
||||
At: base.Add(time.Duration(10+i) * time.Second)}, 47.0); op != nil {
|
||||
got = op
|
||||
}
|
||||
}
|
||||
if got == nil {
|
||||
t.Fatal("an opening concentrated to the SW was not found among stations all round the compass")
|
||||
}
|
||||
mid := midBearing(got.BearingMin, got.BearingMax)
|
||||
if mid < 200 || mid > 260 {
|
||||
t.Errorf("sector middle %.0f° — the reported sector is not the busy one (%d–%d°)",
|
||||
mid, got.BearingMin, got.BearingMax)
|
||||
}
|
||||
}
|
||||
|
||||
// Stations evenly all round the compass and nothing concentrated: still nothing.
|
||||
// The point of the change was to stop requiring global agreement, not to start
|
||||
// calling every busy band an opening.
|
||||
func TestScatteredBandIsNotAnOpening(t *testing.T) {
|
||||
d := New(DefaultConfig())
|
||||
base := time.Date(2026, 8, 11, 14, 0, 0, 0, time.UTC)
|
||||
for i, deg := range []int{0, 60, 120, 180, 240, 300} {
|
||||
if op := d.Add(Spot{Call: string(rune('A'+i)) + "1AAA", Band: "10m",
|
||||
DistKm: 3000, Bearing: deg, At: base.Add(time.Duration(i) * time.Second)}, 47.0); op != nil {
|
||||
t.Fatalf("evenly scattered stations were called an opening: %+v", op)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -200,6 +200,31 @@ func (m *Manager) SetPTT(on bool) error {
|
||||
return m.exec(func(b Backend) error { return b.SetPTT(on) })
|
||||
}
|
||||
|
||||
// splitSetter is implemented by the backends that can arm split AND place the
|
||||
// transmit frequency. Both together: arming without setting the dial transmits
|
||||
// on whatever the transmit VFO happened to hold, which is worse than refusing.
|
||||
type splitSetter interface {
|
||||
SetSplit(on bool, txHz int64) error
|
||||
}
|
||||
|
||||
// SetSplit arms or clears split on the rig, with the transmit frequency.
|
||||
//
|
||||
// Returns a plain error on a backend that cannot do it, and that is the point.
|
||||
// The shared-CAT server used to answer "done" to WSJT-X's split commands while
|
||||
// doing nothing at all — the software then believed it was transmitting up the
|
||||
// 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.
|
||||
func (m *Manager) SetSplit(on bool, txHz int64) error {
|
||||
return m.exec(func(b Backend) error {
|
||||
s, ok := b.(splitSetter)
|
||||
if !ok {
|
||||
return fmt.Errorf("cat: this radio's backend cannot set split from software — " +
|
||||
"use Split Operating: Fake It in WSJT-X/JTDX, or set split on the radio itself")
|
||||
}
|
||||
return s.SetSplit(on, txHz)
|
||||
})
|
||||
}
|
||||
|
||||
// SpotInfo is one cluster spot to render on a backend that supports a spot
|
||||
// overlay (the FlexRadio panadapter). Color is an optional "#AARRGGBB" string;
|
||||
// the backend picks a default when it's empty. (Status-based colouring can be
|
||||
|
||||
+222
-14
@@ -56,6 +56,16 @@ type Kenwood struct {
|
||||
// a wire, which is how most operators actually put a rig on the network.
|
||||
host string
|
||||
digital string // mode name logged for data (FT8 by default)
|
||||
// dataMode chooses what CAT mode a DATA/digital mode (FT8, PSK…) sets, because
|
||||
// no single Kenwood mode digit is right for every rig: "usb" → USB (the SSB-data
|
||||
// base, default), "data" → the DATA mode digit MD6 (Elecraft K3/K4), "keep" →
|
||||
// leave the rig's current mode untouched (safest for a TS-590SG/TS-990S whose
|
||||
// data mode is a USB modifier the operator sets on the rig). See SetMode.
|
||||
dataMode string
|
||||
// elecraft marks a K3/K4 (the "Elecraft" backend). It reuses this Kenwood-dialect
|
||||
// client but, being an Elecraft, always drives digital modes to DATA A (MD6+DT0)
|
||||
// — the sub-mode FT8 audio needs — instead of going through the dataMode option.
|
||||
elecraft bool
|
||||
|
||||
mu sync.Mutex
|
||||
port serial.Port
|
||||
@@ -109,8 +119,41 @@ type Kenwood struct {
|
||||
// nothing. Off by default: that is how this backend behaved for its whole
|
||||
// life before the question came up.
|
||||
lowerLines bool
|
||||
|
||||
// tx tracks whether we currently hold PTT (SetPTT true). A Kenwood/Elecraft rig
|
||||
// answers "?;" to a status poll (IF;) WHILE TRANSMITTING; OpsLog used to read
|
||||
// that as "the rig doesn't support IF;", latch it off and drop the whole CAT
|
||||
// link — which tore down the shared-CAT PTT that WSJT-X / JTDX key through, so a
|
||||
// K3 keyed but the logger's transmission fell apart. While PTT is held we skip
|
||||
// the wire poll and hand back the last good state (lastState) instead. txAt caps
|
||||
// the skip so a missed SetPTT(false) can't freeze the state for ever.
|
||||
tx bool
|
||||
txAt time.Time
|
||||
lastState RigState
|
||||
// ifRejects counts consecutive "?;" answers to IF;. See State().
|
||||
ifRejects int
|
||||
}
|
||||
|
||||
// errRigRejected marks a "?;" — the rig understood the frame and declined it.
|
||||
// Distinct from a serial fault on purpose: one is "ask again in a moment", the
|
||||
// other is "the link is gone", and collapsing them is what dropped CAT sharing.
|
||||
var errRigRejected = errors.New("rejected by rig")
|
||||
|
||||
// ifRejectGrace is how many consecutive "?;" answers to IF; are ridden out
|
||||
// before the link is called dead.
|
||||
//
|
||||
// A Kenwood answers "?;" while it is busy — the tail of a transmission, a menu
|
||||
// open on the front panel. The TS-590SG does it for a moment after RX;, which is
|
||||
// exactly when the poll resumes: WSJT-X keyed through shared CAT, dropped PTT,
|
||||
// and the very next IF; came back "?;". One rejected poll then tore down the
|
||||
// whole link, WSJT-X lost the rig, and Hamlib went on to send an uninitialised
|
||||
// frequency (2^63) that OpsLog rightly refused — an alarming error message whose
|
||||
// real cause was three lines earlier in the log.
|
||||
//
|
||||
// Three at 250 ms is under a second of tolerance: long enough for the rig to
|
||||
// finish whatever it was doing, far too short to hide an unplugged cable.
|
||||
const ifRejectGrace = 3
|
||||
|
||||
// SetLowerLines chooses whether DTR and RTS are deasserted on connect. Set
|
||||
// before Connect.
|
||||
func (k *Kenwood) SetLowerLines(v bool) {
|
||||
@@ -249,10 +292,32 @@ func (k *Kenwood) ReadState() (RigState, error) {
|
||||
if k.port == nil {
|
||||
return RigState{}, fmt.Errorf("kenwood: not connected")
|
||||
}
|
||||
// While transmitting, don't poll: the rig returns "?;" to IF; during TX, and
|
||||
// treating that as a fault dropped the shared CAT link the digital-mode
|
||||
// software keys through. Hand back the last known state. The 30 s cap resyncs
|
||||
// if a SetPTT(false) was somehow missed, so a stuck TX can't freeze state.
|
||||
if k.tx && !k.txAt.IsZero() && time.Since(k.txAt) < 30*time.Second {
|
||||
s := k.lastState
|
||||
s.Connected = true
|
||||
return s, nil
|
||||
}
|
||||
raw, err := k.ask("IF;")
|
||||
if err != nil {
|
||||
// A "?;" is the rig saying "busy", not "gone". Ride out a few and keep
|
||||
// serving the last known state, so the CAT link the digital software keys
|
||||
// through survives the moment after a transmission. A serial fault is NOT
|
||||
// covered: that returns a different error and drops through at once.
|
||||
if errors.Is(err, errRigRejected) && k.lastState.Connected && k.ifRejects < ifRejectGrace {
|
||||
k.ifRejects++
|
||||
debugLog.Printf("kenwood: IF; rejected (%d/%d) — rig busy, keeping the link", k.ifRejects, ifRejectGrace)
|
||||
s := k.lastState
|
||||
s.Connected = true
|
||||
return s, nil
|
||||
}
|
||||
k.ifRejects = 0
|
||||
return RigState{}, err
|
||||
}
|
||||
k.ifRejects = 0
|
||||
f, ok := parseKenwoodIF(raw)
|
||||
if !ok {
|
||||
return RigState{}, fmt.Errorf("kenwood: unparsable IF frame %q", raw)
|
||||
@@ -261,7 +326,10 @@ func (k *Kenwood) ReadState() (RigState, error) {
|
||||
s := RigState{Connected: true, Backend: "kenwood"}
|
||||
k.curVFO = f.VFO
|
||||
s.Vfo = f.VFO
|
||||
s.Mode = kenwoodModeToADIF(f.Mode, k.digital)
|
||||
// Both branches of SetMode that emit MD6 identify a K3/K4: the Elecraft
|
||||
// backend, and the "MD6" data-mode option that exists for it. Decode the
|
||||
// read-back the same way, or OpsLog contradicts the mode it just set.
|
||||
s.Mode = kenwoodModeToADIF(f.Mode, k.digital, k.elecraft || k.dataMode == "data")
|
||||
s.Rig = k.model
|
||||
|
||||
// IF reports the frequency of the VFO in USE (what the operator hears).
|
||||
@@ -309,16 +377,36 @@ func (k *Kenwood) ReadState() (RigState, error) {
|
||||
f.Split = split
|
||||
|
||||
if f.Split {
|
||||
// The transmit VFO is the other one. Read it rather than assume, and fall
|
||||
// back to simplex if it cannot be read: a wrong TX frequency is written
|
||||
// into the log, which is worse than showing no split at all.
|
||||
// The OTHER VFO is the one IF did not report. Read it rather than assume,
|
||||
// and fall back to simplex if it cannot be read: a wrong TX frequency is
|
||||
// written into the log, which is worse than showing no split at all.
|
||||
other := "FB;"
|
||||
if f.VFO == "B" {
|
||||
other = "FA;"
|
||||
}
|
||||
var otherHz int64
|
||||
if r, err := k.ask(other); err == nil {
|
||||
if hz, ok := parseKenwoodFreq(r, strings.TrimSuffix(other, ";")); ok && hz > 0 && hz != rx {
|
||||
tx = hz
|
||||
otherHz = hz
|
||||
}
|
||||
}
|
||||
if otherHz > 0 {
|
||||
// WHICH of the two is the transmit frequency depends on whether the rig
|
||||
// is transmitting RIGHT NOW.
|
||||
//
|
||||
// IF reports the VFO "in use", and in split that is the RECEIVE VFO on
|
||||
// receive and the TRANSMIT VFO on transmit. The code took it as the
|
||||
// receive VFO always, so the moment the operator keyed up the two
|
||||
// frequencies swapped: correct on receive, reversed on transmit, which
|
||||
// is exactly how it was reported from a TS-590 on USB.
|
||||
//
|
||||
// It matters beyond the display. FreqHz is what a QSO is logged on, and
|
||||
// a contact made in split would have gone into the log on the DX's
|
||||
// frequency instead of the operator's.
|
||||
if f.TX {
|
||||
tx, rx = rx, otherHz
|
||||
} else {
|
||||
tx = otherHz
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -333,6 +421,7 @@ func (k *Kenwood) ReadState() (RigState, error) {
|
||||
if s.Split {
|
||||
k.curRXFreq = s.RxFreqHz
|
||||
}
|
||||
k.lastState = s // cache for the transmit window, where we can't poll
|
||||
return s, nil
|
||||
}
|
||||
|
||||
@@ -360,6 +449,36 @@ func (k *Kenwood) SetMode(mode string) error {
|
||||
if k.port == nil {
|
||||
return fmt.Errorf("kenwood: not connected")
|
||||
}
|
||||
// Honour the operator's DATA-mode preference for a digital mode. No single
|
||||
// mode digit fits every rig, so the operator picks: keep the rig's mode, use
|
||||
// MD6 (K3/K4 DATA), or fall through to the default USB from kenwoodModeDigit.
|
||||
if isKenwoodDataMode(mode) {
|
||||
// An Elecraft always uses DATA A for a soundcard digital mode — that's what
|
||||
// the "Elecraft" backend means, so the dataMode option doesn't apply.
|
||||
if k.elecraft {
|
||||
if err := k.write("MD6;"); err != nil {
|
||||
return err
|
||||
}
|
||||
return k.write("DT0;")
|
||||
}
|
||||
switch k.dataMode {
|
||||
case "keep":
|
||||
return nil // leave whatever data mode the operator set on the rig
|
||||
case "data":
|
||||
// Elecraft K3/K4 DATA mode (MD6) PLUS the DATA-A submode (DT0). MD6 alone
|
||||
// can leave the rig in an FSK/PSK data submode (from a prior RTTY/PSK
|
||||
// session), where FT8 keys the transmitter but the rear sound-card audio
|
||||
// never modulates — "transmits but nothing comes out". DT0 forces DATA A,
|
||||
// the audio submode FT8 needs. This is the Elecraft path (the option is
|
||||
// labelled K3/K4); a real K3/K4 answers DT with nothing. A plain Kenwood
|
||||
// has no DT command and would "?;" it — but that's a misconfiguration
|
||||
// (pick USB there), and IF is never latched so the link self-recovers.
|
||||
if err := k.write("MD6;"); err != nil {
|
||||
return err
|
||||
}
|
||||
return k.write("DT0;")
|
||||
}
|
||||
}
|
||||
d := kenwoodModeDigit(mode, k.curFreq)
|
||||
if d == 0 {
|
||||
return fmt.Errorf("kenwood: no CAT mode for %q", mode)
|
||||
@@ -367,13 +486,79 @@ func (k *Kenwood) SetMode(mode string) error {
|
||||
return k.write(fmt.Sprintf("MD%c;", d))
|
||||
}
|
||||
|
||||
// SetDataMode configures how a DATA/digital mode is set: "usb" (default), "data"
|
||||
// (MD6, Elecraft K3/K4) or "keep" (don't change the rig's mode).
|
||||
func (k *Kenwood) SetDataMode(m string) {
|
||||
k.mu.Lock()
|
||||
k.dataMode = strings.ToLower(strings.TrimSpace(m))
|
||||
k.mu.Unlock()
|
||||
}
|
||||
|
||||
// SetElecraft marks this client as driving a K3/K4 (the "Elecraft" backend), so
|
||||
// digital modes always land in DATA A (MD6+DT0). Set before Start.
|
||||
func (k *Kenwood) SetElecraft(v bool) {
|
||||
k.mu.Lock()
|
||||
k.elecraft = v
|
||||
k.mu.Unlock()
|
||||
}
|
||||
|
||||
// isKenwoodDataMode reports whether a mode name is a soundcard/data mode (FT8,
|
||||
// PSK, JT…) rather than a voice/CW/RTTY mode the rig sets natively.
|
||||
func isKenwoodDataMode(mode string) bool {
|
||||
switch strings.ToUpper(strings.TrimSpace(mode)) {
|
||||
case "", "LSB", "USB", "SSB", "CW", "CW-R", "CWR", "FM", "NFM", "AM",
|
||||
"RTTY", "FSK", "RTTY-R", "FSK-R":
|
||||
return false
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
// SetSplit arms or clears split, and when arming puts txHz on the transmit VFO.
|
||||
//
|
||||
// Both halves in one call on purpose. WSJT-X sends "split on, VFO B" and "VFO B
|
||||
// to 14075300" as two commands, and honouring only the first is worse than
|
||||
// honouring neither: split would arm on whatever VFO B happened to hold, so the
|
||||
// operator transmits somewhere they never chose while the software reports
|
||||
// exactly what they asked for. Nothing is armed here until the frequency is on
|
||||
// the dial.
|
||||
//
|
||||
// FR selects the receive VFO, FT the transmit one — the same pair the poll loop
|
||||
// already reads to detect split, so this writes what State() knows how to read.
|
||||
func (k *Kenwood) SetSplit(on bool, txHz int64) error {
|
||||
k.mu.Lock()
|
||||
defer k.mu.Unlock()
|
||||
if k.port == nil {
|
||||
return fmt.Errorf("kenwood: not connected")
|
||||
}
|
||||
if !on {
|
||||
// Transmit follows receive again. FR is left alone: which VFO the operator
|
||||
// listens on is theirs to choose, and clearing split should not move them.
|
||||
return k.write("FT0;")
|
||||
}
|
||||
if txHz <= 0 || txHz > 99_999_999_999 {
|
||||
return fmt.Errorf("kenwood: split TX frequency %d out of the 11-digit CAT range", txHz)
|
||||
}
|
||||
// The transmit dial FIRST, then arm. Arming first would transmit on the old
|
||||
// contents of VFO B for however long the next command takes to arrive — brief,
|
||||
// but on the wrong frequency, and this runs the instant before a transmission.
|
||||
if err := k.write(fmt.Sprintf("FB%011d;", txHz)); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := k.write("FR0;"); err != nil { // receive on A
|
||||
return err
|
||||
}
|
||||
return k.write("FT1;") // transmit on B
|
||||
}
|
||||
|
||||
func (k *Kenwood) SetPTT(on bool) error {
|
||||
k.mu.Lock()
|
||||
defer k.mu.Unlock()
|
||||
if k.port == nil {
|
||||
return fmt.Errorf("kenwood: not connected")
|
||||
}
|
||||
k.tx = on
|
||||
if on {
|
||||
k.txAt = time.Now()
|
||||
return k.write("TX;")
|
||||
}
|
||||
return k.write("RX;")
|
||||
@@ -431,11 +616,20 @@ func (k *Kenwood) ask(cmd string) (string, error) {
|
||||
k.rx = k.rx[i+1:]
|
||||
traceText("kenwood", "RX", frame)
|
||||
if frame == "?;" {
|
||||
// The rig rejected the command. Remember it so the poll loop stops
|
||||
// paying a 600 ms timeout for it on every cycle.
|
||||
// Sentinel-wrapped so the poll loop can tell "the rig said no" apart
|
||||
// from a serial fault. The two look identical as plain errors and must
|
||||
// not be handled the same way: one means try again in a moment, the
|
||||
// other means the link is gone.
|
||||
// IF; and ID; are universal on Kenwood/Elecraft — a "?;" to them is a
|
||||
// transient "busy" (typically mid-transmit, or a menu open on the rig),
|
||||
// NOT "unsupported". Latching them off would blind the poll loop for
|
||||
// good and read as "lost the rig". Only remember the OPTIONAL commands
|
||||
// (FR/FT/…) so the poll loop stops paying a 600 ms timeout for those.
|
||||
if want != "IF" && want != "ID" {
|
||||
k.unsupported[want] = true
|
||||
debugLog.Printf("kenwood: this rig does not support %q — not asking again", cmd)
|
||||
return "", fmt.Errorf("kenwood: %s rejected", want)
|
||||
}
|
||||
return "", fmt.Errorf("kenwood: %s rejected: %w", want, errRigRejected)
|
||||
}
|
||||
if strings.HasPrefix(frame, want) {
|
||||
return frame, nil
|
||||
@@ -551,11 +745,12 @@ func kenwoodModeDigit(mode string, hz int64) byte {
|
||||
}
|
||||
return '2'
|
||||
}
|
||||
// Any other digital mode (FT8, PSK, JT…) rides the DATA input, and by universal
|
||||
// convention that is ALWAYS the UPPER sideband, on every band. The SSB rule
|
||||
// (LSB below 10 MHz) must NOT be applied here: doing so put a 40/80 m data spot
|
||||
// on LSB, which an Elecraft K3 shows as "DATA REV" — the reversed sideband.
|
||||
// (RTTY/FSK is handled above as its own FSK mode, so it isn't affected.)
|
||||
// Any other digital mode (FT8, PSK, JT…) → USB on every band. There is NO single
|
||||
// mode digit that is right for both families: a K3 wants DATA (MD6), a TS-590SG
|
||||
// wants USB-DATA (MD2 + its DATA modifier), and MD6 on the TS-590SG is FSK/RTTY
|
||||
// — wrong for FT8. USB is the safe common base (the reversed-sideband "DATA REV"
|
||||
// only came from the old LSB-below-10-MHz rule). A rig-specific DATA mode is a
|
||||
// follow-up that needs the model, not a blind default.
|
||||
return '2'
|
||||
}
|
||||
|
||||
@@ -563,7 +758,11 @@ func kenwoodModeDigit(mode string, hz int64) byte {
|
||||
// Digital modes are indistinguishable from SSB over CAT — the rig only knows
|
||||
// it is on USB — so the operator's configured digital mode is used, exactly as
|
||||
// the other backends do.
|
||||
func kenwoodModeToADIF(d byte, digital string) string {
|
||||
//
|
||||
// md6IsData says whether MD6 means DATA on THIS rig — true for an Elecraft
|
||||
// (the K3/K4 backend, and the "MD6" data-mode option that targets it), false
|
||||
// for a plain Kenwood. See below.
|
||||
func kenwoodModeToADIF(d byte, digital string, md6IsData bool) string {
|
||||
switch d {
|
||||
case '1':
|
||||
return "LSB"
|
||||
@@ -576,6 +775,15 @@ func kenwoodModeToADIF(d byte, digital string) string {
|
||||
case '5':
|
||||
return "AM"
|
||||
case '6', '9':
|
||||
// One digit, two meanings. On a Kenwood MD6/MD9 is FSK/FSK-R; on an
|
||||
// Elecraft it is DATA / DATA-REV — and DATA is precisely what SetMode
|
||||
// puts a K3/K4 into for FT8. Reading it straight back as RTTY meant a K3
|
||||
// running FT8 reported RTTY: the QSO was logged on the wrong mode, and
|
||||
// the shared CAT link told WSJT-X/JTDX the rig sat in RTTY while they had
|
||||
// asked for a data mode.
|
||||
if md6IsData {
|
||||
return digital
|
||||
}
|
||||
return "RTTY"
|
||||
}
|
||||
return ""
|
||||
|
||||
@@ -29,7 +29,30 @@ const kenwoodCWChunk = 24
|
||||
|
||||
// kenwoodCWAllowed is what the keyer can send; anything else is dropped, since an
|
||||
// unsupported byte can abort the buffer and lose the rest of the message.
|
||||
const kenwoodCWAllowed = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 /?.,-=+:;()"
|
||||
// The semicolon is deliberately absent: it TERMINATES a CAT frame. The TS-590
|
||||
// manual says so outright for P2, and one in a macro would close the command
|
||||
// early and leave the rest of the text to be read as commands of its own.
|
||||
const kenwoodCWAllowed = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 /?.,-=+:()"
|
||||
|
||||
// padCW pads a piece to the fixed 24-character P2 a Kenwood demands.
|
||||
//
|
||||
// This is where CW over CAT failed on a TS-590SG. The KY command was written
|
||||
// against Elecraft's, which takes a variable-length string, so "KY OH5CX;" went
|
||||
// out and the radio answered "?;" — read as "this rig refuses CW over CAT", and
|
||||
// the operator was told to go and buy a serial keyer.
|
||||
//
|
||||
// The TS-590 manual is explicit: P2 has a FIXED length of 24, and characters
|
||||
// left blank are filled with spaces which are NOT keyed. So the padding costs
|
||||
// nothing on air — it is simply the shape the command has to have.
|
||||
//
|
||||
// Elecraft is left variable-length: it accepts short strings, and padding there
|
||||
// would key the trailing spaces as word gaps.
|
||||
func (k *Kenwood) padCW(chunk string) string {
|
||||
if k.elecraft || len(chunk) >= kenwoodCWChunk {
|
||||
return chunk
|
||||
}
|
||||
return chunk + strings.Repeat(" ", kenwoodCWChunk-len(chunk))
|
||||
}
|
||||
|
||||
// SendCW queues a message on the rig's keyer, fed in 24-character pieces, waiting
|
||||
// for buffer room between pieces so a long macro doesn't lose its tail.
|
||||
@@ -51,7 +74,7 @@ func (k *Kenwood) SendCW(text string) error {
|
||||
chunk := msg[:n]
|
||||
msg = msg[n:]
|
||||
k.waitCWBuffer(3 * time.Second)
|
||||
if err := k.write("KY " + chunk + ";"); err != nil {
|
||||
if err := k.write("KY " + k.padCW(chunk) + ";"); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := k.afterKY(); err != nil {
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
package cat
|
||||
|
||||
import (
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
// The TS-590 wants a FIXED 24-character P2. Sending the bare text is what made
|
||||
// CW over CAT fail on a real TS-590SG: "KY OH5CX;" came back "?;", which OpsLog
|
||||
// reported as "this radio rejected CW over CAT" and sent the operator off to buy
|
||||
// a serial keyer he did not need.
|
||||
func TestKenwoodCWPadsToTheFixedWidth(t *testing.T) {
|
||||
k := &Kenwood{}
|
||||
got := k.padCW("OH5CX")
|
||||
if len(got) != kenwoodCWChunk {
|
||||
t.Errorf("padCW(%q) is %d chars, want exactly %d — the rig rejects anything else",
|
||||
"OH5CX", len(got), kenwoodCWChunk)
|
||||
}
|
||||
if got[:5] != "OH5CX" || strings.TrimRight(got, " ") != "OH5CX" {
|
||||
t.Errorf("padCW = %q — the text must be intact and the rest spaces", got)
|
||||
}
|
||||
// A full piece is already the right width and must not grow.
|
||||
full := strings.Repeat("A", kenwoodCWChunk)
|
||||
if k.padCW(full) != full {
|
||||
t.Error("a full 24-character piece was padded further")
|
||||
}
|
||||
|
||||
// Elecraft takes variable length, and padding there would key the trailing
|
||||
// spaces as word gaps.
|
||||
e := &Kenwood{elecraft: true}
|
||||
if e.padCW("OH5CX") != "OH5CX" {
|
||||
t.Errorf("Elecraft piece was padded: %q", e.padCW("OH5CX"))
|
||||
}
|
||||
}
|
||||
|
||||
// ";" terminates a CAT frame. The manual forbids it in P2, and one arriving in a
|
||||
// macro would close the command early and leave the rest to be read as commands.
|
||||
func TestKenwoodCWDropsTheSemicolon(t *testing.T) {
|
||||
if got := filterKenwoodCW("CQ; DE OH5CX"); strings.Contains(got, ";") {
|
||||
t.Errorf("filterKenwoodCW kept a semicolon: %q", got)
|
||||
}
|
||||
}
|
||||
@@ -108,6 +108,9 @@ type ts2000 struct {
|
||||
mode byte
|
||||
onB bool
|
||||
split bool
|
||||
// tx models the rig KEYED. On a real Kenwood in split, IF then reports the
|
||||
// TRANSMIT VFO as the one in use — which is the whole point of the test below.
|
||||
tx bool
|
||||
// lazyIF models a rig that answers FR/FT correctly but never fills IF's
|
||||
// split bit — the behaviour reported on a Flex through its Kenwood CAT
|
||||
// emulation, where the frequency reads perfectly and split never appears.
|
||||
@@ -138,8 +141,12 @@ func (r *ts2000) answer(cmd string) string {
|
||||
}
|
||||
// The catemu layout: IF | freq(11) | step(4) | RIT(±5) | 3 | mem(2) |
|
||||
// rx/tx | mode | VFO | scan | split | tone | tone#(2) | shift | ;
|
||||
txByte := 0
|
||||
if r.tx {
|
||||
txByte = 1
|
||||
}
|
||||
return fmt.Sprintf("IF%011d%04d%+06d%03d%02d%01d%c%c%01d%c%01d%02d%01d;",
|
||||
cur, 0, 0, 0, 0, 0, r.mode, vfoDigit, 0, split, 0, 0, 0)
|
||||
cur, 0, 0, 0, 0, txByte, r.mode, vfoDigit, 0, split, 0, 0, 0)
|
||||
case strings.HasPrefix(cmd, "FA") && len(cmd) > 3:
|
||||
fmt.Sscanf(cmd, "FA%d;", &r.vfoA)
|
||||
return ""
|
||||
@@ -174,6 +181,19 @@ func dialTo(rig *ts2000) func() (serial.Port, error) {
|
||||
}
|
||||
}
|
||||
|
||||
// dialToBusy is dialTo with a hook that makes the rig answer "?;" instead —
|
||||
// what a real Kenwood does while it is busy, rather than staying silent.
|
||||
func dialToBusy(rig *ts2000, busy func(cmd string) bool) func() (serial.Port, error) {
|
||||
return func() (serial.Port, error) {
|
||||
return &fakeSerial{toRig: &strings.Builder{}, answer: func(cmd string) string {
|
||||
if busy(cmd) {
|
||||
return "?;"
|
||||
}
|
||||
return rig.answer(cmd)
|
||||
}}, nil
|
||||
}
|
||||
}
|
||||
|
||||
func TestKenwoodAgainstEmulatedRig(t *testing.T) {
|
||||
rig := &ts2000{vfoA: 14250000, vfoB: 14260000, mode: '2'} // 20 m USB
|
||||
k := NewKenwood("COM-TEST", 9600, "FT8")
|
||||
@@ -383,3 +403,103 @@ func TestKenwoodNoisyRigIsReportedAsNoiseNotSilence(t *testing.T) {
|
||||
t.Errorf("error was %q — it should say data arrived, and quote it", err)
|
||||
}
|
||||
}
|
||||
|
||||
// A "?;" to IF; must not tear the link down.
|
||||
//
|
||||
// The TS-590SG answers "?;" for a moment after coming out of transmit, which is
|
||||
// exactly when the poll resumes. In the field that single rejected poll dropped
|
||||
// the whole CAT link: WSJT-X, keying through shared CAT, lost the rig, and
|
||||
// Hamlib then sent an uninitialised frequency (2^63) that OpsLog refused — an
|
||||
// alarming error whose real cause was three lines earlier.
|
||||
func TestKenwoodBusyRigKeepsTheLink(t *testing.T) {
|
||||
rig := &ts2000{vfoA: 14250000, vfoB: 14260000, mode: '2'}
|
||||
busy := 0
|
||||
k := NewKenwood("COM-TEST", 9600, "FT8")
|
||||
k.dialPort = dialToBusy(rig, func(cmd string) bool {
|
||||
if strings.HasPrefix(cmd, "IF") && busy > 0 {
|
||||
busy--
|
||||
return true
|
||||
}
|
||||
return false
|
||||
})
|
||||
if err := k.Connect(); err != nil {
|
||||
t.Fatalf("connect: %v", err)
|
||||
}
|
||||
defer k.Disconnect()
|
||||
|
||||
// One good read establishes the state the busy window will keep serving.
|
||||
first, err := k.ReadState()
|
||||
if err != nil || !first.Connected {
|
||||
t.Fatalf("first read: %+v err=%v", first, err)
|
||||
}
|
||||
|
||||
// Inside the grace: still connected, still reporting the last good frequency.
|
||||
busy = ifRejectGrace
|
||||
for i := 1; i <= ifRejectGrace; i++ {
|
||||
s, err := k.ReadState()
|
||||
if err != nil {
|
||||
t.Fatalf("reject %d dropped the link: %v", i, err)
|
||||
}
|
||||
if !s.Connected || s.FreqHz != first.FreqHz {
|
||||
t.Errorf("reject %d gave %+v — want the last good state, still connected", i, s)
|
||||
}
|
||||
}
|
||||
|
||||
// The rig answers again → the tolerance resets, so a later busy spell gets
|
||||
// the full allowance instead of inheriting the previous one.
|
||||
if s, err := k.ReadState(); err != nil || !s.Connected {
|
||||
t.Fatalf("recovery read failed: %+v err=%v", s, err)
|
||||
}
|
||||
|
||||
// Past the grace, a persistent refusal IS a fault and must surface.
|
||||
busy = ifRejectGrace + 1
|
||||
var lastErr error
|
||||
for i := 0; i <= ifRejectGrace; i++ {
|
||||
if _, lastErr = k.ReadState(); lastErr != nil {
|
||||
break
|
||||
}
|
||||
}
|
||||
if lastErr == nil {
|
||||
t.Error("a rig refusing IF; forever was still reported as healthy")
|
||||
}
|
||||
}
|
||||
|
||||
// In split, the two frequencies must not swap the moment the operator keys up.
|
||||
//
|
||||
// IF reports the VFO "in use", and in split that is the RECEIVE VFO on receive
|
||||
// and the TRANSMIT VFO on transmit. The backend took it as the receive VFO
|
||||
// always, so everything read correctly until the PTT closed and then reversed —
|
||||
// reported from a TS-590 on USB.
|
||||
//
|
||||
// It matters beyond the display: FreqHz is what a QSO is LOGGED on, so a split
|
||||
// contact would have been logged on the DX's frequency instead of the operator's.
|
||||
func TestKenwoodSplitDoesNotSwapOnTransmit(t *testing.T) {
|
||||
rig := &ts2000{vfoA: 14200000, vfoB: 14205000, mode: '2', split: true}
|
||||
k := NewKenwood("COM-TEST", 9600, "FT8")
|
||||
k.dialPort = dialTo(rig)
|
||||
if err := k.Connect(); err != nil {
|
||||
t.Fatalf("connect: %v", err)
|
||||
}
|
||||
defer k.Disconnect()
|
||||
|
||||
// Receiving: IF reports VFO A, the receive dial.
|
||||
s, err := k.ReadState()
|
||||
if err != nil {
|
||||
t.Fatalf("read on receive: %v", err)
|
||||
}
|
||||
if !s.Split || s.FreqHz != 14205000 || s.RxFreqHz != 14200000 {
|
||||
t.Fatalf("on receive: split=%v tx=%d rx=%d — want tx 14205000, rx 14200000",
|
||||
s.Split, s.FreqHz, s.RxFreqHz)
|
||||
}
|
||||
|
||||
// Keyed: the rig switches to the transmit VFO and sets IF's TX byte.
|
||||
rig.onB, rig.tx = true, true
|
||||
s, err = k.ReadState()
|
||||
if err != nil {
|
||||
t.Fatalf("read on transmit: %v", err)
|
||||
}
|
||||
if s.FreqHz != 14205000 || s.RxFreqHz != 14200000 {
|
||||
t.Errorf("on transmit: tx=%d rx=%d — the two swapped; want tx 14205000, rx 14200000",
|
||||
s.FreqHz, s.RxFreqHz)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -111,6 +111,23 @@ func TestKenwoodModeDigit(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
// The DATA-mode preference only applies to soundcard/data modes, never to voice,
|
||||
// CW or native RTTY — getting this wrong would hijack an SSB or CW mode change.
|
||||
func TestIsKenwoodDataMode(t *testing.T) {
|
||||
data := []string{"FT8", "FT4", "PSK31", "JT65", "DATA", "DIGITAL", "OLIVIA"}
|
||||
notData := []string{"", "LSB", "USB", "SSB", "CW", "CW-R", "FM", "AM", "RTTY", "FSK", "RTTY-R"}
|
||||
for _, m := range data {
|
||||
if !isKenwoodDataMode(m) {
|
||||
t.Errorf("isKenwoodDataMode(%q) = false, want true", m)
|
||||
}
|
||||
}
|
||||
for _, m := range notData {
|
||||
if isKenwoodDataMode(m) {
|
||||
t.Errorf("isKenwoodDataMode(%q) = true, want false", m)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// What the log records for each mode digit the rig reports.
|
||||
func TestKenwoodModeToADIF(t *testing.T) {
|
||||
cases := []struct {
|
||||
@@ -124,8 +141,23 @@ func TestKenwoodModeToADIF(t *testing.T) {
|
||||
{'0', ""}, // unknown → say nothing rather than guess
|
||||
}
|
||||
for _, c := range cases {
|
||||
if got := kenwoodModeToADIF(c.d, "FT8"); got != c.want {
|
||||
if got := kenwoodModeToADIF(c.d, "FT8", false); got != c.want {
|
||||
t.Errorf("kenwoodModeToADIF(%q) = %q, want %q", c.d, got, c.want)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// On a K3/K4 the same digits mean DATA / DATA-REV, not FSK — and DATA is what
|
||||
// OpsLog itself sets for FT8. Decoding them as RTTY logged a K3 running FT8 on
|
||||
// the wrong mode and told the shared-CAT clients the rig was in RTTY.
|
||||
func TestKenwoodModeToADIFElecraftData(t *testing.T) {
|
||||
for _, d := range []byte{'6', '9'} {
|
||||
if got := kenwoodModeToADIF(d, "FT8", true); got != "FT8" {
|
||||
t.Errorf("kenwoodModeToADIF(%q, elecraft) = %q, want %q", d, got, "FT8")
|
||||
}
|
||||
}
|
||||
// Everything else is unaffected by the Elecraft dialect.
|
||||
if got := kenwoodModeToADIF('2', "FT8", true); got != "USB" {
|
||||
t.Errorf("kenwoodModeToADIF('2', elecraft) = %q, want USB", got)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
-- MY_IOTA: the island reference the station operates FROM, e.g. "EU-005".
|
||||
--
|
||||
-- An official ADIF field, and the QSO table has carried my_iota since 0001 —
|
||||
-- only the station profile could not supply it, so an island activation had to
|
||||
-- have the reference typed on every contact or added afterwards. Blank by
|
||||
-- default: the overwhelming majority of stations are not on an island.
|
||||
ALTER TABLE station_profiles ADD COLUMN my_iota TEXT NOT NULL DEFAULT '';
|
||||
@@ -173,6 +173,39 @@ func (m *Manager) EntityNames() []string {
|
||||
return out
|
||||
}
|
||||
|
||||
// PrefixByDXCC maps ADIF DXCC entity number → canonical primary prefix (F, DL,
|
||||
// XE…) from the loaded cty.dat. cty.dat is keyed by entity NAME, so the join
|
||||
// goes through EntityDXCC; entries whose name doesn't resolve are skipped
|
||||
// rather than guessed. Empty until cty.dat has loaded.
|
||||
func (m *Manager) PrefixByDXCC() map[int]string {
|
||||
m.mu.RLock()
|
||||
db := m.db
|
||||
m.mu.RUnlock()
|
||||
if db == nil {
|
||||
return nil
|
||||
}
|
||||
out := make(map[int]string, 400)
|
||||
for _, e := range db.Entities() {
|
||||
p := strings.TrimSpace(e.Primary)
|
||||
if p == "" {
|
||||
continue
|
||||
}
|
||||
// cty.dat marks non-DXCC sub-entities with a leading '*' — they report
|
||||
// under a parent entity and must not overwrite the parent's prefix.
|
||||
if strings.HasPrefix(p, "*") {
|
||||
continue
|
||||
}
|
||||
if n := EntityDXCC(e.Name); n > 0 {
|
||||
if _, dup := out[n]; !dup {
|
||||
// DXCC prefixes are conventionally upper-case; cty.dat spells some
|
||||
// sub-entity suffixes in lower case (3D2/c → 3D2/C).
|
||||
out[n] = strings.ToUpper(p)
|
||||
}
|
||||
}
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// Info returns metadata about the currently-loaded cty.dat (or zero value
|
||||
// if nothing loaded).
|
||||
func (m *Manager) Info() ctySource {
|
||||
|
||||
@@ -27,6 +27,19 @@ const clublogBatchURL = "https://clublog.org/putlogs.php"
|
||||
// must send a real, app-identifying User-Agent.
|
||||
const clublogUserAgent = "OpsLog/1.0 (+https://github.com/GregTroar/OpsLog)"
|
||||
|
||||
// looksLikeHTML reports a body that is a web page rather than an answer. Club
|
||||
// Log serves its normal site for refusals and blocks, so this is what separates
|
||||
// "here is what went wrong" from 4 KB of markup an operator cannot act on.
|
||||
func looksLikeHTML(s string) bool {
|
||||
l := strings.ToLower(strings.TrimSpace(s))
|
||||
return strings.HasPrefix(l, "<!doctype html") || strings.HasPrefix(l, "<html")
|
||||
}
|
||||
|
||||
// clublogDownloadURL is Club Log's ADIF export. Used ONLY to verify credentials
|
||||
// (see TestClublog): it is the one authenticated endpoint that cannot change
|
||||
// anything in the operator's log, which is what a test button must never do.
|
||||
const clublogDownloadURL = "https://clublog.org/getadif.php"
|
||||
|
||||
// clublogAppAPIKey is OpsLog's Club Log *application* API key. Club Log
|
||||
// requires an api parameter that identifies the client software (not the
|
||||
// user) — the same way Log4OM embeds its own key — so we ship it baked in
|
||||
@@ -204,17 +217,84 @@ func stripHTMLBrief(s string) string {
|
||||
// TestClublog validates the configured credentials by attempting a no-op
|
||||
// style check. Club Log has no dedicated status endpoint, so we report the
|
||||
// fields look complete; a real failure surfaces on the first upload.
|
||||
// TestClublog checks the credentials against Club Log, not against themselves.
|
||||
//
|
||||
// It used to verify that the three fields were non-empty and then report
|
||||
// "Ready — <call> via <email>". Nothing was sent anywhere, so a wrong password
|
||||
// produced exactly the same green message as a right one. That is worse than
|
||||
// having no button: it is confidence the test never earned, and it cost an
|
||||
// operator the one moment they were actually looking for the problem.
|
||||
//
|
||||
// The download endpoint is used because it is READ-ONLY: testing a password
|
||||
// must not put a record into someone's log. Club Log answers a rejected login
|
||||
// with 403 before sending any body, so the answer arrives immediately; on
|
||||
// success the body is a log, and we read a few bytes and hang up rather than
|
||||
// pull it down to prove a point.
|
||||
func TestClublog(ctx context.Context, cfg ServiceConfig) (string, error) {
|
||||
_ = ctx
|
||||
email := strings.TrimSpace(cfg.Email)
|
||||
call := strings.ToUpper(strings.TrimSpace(cfg.Callsign))
|
||||
switch {
|
||||
case strings.TrimSpace(cfg.Email) == "":
|
||||
case email == "":
|
||||
return "", fmt.Errorf("clublog: account email not set")
|
||||
case cfg.Password == "":
|
||||
return "", fmt.Errorf("clublog: password not set")
|
||||
case strings.TrimSpace(cfg.Callsign) == "":
|
||||
case call == "":
|
||||
return "", fmt.Errorf("clublog: logbook callsign not set")
|
||||
}
|
||||
return fmt.Sprintf("Ready — %s via %s", strings.ToUpper(strings.TrimSpace(cfg.Callsign)), strings.TrimSpace(cfg.Email)), nil
|
||||
|
||||
if ctx == nil {
|
||||
ctx = context.Background()
|
||||
}
|
||||
ctx, cancel := context.WithTimeout(ctx, 30*time.Second)
|
||||
defer cancel()
|
||||
|
||||
form := url.Values{}
|
||||
form.Set("email", email)
|
||||
form.Set("password", cfg.Password)
|
||||
form.Set("call", call)
|
||||
// No date filter. A "startyear=2099" was tried to keep the reply small, but
|
||||
// Club Log answers an unrecognised request with the SAME 403 it uses for a
|
||||
// refused login — so an unverified parameter would have made every correct
|
||||
// password look wrong, which is the failure this whole change exists to end.
|
||||
// The reply is capped at 4 KB and the body closed immediately instead; the
|
||||
// status code arrives before any of it.
|
||||
|
||||
req, err := http.NewRequestWithContext(ctx, http.MethodPost, clublogDownloadURL, strings.NewReader(form.Encode()))
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("clublog: build request: %w", err)
|
||||
}
|
||||
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
|
||||
req.Header.Set("User-Agent", clublogUserAgent)
|
||||
|
||||
resp, err := (&http.Client{Timeout: 30 * time.Second}).Do(req)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("clublog: could not reach Club Log: %w", err)
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
body, _ := io.ReadAll(io.LimitReader(resp.Body, 4096))
|
||||
msg := strings.TrimSpace(string(body))
|
||||
|
||||
switch resp.StatusCode {
|
||||
case http.StatusOK:
|
||||
return fmt.Sprintf("Ready — %s via %s (Club Log accepted the login)", call, email), nil
|
||||
case http.StatusUnauthorized, http.StatusForbidden:
|
||||
// Club Log refuses with its ordinary web page, not an error string, so the
|
||||
// body is 4 KB of markup that says nothing to an operator. It goes to the
|
||||
// log — that is where a real diagnosis happens — and the message says the
|
||||
// one thing there is to do about it.
|
||||
LogSink("clublog: login refused (http %d), body: %s", resp.StatusCode, msg)
|
||||
return "", fmt.Errorf("Club Log refused the login — check the account e-mail, " +
|
||||
"the password and the logbook callsign. They are the Club Log website's own credentials")
|
||||
default:
|
||||
LogSink("clublog: unexpected http %d, body: %s", resp.StatusCode, msg)
|
||||
if looksLikeHTML(msg) {
|
||||
return "", fmt.Errorf("clublog: Club Log answered with a web page (http %d) instead of a log — see the log file", resp.StatusCode)
|
||||
}
|
||||
if len(msg) > 200 {
|
||||
msg = msg[:200] + "…"
|
||||
}
|
||||
return "", fmt.Errorf("clublog: http %d %s", resp.StatusCode, msg)
|
||||
}
|
||||
}
|
||||
|
||||
// clublogPost performs the form POST and maps the HTTP status to a result.
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
package extsvc
|
||||
|
||||
import "testing"
|
||||
|
||||
// Club Log answers a refused login with its ordinary web page. The operator must
|
||||
// get a sentence they can act on, not four kilobytes of markup — that was the
|
||||
// first thing reported once the test started working at all.
|
||||
func TestLooksLikeHTML(t *testing.T) {
|
||||
cases := []struct {
|
||||
body string
|
||||
want bool
|
||||
}{
|
||||
{"<!DOCTYPE html>\n<html lang='en'>…403 - Access denied…", true},
|
||||
{" <html><head><title>403</title></head></html>", true},
|
||||
{"<HTML>", true},
|
||||
{"Invalid credentials", false},
|
||||
{"", false},
|
||||
// An ADIF answer must never be mistaken for a page.
|
||||
{"<eoh>\n<call:5>F4BPO <band:3>20m <eor>", false},
|
||||
}
|
||||
for _, c := range cases {
|
||||
if got := looksLikeHTML(c.body); got != c.want {
|
||||
t.Errorf("looksLikeHTML(%.40q) = %v, want %v", c.body, got, c.want)
|
||||
}
|
||||
}
|
||||
}
|
||||
+24
-1
@@ -277,10 +277,33 @@ func TestLoTW(cfg ServiceConfig, stationDataPath string) (string, error) {
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("lotw: can't read station locations: %w", err)
|
||||
}
|
||||
found := ""
|
||||
for _, l := range locs {
|
||||
if strings.EqualFold(l.Name, loc) {
|
||||
return fmt.Sprintf("Ready — TQSL found, location %q (%s)", l.Name, l.Call), nil
|
||||
found = l.Call
|
||||
break
|
||||
}
|
||||
}
|
||||
if found == "" {
|
||||
return "", fmt.Errorf("lotw: station location %q not found in TQSL", loc)
|
||||
}
|
||||
|
||||
// LoTW is TWO credentials doing two jobs, and the button used to report only
|
||||
// the first. Uploading goes through TQSL and is signed by the certificate —
|
||||
// the website password is never involved, so a wrong one breaks nothing until
|
||||
// the day confirmations are downloaded and nobody connects the two events.
|
||||
//
|
||||
// So the download login is tested separately, and said separately. A future
|
||||
// "since" date makes LoTW return an empty report rather than the whole
|
||||
// account: the credentials are what is being checked, not the log.
|
||||
up := fmt.Sprintf("Ready — TQSL found, location %q (%s)", loc, found)
|
||||
if strings.TrimSpace(cfg.Username) == "" || cfg.Password == "" {
|
||||
return up + ". Download login not set — confirmations cannot be fetched.", nil
|
||||
}
|
||||
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
|
||||
defer cancel()
|
||||
if _, err := DownloadLoTWConfirmations(ctx, nil, cfg, "2099-01-01", ""); err != nil {
|
||||
return "", fmt.Errorf("%s — but the DOWNLOAD login failed: %w", up, err)
|
||||
}
|
||||
return up + ". Download login accepted.", nil
|
||||
}
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
package udp
|
||||
|
||||
import (
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
// The diagnostic that matters: a text payload arriving on a WSJT port must be
|
||||
// READABLE in the log. "bad magic 0x3132372e" alone told the operator nothing —
|
||||
// those four bytes are ASCII "127.", i.e. some program broadcasting an address
|
||||
// where WSJT-X binary was expected.
|
||||
func TestDescribePacketShowsTextAndHex(t *testing.T) {
|
||||
got := describePacket([]byte("127.0.0.1:4532"))
|
||||
for _, want := range []string{`14 bytes`, `"127.0.0.1:4532"`, `31 32 37 2e`} {
|
||||
if !strings.Contains(got, want) {
|
||||
t.Errorf("describePacket missing %q\ngot: %s", want, got)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Binary stays inspectable: unprintable bytes become dots in the preview and
|
||||
// the hex carries the real values.
|
||||
func TestDescribePacketHandlesBinary(t *testing.T) {
|
||||
got := describePacket([]byte{0xad, 0xbc, 0xcb, 0xda, 0x00})
|
||||
if !strings.Contains(got, `"....."`) || !strings.Contains(got, "ad bc cb da 00") {
|
||||
t.Errorf("binary preview wrong: %s", got)
|
||||
}
|
||||
}
|
||||
|
||||
// A long datagram is truncated, and says so, rather than dumping a whole packet
|
||||
// into the log on every line.
|
||||
func TestDescribePacketTruncates(t *testing.T) {
|
||||
got := describePacket([]byte(strings.Repeat("A", 300)))
|
||||
if !strings.Contains(got, "300 bytes") {
|
||||
t.Errorf("lost the real length: %s", got)
|
||||
}
|
||||
if !strings.Contains(got, "…") {
|
||||
t.Errorf("truncation not marked: %s", got)
|
||||
}
|
||||
if strings.Count(got, "41 ") > 96 {
|
||||
t.Errorf("hex not capped: %s", got)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,63 @@
|
||||
package udp
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"testing"
|
||||
)
|
||||
|
||||
// Bytes captured from a real W&P relay in front of MSHV: the origin as text,
|
||||
// a '|', then the untouched WSJT-X packet. This exact datagram produced
|
||||
// "bad magic 0x3132372e" — 0x3132372e being ASCII "127.".
|
||||
var wpDecode = []byte{
|
||||
// "127.0.0.1:2237|"
|
||||
0x31, 0x32, 0x37, 0x2e, 0x30, 0x2e, 0x30, 0x2e, 0x31, 0x3a, 0x32, 0x32, 0x33, 0x37, 0x7c,
|
||||
// magic, schema 3, type 2 (Decode), id "MSHV"
|
||||
0xad, 0xbc, 0xcb, 0xda, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x02,
|
||||
0x00, 0x00, 0x00, 0x04, 0x4d, 0x53, 0x48, 0x56,
|
||||
0x01, 0x01, 0x4b, 0x31, 0x28, 0x00, 0x00, 0x00, 0x16,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x8a,
|
||||
0x00, 0x00, 0x00, 0x03, 0x46, 0x54, 0x38, // "FT8"
|
||||
0x00, 0x00, 0x00, 0x0e, 0x54, 0x4e, 0x38, 0x47, 0x44, 0x20, 0x39, 0x41, 0x31, 0x4d, 0x4d, 0x20, 0x37, 0x33, // "TN8GD 9A1MM 73"
|
||||
0x00, 0x00,
|
||||
}
|
||||
|
||||
func TestParseWSJTBehindAForwarder(t *testing.T) {
|
||||
if _, _, err := ParseWSJT(wpDecode); err != nil {
|
||||
t.Fatalf("relayed packet still fails: %v", err)
|
||||
}
|
||||
// And the header is what was in the way: without it the same bytes parse.
|
||||
if _, _, err := ParseWSJT(wpDecode[15:]); err != nil {
|
||||
t.Fatalf("bare packet fails: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestStripForwarderHeader(t *testing.T) {
|
||||
bare := wpDecode[15:]
|
||||
|
||||
if got := stripForwarderHeader(bare); !bytes.Equal(got, bare) {
|
||||
t.Error("a packet with no header must be returned untouched")
|
||||
}
|
||||
if got := stripForwarderHeader(wpDecode); !bytes.Equal(got, bare) {
|
||||
t.Error("the text header was not stripped")
|
||||
}
|
||||
|
||||
// A BINARY prefix is not a forwarder header — refusing it is what stops a
|
||||
// corrupt packet that merely contains the magic from becoming a QSO.
|
||||
binPrefix := append([]byte{0x00, 0x01, 0x02}, bare...)
|
||||
if got := stripForwarderHeader(binPrefix); !bytes.Equal(got, binPrefix) {
|
||||
t.Error("a non-printable prefix must not be treated as a header")
|
||||
}
|
||||
|
||||
// Beyond the window, the magic is ignored however printable the prefix is.
|
||||
far := append(bytes.Repeat([]byte("A"), maxFwdHeader+1), bare...)
|
||||
if got := stripForwarderHeader(far); !bytes.Equal(got, far) {
|
||||
t.Error("magic past maxFwdHeader must not be trusted")
|
||||
}
|
||||
|
||||
// No magic anywhere, and runt packets, must not panic or invent anything.
|
||||
for _, junk := range [][]byte{[]byte("127.0.0.1:2237|hello"), {}, {0xad}, {0xad, 0xbc, 0xcb}} {
|
||||
if got := stripForwarderHeader(junk); !bytes.Equal(got, junk) {
|
||||
t.Errorf("junk %q was altered", junk)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -59,6 +59,7 @@ type Event struct {
|
||||
|
||||
// A WSJT-X Decode (heard station) to render on the panadapter.
|
||||
DecodeCall string // transmitting (DE) callsign
|
||||
DecodeGrid string // 4-char grid, CQ decodes only
|
||||
DecodeFreqHz int64 // RF frequency (dial + audio offset)
|
||||
DecodeSNR int // reported SNR (dB)
|
||||
DecodeCQ bool // the decode was a CQ
|
||||
@@ -94,6 +95,47 @@ type Server struct {
|
||||
// id is distinct whenever there is more than one.
|
||||
dialHz map[string]int64
|
||||
lastDX string // WSJT: last non-empty DX Call seen, to detect a clear
|
||||
|
||||
// badPkts counts datagrams this listener could not parse, so the diagnostic
|
||||
// dump below stays bounded. A misconfigured port is not a one-off: the
|
||||
// sender that produced "bad magic 0x3132372e" put out ~150 packets a second,
|
||||
// which fills the whole rotating log with the same line and buries the
|
||||
// evidence of anything else.
|
||||
badPkts int
|
||||
}
|
||||
|
||||
// maxBadPktDumps is how many unparseable datagrams a listener describes in full
|
||||
// before going quiet. Enough to identify the sender and the payload; few enough
|
||||
// that a permanently misconfigured port costs a handful of lines, not a log.
|
||||
const maxBadPktDumps = 5
|
||||
|
||||
// describePacket renders a datagram for the log: its size, a printable preview
|
||||
// and the first bytes in hex.
|
||||
//
|
||||
// Both forms, deliberately. "bad magic 0x3132372e" is already readable as ASCII
|
||||
// "127." to someone who thinks to decode it — and that one fact (the sender is
|
||||
// emitting text, not WSJT-X binary) is the whole diagnosis. The hex stays for
|
||||
// the case where the payload really is binary and the preview shows nothing.
|
||||
func describePacket(pkt []byte) string {
|
||||
const maxShown = 96
|
||||
head := pkt
|
||||
if len(head) > maxShown {
|
||||
head = head[:maxShown]
|
||||
}
|
||||
var text, hex strings.Builder
|
||||
for _, b := range head {
|
||||
if b >= 0x20 && b < 0x7f {
|
||||
text.WriteByte(b)
|
||||
} else {
|
||||
text.WriteByte('.')
|
||||
}
|
||||
fmt.Fprintf(&hex, "%02x ", b)
|
||||
}
|
||||
more := ""
|
||||
if len(pkt) > maxShown {
|
||||
more = "…"
|
||||
}
|
||||
return fmt.Sprintf("%d bytes | text %q%s | hex %s%s", len(pkt), text.String(), more, strings.TrimSpace(hex.String()), more)
|
||||
}
|
||||
|
||||
func newServer(cfg Config, out chan<- Event) *Server {
|
||||
@@ -201,13 +243,38 @@ func (s *Server) run() {
|
||||
}
|
||||
}
|
||||
|
||||
// logBadPacket reports a datagram this listener could not parse, with enough of
|
||||
// it to identify the sender — then falls silent.
|
||||
//
|
||||
// The point is the SENDER: an unparseable packet on a WSJT port almost always
|
||||
// means another program is broadcasting on it, or the service type is wrong for
|
||||
// what is actually arriving. The remote address names the culprit, and the
|
||||
// payload preview says what it really is. Neither was logged before, so the
|
||||
// operator saw only a magic number repeated a few hundred times a second.
|
||||
func (s *Server) logBadPacket(kind string, remote *net.UDPAddr, pkt []byte, err error) {
|
||||
s.mu.Lock()
|
||||
s.badPkts++
|
||||
n := s.badPkts
|
||||
s.mu.Unlock()
|
||||
if n > maxBadPktDumps {
|
||||
return
|
||||
}
|
||||
applog.Printf("udp: [%s] %s parse error from %s: %v — %s\n",
|
||||
s.cfg.Name, kind, remote, err, describePacket(pkt))
|
||||
if n == maxBadPktDumps {
|
||||
applog.Printf("udp: [%s] further unparseable packets on port %d will not be logged — "+
|
||||
"check that the sender belongs on this port and that the service type matches\n",
|
||||
s.cfg.Name, s.cfg.Port)
|
||||
}
|
||||
}
|
||||
|
||||
func (s *Server) handle(pkt []byte, remote *net.UDPAddr) {
|
||||
ev := Event{ConfigID: s.cfg.ID, Service: s.cfg.ServiceType, Source: remote.String()}
|
||||
switch s.cfg.ServiceType {
|
||||
case ServiceWSJT:
|
||||
w, ok, err := ParseWSJT(pkt)
|
||||
if err != nil {
|
||||
applog.Printf("udp: [%s] WSJT parse error: %v\n", s.cfg.Name, err)
|
||||
s.logBadPacket("WSJT", remote, pkt, err)
|
||||
return
|
||||
}
|
||||
if !ok {
|
||||
@@ -234,6 +301,7 @@ func (s *Server) handle(pkt []byte, remote *net.UDPAddr) {
|
||||
return
|
||||
}
|
||||
ev.DecodeCall = w.DecodeCall
|
||||
ev.DecodeGrid = w.DecodeGrid
|
||||
ev.DecodeFreqHz = dial + w.DeltaFreqHz
|
||||
ev.DecodeSNR = w.SNR
|
||||
ev.DecodeCQ = w.IsCQ
|
||||
@@ -321,7 +389,7 @@ func (s *Server) handle(pkt []byte, remote *net.UDPAddr) {
|
||||
case ServiceN1MM:
|
||||
adifText, ok, err := ParseN1MM(pkt)
|
||||
if err != nil {
|
||||
applog.Printf("udp: [%s] N1MM parse error: %v\n", s.cfg.Name, err)
|
||||
s.logBadPacket("N1MM", remote, pkt, err)
|
||||
return
|
||||
}
|
||||
if !ok {
|
||||
|
||||
@@ -51,17 +51,67 @@ type WSJTEvent struct {
|
||||
// known dial frequency (from Status) to DeltaFreqHz to get the RF frequency.
|
||||
IsDecode bool
|
||||
DecodeCall string // the sender (DE) callsign extracted from the message text
|
||||
DecodeGrid string // 4-char grid, CQ decodes only — the exchange carries none
|
||||
DeltaFreqHz int64 // audio offset within the passband (Hz)
|
||||
SNR int // reported signal-to-noise (dB)
|
||||
IsCQ bool // the decode was a CQ call
|
||||
}
|
||||
|
||||
// maxFwdHeader bounds how far into a packet the WSJT-X magic may sit behind a
|
||||
// forwarder's header. The one seen in the field ("127.0.0.1:2237|") is 15 bytes;
|
||||
// 64 leaves room for a longer address without ever scanning a real payload.
|
||||
const maxFwdHeader = 64
|
||||
|
||||
// stripForwarderHeader removes the origin header a UDP relay prepends.
|
||||
//
|
||||
// A relay that re-broadcasts WSJT-X traffic has to say where each datagram came
|
||||
// from, and it does so as plain text in front of the payload:
|
||||
//
|
||||
// "127.0.0.1:2237|" + <the original, untouched WSJT-X packet>
|
||||
//
|
||||
// The magic then sits 15 bytes in, every packet fails on "bad magic", and an
|
||||
// operator running MSHV behind such a relay gets nothing at all. There is no
|
||||
// need for a separate service type: what follows the header IS a WSJT-X packet,
|
||||
// so the whole parser and everything downstream apply unchanged.
|
||||
//
|
||||
// Deliberately narrow. The magic must appear within maxFwdHeader bytes AND
|
||||
// everything before it must be printable ASCII — a truncated or corrupt packet
|
||||
// that happens to contain those four bytes somewhere is not resurrected into a
|
||||
// QSO. Anything else is returned untouched, and still fails as it did.
|
||||
func stripForwarderHeader(pkt []byte) []byte {
|
||||
if len(pkt) < 4 {
|
||||
return pkt
|
||||
}
|
||||
if binary.BigEndian.Uint32(pkt) == wsjtMagic {
|
||||
return pkt // no header — the overwhelmingly common case
|
||||
}
|
||||
limit := len(pkt) - 4
|
||||
if limit > maxFwdHeader {
|
||||
limit = maxFwdHeader
|
||||
}
|
||||
for i := 1; i <= limit; i++ {
|
||||
if binary.BigEndian.Uint32(pkt[i:]) != wsjtMagic {
|
||||
continue
|
||||
}
|
||||
for _, b := range pkt[:i] {
|
||||
if b < 0x20 || b >= 0x7f {
|
||||
return pkt // not a text header — leave it alone
|
||||
}
|
||||
}
|
||||
return pkt[i:]
|
||||
}
|
||||
return pkt
|
||||
}
|
||||
|
||||
// ParseWSJT decodes one UDP packet. Returns ok=false for messages we
|
||||
// don't care about (heartbeat, clears, etc.).
|
||||
func ParseWSJT(pkt []byte) (WSJTEvent, bool, error) {
|
||||
if len(pkt) < 12 {
|
||||
return WSJTEvent{}, false, fmt.Errorf("packet too short")
|
||||
}
|
||||
// A relay (W&P and friends) puts its own origin header in front — skip it so
|
||||
// the packet parses exactly as if it had arrived from WSJT-X directly.
|
||||
pkt = stripForwarderHeader(pkt)
|
||||
r := bytes.NewReader(pkt)
|
||||
var magic, schema, mtype uint32
|
||||
if err := binary.Read(r, binary.BigEndian, &magic); err != nil {
|
||||
@@ -190,13 +240,14 @@ func ParseWSJT(pkt []byte) (WSJTEvent, bool, error) {
|
||||
if err != nil {
|
||||
return WSJTEvent{}, false, err
|
||||
}
|
||||
call, isCQ := wsjtSender(msg)
|
||||
call, isCQ, grid := wsjtSender(msg)
|
||||
if call == "" {
|
||||
return WSJTEvent{}, false, nil // free-text / telemetry / unparseable → ignore
|
||||
}
|
||||
ev.IsDecode = true
|
||||
ev.DecodeCall = call
|
||||
ev.IsCQ = isCQ
|
||||
ev.DecodeGrid = grid
|
||||
ev.DeltaFreqHz = int64(df)
|
||||
ev.SNR = int(snr)
|
||||
ev.Mode = strings.ToUpper(strings.TrimSpace(mode))
|
||||
@@ -214,17 +265,20 @@ func ParseWSJT(pkt []byte) (WSJTEvent, bool, error) {
|
||||
return WSJTEvent{}, false, nil
|
||||
}
|
||||
|
||||
// wsjtSender extracts the transmitting (DE) callsign from a WSJT-X message and
|
||||
// whether it was a CQ. Grammar:
|
||||
// wsjtSender extracts the transmitting (DE) callsign from a WSJT-X message,
|
||||
// whether it was a CQ, and the grid when the message carries one. Grammar:
|
||||
//
|
||||
// CQ [modifier] <de_call> [grid] → de_call, isCQ=true
|
||||
// CQ [modifier] <de_call> [grid] → de_call, isCQ=true, grid
|
||||
// <to_call> <de_call> [report|…] → de_call, isCQ=false
|
||||
//
|
||||
// Only a CQ carries a grid: the standard exchange puts a signal report in that
|
||||
// third slot, never a locator.
|
||||
//
|
||||
// Returns "" for free-text / telemetry / hashed-call messages we can't resolve.
|
||||
func wsjtSender(message string) (call string, isCQ bool) {
|
||||
func wsjtSender(message string) (call string, isCQ bool, grid string) {
|
||||
f := strings.Fields(strings.ToUpper(strings.TrimSpace(message)))
|
||||
if len(f) == 0 {
|
||||
return "", false
|
||||
return "", false, ""
|
||||
}
|
||||
if f[0] == "CQ" {
|
||||
// Skip an optional modifier after CQ (DX / a region like NA / a zone like
|
||||
@@ -233,16 +287,41 @@ func wsjtSender(message string) (call string, isCQ bool) {
|
||||
if len(f) > 2 && !looksLikeCall(f[1]) {
|
||||
idx = 2
|
||||
}
|
||||
if idx < len(f) && looksLikeCall(f[idx]) {
|
||||
return f[idx], true
|
||||
if idx < len(f) {
|
||||
c := f[idx]
|
||||
// A GRID sitting in the callsign slot means the real call was
|
||||
// unparseable and the skip above went one word too far. JN36 has letters
|
||||
// and digits and passes every shape test there is, so without this the
|
||||
// station's grid gets logged, spotted and coloured as its callsign.
|
||||
if looksLikeCall(c) && !isGridField(c) {
|
||||
if idx+1 < len(f) && isGridField(f[idx+1]) {
|
||||
grid = f[idx+1]
|
||||
}
|
||||
return "", true
|
||||
return c, true, grid
|
||||
}
|
||||
}
|
||||
return "", true, ""
|
||||
}
|
||||
// Standard exchange: the DE (sender) call is the second token.
|
||||
if len(f) >= 2 && looksLikeCall(f[1]) {
|
||||
return f[1], false
|
||||
return f[1], false, ""
|
||||
}
|
||||
return "", false
|
||||
return "", false, ""
|
||||
}
|
||||
|
||||
// isGridField reports a 4-character Maidenhead field+square (JN36).
|
||||
//
|
||||
// RR73 is the reason this is not a bare pattern match: it is a sign-off, not a
|
||||
// locator, yet R falls inside A–R and 73 inside 00–99, so it satisfies the
|
||||
// Maidenhead shape exactly. WSJT-X never puts it in the slot after a CQ call,
|
||||
// but a station sending "CQ RR73" style free text would silently plant a
|
||||
// nonexistent grid in the log's grid index, and nothing downstream could tell.
|
||||
func isGridField(s string) bool {
|
||||
if len(s) != 4 || s == "RR73" {
|
||||
return false
|
||||
}
|
||||
return s[0] >= 'A' && s[0] <= 'R' && s[1] >= 'A' && s[1] <= 'R' &&
|
||||
s[2] >= '0' && s[2] <= '9' && s[3] >= '0' && s[3] <= '9'
|
||||
}
|
||||
|
||||
// looksLikeCall is a loose callsign test: 3–12 chars of A–Z/0–9//, with at least
|
||||
|
||||
@@ -7,26 +7,37 @@ func TestWSJTSender(t *testing.T) {
|
||||
msg string
|
||||
wantCall string
|
||||
wantCQ bool
|
||||
wantGrid string
|
||||
}{
|
||||
{"CQ K1ABC FN42", "K1ABC", true},
|
||||
{"CQ DX W2XYZ EM12", "W2XYZ", true}, // modifier "DX" skipped
|
||||
{"CQ NA VE3ABC FN03", "VE3ABC", true}, // region modifier skipped
|
||||
{"CQ 020 JA1XYZ PM95", "JA1XYZ", true},// zone modifier skipped
|
||||
{"W2XYZ K1ABC -10", "K1ABC", false}, // exchange → sender is 2nd call
|
||||
{"W2XYZ K1ABC R-10", "K1ABC", false},
|
||||
{"W2XYZ K1ABC RR73", "K1ABC", false},
|
||||
{"F4BPO K1ABC/P 73", "K1ABC/P", false},// portable call kept
|
||||
{"CQ F/DL1ABC JO31", "F/DL1ABC", true},// compound prefix
|
||||
{"CQ K1ABC FN42", "K1ABC", true, "FN42"},
|
||||
{"CQ DX W2XYZ EM12", "W2XYZ", true, "EM12"}, // modifier "DX" skipped
|
||||
{"CQ NA VE3ABC FN03", "VE3ABC", true, "FN03"}, // region modifier skipped
|
||||
{"CQ 020 JA1XYZ PM95", "JA1XYZ", true, "PM95"}, // zone modifier skipped
|
||||
{"W2XYZ K1ABC -10", "K1ABC", false, ""}, // exchange → sender is 2nd call
|
||||
{"W2XYZ K1ABC R-10", "K1ABC", false, ""},
|
||||
{"W2XYZ K1ABC RR73", "K1ABC", false, ""},
|
||||
{"F4BPO K1ABC/P 73", "K1ABC/P", false, ""}, // portable call kept
|
||||
{"CQ F/DL1ABC JO31", "F/DL1ABC", true, "JO31"}, // compound prefix, grid still valid
|
||||
{"CQ K1ABC", "K1ABC", true, ""}, // CQ without a grid
|
||||
{"CQ K1ABC RR73", "K1ABC", true, ""}, // RR73 is a sign-off, NOT grid RR73
|
||||
{"CQ K1ABC FN4", "K1ABC", true, ""}, // 3 chars is not a field+square
|
||||
{"CQ K1ABC FN42AB", "K1ABC", true, ""}, // 6-char: WSJT-X never sends it here
|
||||
{"CQ K1ABC 73", "K1ABC", true, ""}, // bare sign-off
|
||||
{"CQ K1ABC SS42", "K1ABC", true, ""}, // S is past R — no such field
|
||||
// An unknown word after CQ made the parser skip a slot; a grid passes every
|
||||
// shape test a callsign does, so it came back AS the callsign.
|
||||
{"CQ FOO JN36", "", true, ""},
|
||||
// Non-callsign / free text → no sender.
|
||||
{"TNX 73 GL", "", false},
|
||||
{"K1ABC RR73", "", false}, // only one call + a token → 2nd token not a call
|
||||
{"", "", false},
|
||||
{"CQ CQ CQ", "", true}, // CQ but no resolvable call
|
||||
{"TNX 73 GL", "", false, ""},
|
||||
{"K1ABC RR73", "", false, ""}, // only one call + a token → 2nd token not a call
|
||||
{"", "", false, ""},
|
||||
{"CQ CQ CQ", "", true, ""}, // CQ but no resolvable call
|
||||
}
|
||||
for _, c := range cases {
|
||||
call, cq := wsjtSender(c.msg)
|
||||
if call != c.wantCall || cq != c.wantCQ {
|
||||
t.Errorf("wsjtSender(%q) = (%q,%v), want (%q,%v)", c.msg, call, cq, c.wantCall, c.wantCQ)
|
||||
call, cq, grid := wsjtSender(c.msg)
|
||||
if call != c.wantCall || cq != c.wantCQ || grid != c.wantGrid {
|
||||
t.Errorf("wsjtSender(%q) = (%q,%v,%q), want (%q,%v,%q)",
|
||||
c.msg, call, cq, grid, c.wantCall, c.wantCQ, c.wantGrid)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -125,14 +125,19 @@ func (c *Client) SetFanMode(mode string) error {
|
||||
default:
|
||||
return fmt.Errorf("powergenius: invalid fan mode %q", mode)
|
||||
}
|
||||
// Set with the bare "key=value" verb the amp uses for its own status fields
|
||||
// (same convention as "operate=1"). The earlier "setup fanmode=…" carried a
|
||||
// bogus prefix the amp silently ignored, so the fan never changed and the next
|
||||
// status kept reporting the old mode — the revert-to-Contest the operator saw.
|
||||
reply, err := c.command("fanmode=" + m)
|
||||
// The verb the amp wants is "setup fanmode=VALUE" — confirmed LIVE: with the
|
||||
// "setup " prefix the amp replies code 0 (accepted), while the bare
|
||||
// "fanmode=VALUE" we switched to earlier is rejected (reply code 0x50000015).
|
||||
// That regression is what stopped the fan from changing; restoring "setup "
|
||||
// fixes it.
|
||||
reply, err := c.command("setup fanmode=" + m)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if code := replyCode(reply); code != "" && code != "0" {
|
||||
applog.Printf("pgxl: set fanmode=%s REJECTED, reply=%q", m, reply)
|
||||
return fmt.Errorf("powergenius: amp rejected fanmode=%s (code %s)", m, code)
|
||||
}
|
||||
applog.Printf("pgxl: set fanmode=%s reply=%q", m, reply)
|
||||
c.statusMu.Lock()
|
||||
c.status.FanMode = m // optimistic
|
||||
@@ -141,6 +146,19 @@ func (c *Client) SetFanMode(mode string) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
// replyCode returns the result code from an "R<id>|<code>|…" reply — "0" means
|
||||
// the amp accepted the command. Returns "" when the line isn't an R reply.
|
||||
func replyCode(reply string) string {
|
||||
if !strings.HasPrefix(reply, "R") {
|
||||
return ""
|
||||
}
|
||||
p := strings.SplitN(reply, "|", 3)
|
||||
if len(p) < 2 {
|
||||
return ""
|
||||
}
|
||||
return strings.TrimSpace(p[1])
|
||||
}
|
||||
|
||||
// SetOperate puts the amp in OPERATE (1) or STANDBY (0).
|
||||
func (c *Client) SetOperate(on bool) error {
|
||||
v := "0"
|
||||
@@ -222,12 +240,10 @@ func (c *Client) authLocked() error {
|
||||
if _, err := fmt.Fprintf(c.conn, "C%d|auth code=%s\n", id, c.password); err != nil {
|
||||
return err
|
||||
}
|
||||
_ = c.conn.SetReadDeadline(time.Now().Add(ioTimeout))
|
||||
line, err := c.reader.ReadString('\n')
|
||||
line, err := c.readReplyLocked(fmt.Sprintf("R%d|", id))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
line = strings.TrimSpace(line)
|
||||
applog.Printf("pgxl: auth reply=%q (try %d)", line, try)
|
||||
hex, msg := "", ""
|
||||
if p := strings.SplitN(line, "|", 3); len(p) >= 2 {
|
||||
@@ -246,6 +262,39 @@ func (c *Client) authLocked() error {
|
||||
return fmt.Errorf("powergenius: authentication failed after 4 tries (R|%s|) — check the remote code", lastHex)
|
||||
}
|
||||
|
||||
// readReplyLocked reads until the reply carrying `want` as its prefix arrives,
|
||||
// feeding every unsolicited frame it passes to parse() on the way.
|
||||
//
|
||||
// The amplifier PUSHES status frames ("S0|state=…") on the same socket, and it
|
||||
// pushes them constantly once it is in OPERATE — power, SWR and temperature all
|
||||
// move while transmitting. The old code read exactly one line per command and
|
||||
// took whatever came first as its answer, so a single pushed frame put the
|
||||
// stream permanently one reply behind: every later command read the PREVIOUS
|
||||
// command's answer, and the last one waited out the 3 s deadline, failed, and
|
||||
// dropped the connection. That is the reconnect-every-few-seconds seen in the
|
||||
// field, and the stall in transmit — command() holds the mutex across that whole
|
||||
// dead wait, so anything else touching the amplifier queued behind it.
|
||||
//
|
||||
// It only showed up remotely and in OPERATE: on a LAN with an idle amplifier
|
||||
// there is almost nothing to push and the race hardly ever opens.
|
||||
func (c *Client) readReplyLocked(want string) (string, error) {
|
||||
deadline := time.Now().Add(ioTimeout)
|
||||
for {
|
||||
_ = c.conn.SetReadDeadline(deadline)
|
||||
line, err := c.reader.ReadString('\n')
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
line = strings.TrimSpace(line)
|
||||
// Every frame is worth having, ours or not — a pushed status is fresher
|
||||
// than the one we were about to ask for.
|
||||
c.parse(line)
|
||||
if strings.HasPrefix(line, want) {
|
||||
return line, nil
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (c *Client) dropConn() {
|
||||
c.mu.Lock()
|
||||
if c.conn != nil {
|
||||
@@ -268,14 +317,7 @@ func (c *Client) command(cmd string) (string, error) {
|
||||
if _, err := fmt.Fprintf(c.conn, "C%d|%s\n", id, cmd); err != nil {
|
||||
return "", err
|
||||
}
|
||||
_ = c.conn.SetReadDeadline(time.Now().Add(ioTimeout))
|
||||
line, err := c.reader.ReadString('\n')
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
line = strings.TrimSpace(line)
|
||||
c.parse(line)
|
||||
return line, nil
|
||||
return c.readReplyLocked(fmt.Sprintf("R%d|", id))
|
||||
}
|
||||
|
||||
// parse handles "R<id>|0|<k=v …>" and "S0|<k=v …>" status lines.
|
||||
|
||||
@@ -52,6 +52,7 @@ type Profile struct {
|
||||
MyCity string `json:"my_city"`
|
||||
MyPostalCode string `json:"my_postal_code"`
|
||||
MySOTARef string `json:"my_sota_ref"`
|
||||
MyIOTA string `json:"my_iota"`
|
||||
MyPOTARef string `json:"my_pota_ref"`
|
||||
MyRig string `json:"my_rig"`
|
||||
MyAntenna string `json:"my_antenna"`
|
||||
@@ -75,7 +76,7 @@ type Repo struct{ db *sql.DB }
|
||||
func NewRepo(db *sql.DB) *Repo { return &Repo{db: db} }
|
||||
|
||||
const selectCols = `id, name, callsign, operator, op_name, owner_callsign, my_grid, my_country, my_state, my_cnty,
|
||||
my_street, my_city, my_postal_code, my_sota_ref, my_pota_ref,
|
||||
my_street, my_city, my_postal_code, my_sota_ref, my_pota_ref, my_iota,
|
||||
my_rig, my_antenna, my_dxcc, my_cqz, my_ituz, my_lat, my_lon, tx_pwr,
|
||||
is_active, sort_order, db_config, created_at, updated_at`
|
||||
|
||||
@@ -124,12 +125,12 @@ func (r *Repo) Save(ctx context.Context, p *Profile) error {
|
||||
res, err := r.db.ExecContext(ctx, `
|
||||
INSERT INTO station_profiles
|
||||
(name, callsign, operator, op_name, owner_callsign, my_grid, my_country, my_state, my_cnty,
|
||||
my_street, my_city, my_postal_code, my_sota_ref, my_pota_ref,
|
||||
my_street, my_city, my_postal_code, my_sota_ref, my_pota_ref, my_iota,
|
||||
my_rig, my_antenna, my_dxcc, my_cqz, my_ituz, my_lat, my_lon, tx_pwr,
|
||||
is_active, sort_order, created_at, updated_at)
|
||||
VALUES(?,?,?,?,?,?,?,?,?, ?,?,?,?,?, ?,?,?,?,?,?,?,?, ?,?,?,?)`,
|
||||
VALUES(?,?,?,?,?,?,?,?,?, ?,?,?,?,?,?, ?,?,?,?,?,?,?,?, ?,?,?,?)`,
|
||||
p.Name, p.Callsign, p.Operator, p.OpName, p.OwnerCallsign, p.MyGrid, p.MyCountry, p.MyState, p.MyCounty,
|
||||
p.MyStreet, p.MyCity, p.MyPostalCode, p.MySOTARef, p.MyPOTARef,
|
||||
p.MyStreet, p.MyCity, p.MyPostalCode, p.MySOTARef, p.MyPOTARef, p.MyIOTA,
|
||||
p.MyRig, p.MyAntenna, nullableInt(p.MyDXCC), nullableInt(p.MyCQZone), nullableInt(p.MyITUZone),
|
||||
nullableFloat(p.MyLat), nullableFloat(p.MyLon), nullableFloat(p.TxPower),
|
||||
boolInt(p.IsActive), p.SortOrder, now, now)
|
||||
@@ -144,13 +145,13 @@ func (r *Repo) Save(ctx context.Context, p *Profile) error {
|
||||
UPDATE station_profiles SET
|
||||
name = ?, callsign = ?, operator = ?, op_name = ?, owner_callsign = ?, my_grid = ?, my_country = ?,
|
||||
my_state = ?, my_cnty = ?, my_street = ?, my_city = ?, my_postal_code = ?,
|
||||
my_sota_ref = ?, my_pota_ref = ?, my_rig = ?, my_antenna = ?,
|
||||
my_sota_ref = ?, my_pota_ref = ?, my_iota = ?, my_rig = ?, my_antenna = ?,
|
||||
my_dxcc = ?, my_cqz = ?, my_ituz = ?, my_lat = ?, my_lon = ?, tx_pwr = ?,
|
||||
sort_order = ?, updated_at = ?
|
||||
WHERE id = ?`,
|
||||
p.Name, p.Callsign, p.Operator, p.OpName, p.OwnerCallsign, p.MyGrid, p.MyCountry,
|
||||
p.MyState, p.MyCounty, p.MyStreet, p.MyCity, p.MyPostalCode,
|
||||
p.MySOTARef, p.MyPOTARef, p.MyRig, p.MyAntenna,
|
||||
p.MySOTARef, p.MyPOTARef, p.MyIOTA, p.MyRig, p.MyAntenna,
|
||||
nullableInt(p.MyDXCC), nullableInt(p.MyCQZone), nullableInt(p.MyITUZone),
|
||||
nullableFloat(p.MyLat), nullableFloat(p.MyLon), nullableFloat(p.TxPower),
|
||||
p.SortOrder, now, p.ID)
|
||||
@@ -264,7 +265,7 @@ func scan(row scannable) (Profile, error) {
|
||||
var p Profile
|
||||
var (
|
||||
callsign, operator, opName, ownerCall, myGrid, myCountry, myState, myCnty,
|
||||
myStreet, myCity, myPostal, mySOTA, myPOTA,
|
||||
myStreet, myCity, myPostal, mySOTA, myPOTA, myIOTA,
|
||||
myRig, myAntenna sql.NullString
|
||||
myDXCC, myCQZ, myITUZ sql.NullInt64
|
||||
myLat, myLon, txPwr sql.NullFloat64
|
||||
@@ -273,7 +274,7 @@ func scan(row scannable) (Profile, error) {
|
||||
createdAt, updatedAt string
|
||||
)
|
||||
err := row.Scan(&p.ID, &p.Name, &callsign, &operator, &opName, &ownerCall, &myGrid, &myCountry, &myState, &myCnty,
|
||||
&myStreet, &myCity, &myPostal, &mySOTA, &myPOTA,
|
||||
&myStreet, &myCity, &myPostal, &mySOTA, &myPOTA, &myIOTA,
|
||||
&myRig, &myAntenna, &myDXCC, &myCQZ, &myITUZ, &myLat, &myLon, &txPwr,
|
||||
&isActive, &sortOrder, &dbConfig, &createdAt, &updatedAt)
|
||||
if err != nil {
|
||||
@@ -294,6 +295,7 @@ func scan(row scannable) (Profile, error) {
|
||||
p.MyCity = myCity.String
|
||||
p.MyPostalCode = myPostal.String
|
||||
p.MySOTARef = mySOTA.String
|
||||
p.MyIOTA = myIOTA.String
|
||||
p.MyPOTARef = myPOTA.String
|
||||
p.MyRig = myRig.String
|
||||
p.MyAntenna = myAntenna.String
|
||||
|
||||
@@ -0,0 +1,264 @@
|
||||
// Package pskr subscribes to PSK Reporter's MQTT feed and turns it into the
|
||||
// spots the band-opening detector already eats.
|
||||
//
|
||||
// Why this exists at all: the detector was fed from the DX cluster and the RBN,
|
||||
// and on VHF that is a few hundred skimmers, nearly all of them on HF. A 6 m
|
||||
// opening carrying 869 stations reached OpsLog as a handful of spots, or none.
|
||||
// PSK Reporter is every ordinary station running WSJT-X and reporting what it
|
||||
// decodes — the difference is two orders of magnitude, not a threshold.
|
||||
//
|
||||
// The feed's shape happens to suit us exactly:
|
||||
//
|
||||
// topic pskr/filter/v2/<band>/<mode>/<tx call>/<rx call>/...
|
||||
// payload {"f":50313000,"md":"FT8","rp":-12,"sc":"F4BPO","sl":"JN36",
|
||||
// "rc":"OH5CX","rl":"KP30","b":"6m"}
|
||||
//
|
||||
// BOTH grids are in the message, so distance and bearing are arithmetic. No
|
||||
// lookup, no DXCC-centre approximation, no extra network call — which is what
|
||||
// made the cluster path's bearings coarse.
|
||||
//
|
||||
// Volume is the real design constraint. Six metres open is thousands of
|
||||
// messages a minute, and OpsLog runs on some very old PCs. So: no history is
|
||||
// kept here, nothing is persisted, each message is parsed and handed on or
|
||||
// dropped, and the callback does the deciding.
|
||||
package pskr
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
mqtt "github.com/eclipse/paho.mqtt.golang"
|
||||
)
|
||||
|
||||
// DefaultBroker is PSK Reporter's public MQTT endpoint, TLS.
|
||||
const DefaultBroker = "tls://mqtt.pskreporter.info:1884"
|
||||
|
||||
// DefaultNearKm is the radius that counts as "around here" for a receiver.
|
||||
const DefaultNearKm = 300
|
||||
|
||||
// Bands offered. Anything below 10 m is deliberately absent, 12 m included: an
|
||||
// "opening" on 20 m is the normal state of the band and announcing it says
|
||||
// nothing, and 12 m is close enough to that at this point in the cycle to be the
|
||||
// same problem. These are the bands where an opening is an event.
|
||||
//
|
||||
// Fewer subscriptions is also less traffic, which matters here: the operator's
|
||||
// PC pays for every message the broker sends, whether or not anything comes of it.
|
||||
var Bands = []string{"10m", "6m", "4m", "2m"}
|
||||
|
||||
// Spot is one decode, already reduced to what a detector needs.
|
||||
type Spot struct {
|
||||
Call string // the transmitting station
|
||||
Band string
|
||||
Mode string
|
||||
Grid string // transmitter's grid, 4 characters
|
||||
DistKm int // from the operator
|
||||
Bearing int // degrees from the operator, short path
|
||||
At time.Time
|
||||
}
|
||||
|
||||
// Config is what the watcher needs to run.
|
||||
type Config struct {
|
||||
Broker string
|
||||
Bands []string
|
||||
// OpLat/OpLon are the operator's position: every spot is measured from it,
|
||||
// so with no position there is nothing to measure and the watcher stays down.
|
||||
OpLat, OpLon float64
|
||||
// NearKm is how close a RECEIVER must be to count as "around here". A report
|
||||
// collected further away proves a path that is not the operator's.
|
||||
//
|
||||
// 300 km by default: far enough to borrow the ears of a whole region, which
|
||||
// is the point — an opening reaches an area, not a postcode, and waiting for
|
||||
// a decode at one's own station is just working the band. Close enough that
|
||||
// the ionosphere doing something there is the ionosphere doing it here.
|
||||
NearKm int
|
||||
// Geo turns two grids into distance and bearing. Injected rather than
|
||||
// implemented here so it stays the SAME arithmetic the cluster path uses —
|
||||
// two answers for one question is how a bearing quietly becomes wrong.
|
||||
Geo func(grid string) (distKm int, bearing int, ok bool)
|
||||
// OnSpot receives every accepted decode. Called from the MQTT goroutine, so
|
||||
// it must not block: the broker's buffer is what pays for it if it does.
|
||||
OnSpot func(Spot)
|
||||
Logf func(string, ...any)
|
||||
}
|
||||
|
||||
// Watcher owns the MQTT connection and its subscriptions.
|
||||
type Watcher struct {
|
||||
mu sync.Mutex
|
||||
cfg Config
|
||||
client mqtt.Client
|
||||
running bool
|
||||
|
||||
// received counts accepted spots since start, for the status panel: a
|
||||
// connection that is up but silent looks identical to one that is working
|
||||
// until you can see a number moving.
|
||||
received uint64
|
||||
lastAt time.Time
|
||||
lastErr string
|
||||
}
|
||||
|
||||
func New(cfg Config) *Watcher {
|
||||
if cfg.Broker == "" {
|
||||
cfg.Broker = DefaultBroker
|
||||
}
|
||||
if len(cfg.Bands) == 0 {
|
||||
cfg.Bands = Bands
|
||||
}
|
||||
if cfg.NearKm <= 0 {
|
||||
cfg.NearKm = DefaultNearKm
|
||||
}
|
||||
if cfg.Logf == nil {
|
||||
cfg.Logf = func(string, ...any) {}
|
||||
}
|
||||
return &Watcher{cfg: cfg}
|
||||
}
|
||||
|
||||
// Start connects and subscribes. Safe to call when already running.
|
||||
func (w *Watcher) Start() error {
|
||||
w.mu.Lock()
|
||||
defer w.mu.Unlock()
|
||||
if w.running {
|
||||
return nil
|
||||
}
|
||||
if w.cfg.Geo == nil || w.cfg.OnSpot == nil {
|
||||
return fmt.Errorf("pskr: Geo and OnSpot are required")
|
||||
}
|
||||
|
||||
opts := mqtt.NewClientOptions().
|
||||
AddBroker(w.cfg.Broker).
|
||||
// A stable client id would collide with another OpsLog on the same
|
||||
// account; the broker is anonymous, so uniqueness is ours to provide.
|
||||
SetClientID(fmt.Sprintf("opslog-%d", time.Now().UnixNano())).
|
||||
SetCleanSession(true).
|
||||
SetAutoReconnect(true).
|
||||
SetConnectRetry(true).
|
||||
SetConnectRetryInterval(30 * time.Second).
|
||||
SetConnectTimeout(15 * time.Second).
|
||||
// No message is worth keeping if we cannot handle it now: an opening is
|
||||
// a thing happening at this moment, and a queue of stale decodes would
|
||||
// announce one that finished twenty minutes ago.
|
||||
SetOrderMatters(false)
|
||||
|
||||
opts.OnConnect = func(c mqtt.Client) {
|
||||
w.cfg.Logf("pskr: connected to %s", w.cfg.Broker)
|
||||
for _, b := range w.cfg.Bands {
|
||||
// Every mode, every pair of stations, on this band. That firehose IS
|
||||
// the point: the detector's job is to find the shape in it.
|
||||
topic := "pskr/filter/v2/" + b + "/#"
|
||||
if tok := c.Subscribe(topic, 0, w.handle); tok.Wait() && tok.Error() != nil {
|
||||
w.cfg.Logf("pskr: subscribe %s failed: %v", topic, tok.Error())
|
||||
continue
|
||||
}
|
||||
w.cfg.Logf("pskr: watching %s", topic)
|
||||
}
|
||||
}
|
||||
opts.OnConnectionLost = func(_ mqtt.Client, err error) {
|
||||
w.mu.Lock()
|
||||
w.lastErr = err.Error()
|
||||
w.mu.Unlock()
|
||||
w.cfg.Logf("pskr: connection lost: %v (will retry)", err)
|
||||
}
|
||||
|
||||
c := mqtt.NewClient(opts)
|
||||
// Deliberately NOT waiting on the connect token: the broker may be slow or
|
||||
// unreachable and startup must not hang on a feature that is decoration.
|
||||
// ConnectRetry brings it up in the background when it can.
|
||||
c.Connect()
|
||||
w.client = c
|
||||
w.running = true
|
||||
return nil
|
||||
}
|
||||
|
||||
// Stop disconnects. Safe to call when already stopped.
|
||||
func (w *Watcher) Stop() {
|
||||
w.mu.Lock()
|
||||
c, running := w.client, w.running
|
||||
w.client, w.running = nil, false
|
||||
w.mu.Unlock()
|
||||
if running && c != nil {
|
||||
c.Disconnect(250)
|
||||
}
|
||||
}
|
||||
|
||||
// wire is the payload as PSK Reporter sends it — short keys, no nesting.
|
||||
type wire struct {
|
||||
Freq int64 `json:"f"`
|
||||
Mode string `json:"md"`
|
||||
SNR int `json:"rp"`
|
||||
TxCall string `json:"sc"`
|
||||
TxGrid string `json:"sl"`
|
||||
RxCall string `json:"rc"`
|
||||
RxGrid string `json:"rl"`
|
||||
Band string `json:"b"`
|
||||
}
|
||||
|
||||
func (w *Watcher) handle(_ mqtt.Client, m mqtt.Message) {
|
||||
var p wire
|
||||
if err := json.Unmarshal(m.Payload(), &p); err != nil {
|
||||
return // malformed payloads are not worth a log line at this rate
|
||||
}
|
||||
call := strings.ToUpper(strings.TrimSpace(p.TxCall))
|
||||
grid := strings.ToUpper(strings.TrimSpace(p.TxGrid))
|
||||
rxGrid := strings.ToUpper(strings.TrimSpace(p.RxGrid))
|
||||
if call == "" || len(grid) < 4 || len(rxGrid) < 4 {
|
||||
return
|
||||
}
|
||||
|
||||
// THE RECEIVER HAS TO BE NEAR THE OPERATOR. This is the whole difference
|
||||
// between a useful feed and a world map.
|
||||
//
|
||||
// A PSK Reporter message says "X was heard BY Y". Without this check, a
|
||||
// station 1400 km from here heard by somebody in Japan counted as evidence
|
||||
// of an opening — it proves the path from X to JAPAN, and says nothing at all
|
||||
// about whether anything reaches this station. That is how a "2 m opening"
|
||||
// came to be announced from a KX9X in the United States.
|
||||
//
|
||||
// Only reports collected by a receiver in the operator's own region show that
|
||||
// signals are actually arriving HERE, which is the only question worth asking.
|
||||
if rxDist, _, ok := w.cfg.Geo(rxGrid[:4]); !ok || rxDist > w.cfg.NearKm {
|
||||
return
|
||||
}
|
||||
|
||||
// The TRANSMITTER is the station on the air, so it is the transmitter's grid
|
||||
// that gives the direction and length of the path that just proved itself.
|
||||
dist, brg, ok := w.cfg.Geo(grid[:4])
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
s := Spot{
|
||||
Call: call, Band: strings.ToLower(strings.TrimSpace(p.Band)),
|
||||
Mode: strings.ToUpper(strings.TrimSpace(p.Mode)), Grid: grid[:4],
|
||||
DistKm: dist, Bearing: brg,
|
||||
// Stamped on receipt: the broker's own timestamps vary between payload
|
||||
// versions, and the window this feeds is measured in minutes.
|
||||
At: time.Now(),
|
||||
}
|
||||
w.mu.Lock()
|
||||
w.received++
|
||||
w.lastAt = s.At
|
||||
w.mu.Unlock()
|
||||
w.cfg.OnSpot(s)
|
||||
}
|
||||
|
||||
// Status is the snapshot the settings panel shows.
|
||||
type Status struct {
|
||||
Running bool `json:"running"`
|
||||
Received uint64 `json:"received"`
|
||||
LastAt time.Time `json:"last_at"`
|
||||
LastErr string `json:"last_err,omitempty"`
|
||||
Broker string `json:"broker"`
|
||||
Bands []string `json:"bands"`
|
||||
}
|
||||
|
||||
func (w *Watcher) Status() Status {
|
||||
w.mu.Lock()
|
||||
defer w.mu.Unlock()
|
||||
st := Status{
|
||||
Running: w.running, Received: w.received, LastAt: w.lastAt,
|
||||
LastErr: w.lastErr, Broker: w.cfg.Broker,
|
||||
}
|
||||
st.Bands = append(st.Bands, w.cfg.Bands...)
|
||||
return st
|
||||
}
|
||||
@@ -734,7 +734,10 @@ func placeQSOBox(profile ProfileInfo, zone pxRect, occupied []pxRect) QSOBox {
|
||||
BG: "#ffffff", BGOpacity: 0.88, Radius: 12,
|
||||
Title: "Confirming QSO with {qso.callsign}",
|
||||
Fields: []string{"qso_date", "time_on", "band", "mode", "rst_sent"},
|
||||
Footer: "{qso.qsl_msg}",
|
||||
// PSE/TNX stamp (auto: TNX if a QSL was received, else PSE QSL) leads the
|
||||
// message. {qso.pse_tnx} is a normal token — it can be moved to its own
|
||||
// element anywhere on the card in the designer.
|
||||
Footer: "{qso.pse_tnx} {qso.qsl_msg}",
|
||||
}
|
||||
box.Y = cardH - box.H - 110
|
||||
if zone.y+zone.h/2 > cardH/2 {
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
package qso
|
||||
|
||||
import "testing"
|
||||
|
||||
// The predicate behind "Worked before". Exact when folding is off; with it on,
|
||||
// a station's portable forms are one operator — and the fold has to work from
|
||||
// either end, because you may type the base call or the portable one.
|
||||
func TestCallMatch(t *testing.T) {
|
||||
if pred, args := callMatch("RK3DWA", false); pred != "callsign = ?" || len(args) != 1 || args[0] != "RK3DWA" {
|
||||
t.Errorf("exact: got %q %v", pred, args)
|
||||
}
|
||||
|
||||
// Typing the base call: match it and everything suffixed off it.
|
||||
pred, args := callMatch("RK3DWA", true)
|
||||
if pred != "(callsign = ? OR callsign LIKE ?)" {
|
||||
t.Errorf("variants predicate = %q", pred)
|
||||
}
|
||||
if len(args) != 2 || args[0] != "RK3DWA" || args[1] != "RK3DWA/%" {
|
||||
t.Errorf("variants args = %v, want [RK3DWA RK3DWA/%%]", args)
|
||||
}
|
||||
|
||||
// Typing a portable form must reach the plain call too — the suffix is
|
||||
// stripped from the INPUT, not just matched in the column.
|
||||
_, args = callMatch("RK3DWA/3", true)
|
||||
if len(args) != 2 || args[0] != "RK3DWA" || args[1] != "RK3DWA/%" {
|
||||
t.Errorf("portable input args = %v, want [RK3DWA RK3DWA/%%]", args)
|
||||
}
|
||||
|
||||
// A leading slash is not a suffix marker — dropping to "" there would match
|
||||
// the entire logbook.
|
||||
if _, args := callMatch("/RK3DWA", true); args[0] != "/RK3DWA" {
|
||||
t.Errorf("leading slash: args[0] = %v, want the call unchanged", args[0])
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,57 @@
|
||||
package qso
|
||||
|
||||
import (
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
// "2 m or 70 cm, in FT8, since January" could not be asked before: the filter
|
||||
// joins every condition with ONE AND or OR, so AND killed the two bands and OR
|
||||
// let every FT8 QSO through. The OR now lives inside a single condition.
|
||||
func TestInConditionExpressesSeveralValuesForOneField(t *testing.T) {
|
||||
sql, args, err := conditionSQL(Condition{Field: "band", Op: "in", Value: "2m, 70cm"})
|
||||
if err != nil {
|
||||
t.Fatalf("in: %v", err)
|
||||
}
|
||||
if !strings.Contains(sql, "IN (?,?)") {
|
||||
t.Errorf("sql = %q, want an IN with two placeholders", sql)
|
||||
}
|
||||
if len(args) != 2 || args[0] != "2m" || args[1] != "70cm" {
|
||||
t.Errorf("args = %v, want [2m 70cm] trimmed", args)
|
||||
}
|
||||
}
|
||||
|
||||
// A trailing comma while typing must not add an empty value that matches nothing.
|
||||
func TestInIgnoresBlanks(t *testing.T) {
|
||||
_, args, err := conditionSQL(Condition{Field: "mode", Op: "in", Value: "FT8, ,FT4,"})
|
||||
if err != nil {
|
||||
t.Fatalf("in: %v", err)
|
||||
}
|
||||
if len(args) != 2 {
|
||||
t.Errorf("args = %v, want the two real values only", args)
|
||||
}
|
||||
}
|
||||
|
||||
// An empty list matches nothing. Dropping the condition instead would WIDEN the
|
||||
// result set — the opposite of what someone typing a filter expects.
|
||||
func TestEmptyInMatchesNothing(t *testing.T) {
|
||||
sql, _, err := conditionSQL(Condition{Field: "band", Op: "in", Value: " , "})
|
||||
if err != nil {
|
||||
t.Fatalf("in: %v", err)
|
||||
}
|
||||
if sql != "1=0" {
|
||||
t.Errorf("sql = %q, want 1=0", sql)
|
||||
}
|
||||
}
|
||||
|
||||
// NOT IN must keep rows whose column is NULL: the row is not one of the listed
|
||||
// values, so it belongs in the answer. Raw SQL NOT IN drops them.
|
||||
func TestNotInKeepsNulls(t *testing.T) {
|
||||
sql, _, err := conditionSQL(Condition{Field: "band", Op: "notin", Value: "2m"})
|
||||
if err != nil {
|
||||
t.Fatalf("notin: %v", err)
|
||||
}
|
||||
if !strings.HasPrefix(sql, "IFNULL(") {
|
||||
t.Errorf("sql = %q, want the column wrapped in IFNULL", sql)
|
||||
}
|
||||
}
|
||||
+196
-7
@@ -1289,6 +1289,23 @@ func columnExpr(field string) (string, bool) {
|
||||
}
|
||||
|
||||
// conditionSQL turns one condition into a parameterised predicate.
|
||||
// splitList parses the comma-separated value of an "in" / "not in" condition.
|
||||
//
|
||||
// Blanks are dropped, so a trailing comma or a stray space while typing does not
|
||||
// silently add an empty value that matches nothing. Case is left alone: the
|
||||
// columns this is used on (band, mode, country) are stored in the case the log
|
||||
// was written in, and forcing it here would break the ones that are not.
|
||||
func splitList(v string) []string {
|
||||
parts := strings.Split(v, ",")
|
||||
out := make([]string, 0, len(parts))
|
||||
for _, p := range parts {
|
||||
if p = strings.TrimSpace(p); p != "" {
|
||||
out = append(out, p)
|
||||
}
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
func conditionSQL(c Condition) (string, []any, error) {
|
||||
col, ok := columnExpr(c.Field)
|
||||
if !ok {
|
||||
@@ -1322,6 +1339,36 @@ func conditionSQL(c Condition) (string, []any, error) {
|
||||
return col + " LIKE ?", []any{v + "%"}, nil
|
||||
case "endswith":
|
||||
return col + " LIKE ?", []any{"%" + v}, nil
|
||||
case "in", "notin":
|
||||
// Several values for ONE field, comma-separated.
|
||||
//
|
||||
// This is what makes a real question expressible. The filter joins every
|
||||
// condition with a single AND or OR, so "2 m or 70 cm, in FT8, since
|
||||
// January" could not be asked: AND killed the two bands, OR let every FT8
|
||||
// QSO through. Rather than grow the model nested groups — a tree in the UI
|
||||
// to answer a question that is nearly always "this field, any of these
|
||||
// values" — the OR lives INSIDE one condition and everything else keeps
|
||||
// ANDing.
|
||||
vals := splitList(v)
|
||||
if len(vals) == 0 {
|
||||
// An empty list matches nothing, which is the honest reading. Silently
|
||||
// dropping the condition would widen the result set instead.
|
||||
if c.Op == "in" {
|
||||
return "1=0", nil, nil
|
||||
}
|
||||
return "1=1", nil, nil
|
||||
}
|
||||
ph := strings.TrimSuffix(strings.Repeat("?,", len(vals)), ",")
|
||||
args := make([]any, 0, len(vals))
|
||||
for _, s := range vals {
|
||||
args = append(args, s)
|
||||
}
|
||||
if c.Op == "notin" {
|
||||
// IFNULL, or a NULL column would fail "NOT IN" and vanish from the
|
||||
// result — the row is not one of the listed values, so it belongs.
|
||||
return "IFNULL(" + col + ",'') NOT IN (" + ph + ")", args, nil
|
||||
}
|
||||
return col + " IN (" + ph + ")", args, nil
|
||||
case "empty":
|
||||
return "IFNULL(" + col + ",'') = ''", nil, nil
|
||||
case "notempty":
|
||||
@@ -1461,6 +1508,51 @@ func (r *Repo) IterateByIDs(ctx context.Context, ids []int64, fn func(QSO) error
|
||||
return rows.Err()
|
||||
}
|
||||
|
||||
// BandSlotQSOs returns every contact on one band that belongs to a slot of the
|
||||
// entry matrix: the exact callsign, or any callsign in the same DXCC entity.
|
||||
// Mode is NOT filtered here — the class (phone / CW / digital) is a derived
|
||||
// notion the caller owns, so it filters the (small) band-scoped result itself.
|
||||
//
|
||||
// The DXCC arm matches the stored dxcc column only. A QSO logged before the
|
||||
// entity was resolved has a NULL there and is genuinely unattributed; guessing
|
||||
// it back from the callsign here would disagree with the matrix above, which is
|
||||
// built from the same column.
|
||||
func (r *Repo) BandSlotQSOs(ctx context.Context, callsign string, dxccNum int, band string) ([]QSO, error) {
|
||||
call := upperTrim(callsign)
|
||||
b := strings.TrimSpace(band)
|
||||
if b == "" || (call == "" && dxccNum <= 0) {
|
||||
return []QSO{}, nil
|
||||
}
|
||||
where := "band = ?"
|
||||
args := []any{b}
|
||||
switch {
|
||||
case call != "" && dxccNum > 0:
|
||||
where += " AND (callsign = ? OR dxcc = ?)"
|
||||
args = append(args, call, dxccNum)
|
||||
case call != "":
|
||||
where += " AND callsign = ?"
|
||||
args = append(args, call)
|
||||
default:
|
||||
where += " AND dxcc = ?"
|
||||
args = append(args, dxccNum)
|
||||
}
|
||||
rows, err := r.db.QueryContext(ctx,
|
||||
`SELECT `+selectCols+` FROM qso WHERE `+where+` ORDER BY qso_date DESC, id DESC LIMIT 500`, args...)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("query band slot: %w", err)
|
||||
}
|
||||
defer rows.Close()
|
||||
out := []QSO{}
|
||||
for rows.Next() {
|
||||
q, err := scanQSO(rows)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
out = append(out, q)
|
||||
}
|
||||
return out, rows.Err()
|
||||
}
|
||||
|
||||
// WorkedBefore summarises prior contacts at two granularities:
|
||||
// - by exact callsign → shown as "this call worked N×"
|
||||
// - by DXCC entity → drives NEW ONE / NEW BAND / NEW MODE / NEW SLOT
|
||||
@@ -1540,11 +1632,35 @@ type BandMode struct {
|
||||
// rendering a recent-contacts mini-list.
|
||||
const maxWorkedEntries = 50
|
||||
|
||||
// callMatch builds the WHERE fragment that selects one station's QSOs.
|
||||
//
|
||||
// Exact by default. With variants on, an operator's portable forms count as the
|
||||
// same station: RK3DWA, RK3DWA/3, RK3DWA/P and RK3DWA/QRP are one person, and
|
||||
// someone asking "have I worked RK3DWA?" means the person, not the string.
|
||||
// Typing 21 QSOs' worth of history only when you happen to add "/3" is the
|
||||
// behaviour this replaces. The suffix is stripped from what was TYPED too, so
|
||||
// it matches both ways round — RK3DWA/3 also finds the plain RK3DWA contacts.
|
||||
//
|
||||
// Deliberately NOT a bare "starts with": LIKE 'RK3DWA%' would also drag in
|
||||
// RK3DWAB, which is a different station. The '/' is what makes it the same one.
|
||||
func callMatch(call string, variants bool) (string, []any) {
|
||||
if !variants {
|
||||
return "callsign = ?", []any{call}
|
||||
}
|
||||
base := call
|
||||
if i := strings.IndexByte(base, '/'); i > 0 {
|
||||
base = base[:i]
|
||||
}
|
||||
return "(callsign = ? OR callsign LIKE ?)", []any{base, base + "/%"}
|
||||
}
|
||||
|
||||
// WorkedBefore returns aggregated history at both callsign and DXCC level.
|
||||
// dxccHint lets the caller pass a known DXCC number (e.g. from a fresh QRZ
|
||||
// lookup) when the call has never been worked. If 0, the DXCC is inferred
|
||||
// from the most recent prior QSO with the same callsign.
|
||||
func (r *Repo) WorkedBefore(ctx context.Context, callsign string, dxccHint int) (WorkedBefore, error) {
|
||||
//
|
||||
// matchVariants folds the portable forms of the call together — see callMatch.
|
||||
func (r *Repo) WorkedBefore(ctx context.Context, callsign string, dxccHint int, matchVariants bool) (WorkedBefore, error) {
|
||||
wb := WorkedBefore{
|
||||
Callsign: upperTrim(callsign),
|
||||
Bands: []string{},
|
||||
@@ -1560,17 +1676,18 @@ func (r *Repo) WorkedBefore(ctx context.Context, callsign string, dxccHint int)
|
||||
}
|
||||
|
||||
// ---- Per-callsign stats ----
|
||||
pred, predArgs := callMatch(wb.Callsign, matchVariants)
|
||||
if err := r.db.QueryRowContext(ctx,
|
||||
`SELECT COUNT(*) FROM qso WHERE callsign = ?`, wb.Callsign).Scan(&wb.Count); err != nil {
|
||||
`SELECT COUNT(*) FROM qso WHERE `+pred, predArgs...).Scan(&wb.Count); err != nil {
|
||||
return wb, fmt.Errorf("count worked: %w", err)
|
||||
}
|
||||
if wb.Count > 0 {
|
||||
// Pull the full QSO records (same columns as the Recent QSOs list) so
|
||||
// the Worked-before grid can offer the same rich column picker.
|
||||
rows, err := r.db.QueryContext(ctx, `SELECT `+selectCols+`
|
||||
FROM qso WHERE callsign = ?
|
||||
FROM qso WHERE `+pred+`
|
||||
ORDER BY qso_date DESC, id DESC
|
||||
LIMIT ?`, wb.Callsign, maxWorkedEntries)
|
||||
LIMIT ?`, append(append([]any{}, predArgs...), maxWorkedEntries)...)
|
||||
if err != nil {
|
||||
return wb, fmt.Errorf("query worked: %w", err)
|
||||
}
|
||||
@@ -1603,7 +1720,7 @@ func (r *Repo) WorkedBefore(ctx context.Context, callsign string, dxccHint int)
|
||||
if wb.Count > maxWorkedEntries {
|
||||
var firstStr sql.NullString
|
||||
_ = r.db.QueryRowContext(ctx,
|
||||
`SELECT MIN(qso_date) FROM qso WHERE callsign = ?`, wb.Callsign).Scan(&firstStr)
|
||||
`SELECT MIN(qso_date) FROM qso WHERE `+pred, predArgs...).Scan(&firstStr)
|
||||
if firstStr.Valid {
|
||||
wb.First = parseTimeLoose(firstStr.String)
|
||||
}
|
||||
@@ -1628,8 +1745,8 @@ func (r *Repo) WorkedBefore(ctx context.Context, callsign string, dxccHint int)
|
||||
var d sql.NullInt64
|
||||
_ = r.db.QueryRowContext(ctx, `
|
||||
SELECT dxcc FROM qso
|
||||
WHERE callsign = ? AND dxcc IS NOT NULL
|
||||
ORDER BY qso_date DESC LIMIT 1`, wb.Callsign).Scan(&d)
|
||||
WHERE `+pred+` AND dxcc IS NOT NULL
|
||||
ORDER BY qso_date DESC LIMIT 1`, predArgs...).Scan(&d)
|
||||
if d.Valid {
|
||||
dxcc = int(d.Int64)
|
||||
}
|
||||
@@ -2118,6 +2235,36 @@ func (r *Repo) WorkedCallBandModeKeys(ctx context.Context) (map[string]struct{},
|
||||
return out, rows.Err()
|
||||
}
|
||||
|
||||
// WorkedCallSlotKeys backs the cluster "already worked only on the same slot"
|
||||
// option. It returns each worked slot keyed BOTH as "CALL|band" (mode-agnostic,
|
||||
// for a spot whose mode couldn't be inferred) and "CALL|band|MODE" with the mode
|
||||
// run through normMode — so when digital grouping is on, FT8/FT4/RTTY fold into
|
||||
// one "DIG" and a call worked on 20m FT8 also matches a 20m FT4 spot. Call is
|
||||
// upper-cased and band lower-cased to match the spot keys ClusterSpotStatuses
|
||||
// builds. normMode may be nil (no grouping).
|
||||
func (r *Repo) WorkedCallSlotKeys(ctx context.Context, normMode func(string) string) (map[string]struct{}, error) {
|
||||
rows, err := r.db.QueryContext(ctx,
|
||||
`SELECT upper(callsign), lower(band), upper(mode) FROM qso
|
||||
WHERE callsign != '' AND band IS NOT NULL AND band != '' AND mode IS NOT NULL AND mode != ''`)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
out := make(map[string]struct{}, 4096)
|
||||
for rows.Next() {
|
||||
var c, b, m string
|
||||
if err := rows.Scan(&c, &b, &m); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if normMode != nil {
|
||||
m = normMode(m)
|
||||
}
|
||||
out[c+"|"+b] = struct{}{}
|
||||
out[c+"|"+b+"|"+m] = struct{}{}
|
||||
}
|
||||
return out, rows.Err()
|
||||
}
|
||||
|
||||
// WorkedPOTARefs returns the set of POTA park references already worked
|
||||
// (upper-cased). A QSO's pota_ref may hold several comma-separated parks
|
||||
// (an n-fer); each is added separately.
|
||||
@@ -2902,3 +3049,45 @@ func IsFilterable(column string) bool { return filterableColumns[column] }
|
||||
// column of their own and live in extras_json.
|
||||
func IsBulkEditableExtra(field string) bool { _, ok := bulkEditableExtras[field]; return ok }
|
||||
func IsFilterableExtra(field string) bool { _, ok := filterableExtras[field]; return ok }
|
||||
|
||||
// WorkedGridKeys returns the set of "GRID|MODE" keys already in the log, where
|
||||
// GRID is the 4-character field+square and MODE has been through normMode.
|
||||
//
|
||||
// The mode is part of the key, and normMode is what makes the DX-cluster
|
||||
// "group digital modes" option apply to grids for free: with grouping on, FT8
|
||||
// and FT4 both normalise to the same token, so a grid worked on FT8 is not new
|
||||
// on FT4; with it off they stay separate keys and it is.
|
||||
//
|
||||
// Truncated to four characters on the way in. A log holds a mix of JN36 and
|
||||
// JN36QU depending on where each QSO came from, and grid chasing is a
|
||||
// field+square game — without the truncation the same square counts as new
|
||||
// forever, once per subsquare.
|
||||
func (r *Repo) WorkedGridKeys(ctx context.Context, normMode func(string) string) (map[string]struct{}, error) {
|
||||
rows, err := r.db.QueryContext(ctx,
|
||||
// The column is "grid", not "gridsquare" — that is the ADIF field name, and
|
||||
// gridsquare_ext is a different (six-plus character) column entirely.
|
||||
`SELECT DISTINCT COALESCE(grid,''), COALESCE(mode,'') FROM qso
|
||||
WHERE grid IS NOT NULL AND grid != ''`)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
out := make(map[string]struct{}, 4096)
|
||||
for rows.Next() {
|
||||
var grid, mode string
|
||||
if err := rows.Scan(&grid, &mode); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
grid = strings.ToUpper(strings.TrimSpace(grid))
|
||||
if len(grid) < 4 {
|
||||
continue
|
||||
}
|
||||
grid = grid[:4]
|
||||
mode = strings.ToUpper(strings.TrimSpace(mode))
|
||||
if normMode != nil && mode != "" {
|
||||
mode = normMode(mode)
|
||||
}
|
||||
out[grid+"|"+mode] = struct{}{}
|
||||
}
|
||||
return out, rows.Err()
|
||||
}
|
||||
|
||||
@@ -61,6 +61,22 @@ func get(ctx context.Context, url, user, pass string) ([]byte, error) {
|
||||
return body, nil
|
||||
}
|
||||
|
||||
// relayBase turns a configured host into the base URL of a network relay board.
|
||||
// A bare host or host:port keeps the default http:// (the boards serve plain
|
||||
// HTTP on their LAN). A host that already carries a scheme is used verbatim, so
|
||||
// a board can be reached through an HTTPS reverse proxy — e.g. a Nginx Proxy
|
||||
// Manager entry "https://relay.example.com" fronting the LAN board's port 80,
|
||||
// which is how an operator reaches shack relays from outside when 80/443 are
|
||||
// already taken by the proxy. A trailing slash is trimmed so path parts append
|
||||
// cleanly; an optional sub-path in the host is preserved (a sub-path proxy).
|
||||
func relayBase(host string) string {
|
||||
h := strings.TrimSpace(host)
|
||||
if strings.HasPrefix(h, "http://") || strings.HasPrefix(h, "https://") {
|
||||
return strings.TrimRight(h, "/")
|
||||
}
|
||||
return "http://" + h
|
||||
}
|
||||
|
||||
// ── WebSwitch 1216H ────────────────────────────────────────────────────
|
||||
|
||||
type webswitch struct {
|
||||
@@ -82,7 +98,7 @@ func (w *webswitch) Set(ctx context.Context, relay int, on bool) error {
|
||||
if on {
|
||||
action = "on"
|
||||
}
|
||||
_, err := get(ctx, fmt.Sprintf("http://%s/relaycontrol/%s/%d", w.host, action, relay), "", "")
|
||||
_, err := get(ctx, fmt.Sprintf("%s/relaycontrol/%s/%d", relayBase(w.host), action, relay), "", "")
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -93,7 +109,7 @@ func (w *webswitch) Status(ctx context.Context) ([]bool, error) {
|
||||
sel.WriteString(strconv.Itoa(i))
|
||||
sel.WriteByte('$')
|
||||
}
|
||||
body, err := get(ctx, fmt.Sprintf("http://%s/relaystate/get2/%s", w.host, sel.String()), "", "")
|
||||
body, err := get(ctx, fmt.Sprintf("%s/relaystate/get2/%s", relayBase(w.host), sel.String()), "", "")
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -140,7 +156,7 @@ func (k *kmtronic) Set(ctx context.Context, relay int, on bool) error {
|
||||
state = "01"
|
||||
}
|
||||
// FF<rr><ss>: e.g. FF0101 = relay 1 on, FF0800 = relay 8 off.
|
||||
_, err := get(ctx, fmt.Sprintf("http://%s/FF%02d%s", k.host, relay, state), k.user, k.pass)
|
||||
_, err := get(ctx, fmt.Sprintf("%s/FF%02d%s", relayBase(k.host), relay, state), k.user, k.pass)
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -154,7 +170,7 @@ type kmStatus struct {
|
||||
}
|
||||
|
||||
func (k *kmtronic) Status(ctx context.Context) ([]bool, error) {
|
||||
body, err := get(ctx, fmt.Sprintf("http://%s/status.xml", k.host), k.user, k.pass)
|
||||
body, err := get(ctx, fmt.Sprintf("%s/status.xml", relayBase(k.host)), k.user, k.pass)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -259,8 +275,8 @@ func (d *dingtian) Set(ctx context.Context, relay int, on bool) error {
|
||||
}
|
||||
// type=0 is plain ON/OFF (1 = jogging, 2 = delay, 3 = flash, 4 = toggle),
|
||||
// and time is then unused.
|
||||
body, err := d.getCGI(ctx, fmt.Sprintf("http://%s/relay_cgi.cgi?type=0&relay=%d&on=%d&time=0&pwd=%s&",
|
||||
d.host, relay-1, state, d.pwd))
|
||||
body, err := d.getCGI(ctx, fmt.Sprintf("%s/relay_cgi.cgi?type=0&relay=%d&on=%d&time=0&pwd=%s&",
|
||||
relayBase(d.host), relay-1, state, d.pwd))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -274,7 +290,7 @@ func (d *dingtian) Set(ctx context.Context, relay int, on bool) error {
|
||||
}
|
||||
|
||||
func (d *dingtian) Status(ctx context.Context) ([]bool, error) {
|
||||
body, err := d.getCGI(ctx, fmt.Sprintf("http://%s/relay_cgi_load.cgi", d.host))
|
||||
body, err := d.getCGI(ctx, fmt.Sprintf("%s/relay_cgi_load.cgi", relayBase(d.host)))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
@@ -172,3 +172,19 @@ func TestDingtianSetRefusalIsAnError(t *testing.T) {
|
||||
t.Fatal("a refused command answered HTTP 200 and was reported as success")
|
||||
}
|
||||
}
|
||||
|
||||
func TestRelayBase(t *testing.T) {
|
||||
cases := map[string]string{
|
||||
"192.168.1.5": "http://192.168.1.5",
|
||||
"192.168.1.5:8080": "http://192.168.1.5:8080",
|
||||
"https://relay.example.com": "https://relay.example.com",
|
||||
"https://relay.example.com/": "https://relay.example.com",
|
||||
"http://relay.example.com/sw/": "http://relay.example.com/sw",
|
||||
" relay.local ": "http://relay.local",
|
||||
}
|
||||
for in, want := range cases {
|
||||
if got := relayBase(in); got != want {
|
||||
t.Errorf("relayBase(%q) = %q, want %q", in, got, want)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+188
-5
@@ -36,6 +36,7 @@ import (
|
||||
"strconv"
|
||||
"strings"
|
||||
"sync"
|
||||
"sync/atomic"
|
||||
"time"
|
||||
)
|
||||
|
||||
@@ -48,6 +49,10 @@ type Rig interface {
|
||||
SetFreq(hz int64) error
|
||||
SetMode(mode string) error
|
||||
SetPTT(on bool) error
|
||||
// SetSplit arms or clears split and places the transmit frequency. Returns an
|
||||
// error on a rig that cannot: a refusal the client can report is worth far
|
||||
// more than a success it has no way to check.
|
||||
SetSplit(on bool, txHz int64) error
|
||||
}
|
||||
|
||||
type Server struct {
|
||||
@@ -59,6 +64,25 @@ type Server struct {
|
||||
ln net.Listener
|
||||
conns map[net.Conn]struct{}
|
||||
closed bool
|
||||
|
||||
// accepted counts every connection this listener has taken. Only selfTest
|
||||
// reads it, to tell "a client reached us" from "a client reached someone
|
||||
// else on our port".
|
||||
accepted atomic.Int64
|
||||
|
||||
// ptt mirrors the last PTT state a client commanded via set_ptt. WSJT-X/JTDX
|
||||
// poll get_ptt DURING transmit to confirm the rig is keyed; if get_ptt reads
|
||||
// RX they conclude PTT failed and abort the over after a second or two. We
|
||||
// don't read PTT back from every backend, so echo what the client last set —
|
||||
// always consistent with its own command, and enough to satisfy the check.
|
||||
ptt atomic.Bool
|
||||
// pttKnown says ptt reflects a state we actually commanded, so a repeat can
|
||||
// be told from the very first call — where the radio's state is unknown and
|
||||
// the command must go through.
|
||||
pttKnown atomic.Bool
|
||||
// splitWanted remembers a set_split_vfo that arrived before the frequency it
|
||||
// needs, so the pair can be honoured in the order the client sends them.
|
||||
splitWanted atomic.Bool
|
||||
}
|
||||
|
||||
func New(port int, rig Rig, logf func(string, ...any)) *Server {
|
||||
@@ -101,16 +125,84 @@ func (s *Server) Start() error {
|
||||
}
|
||||
return
|
||||
}
|
||||
s.accepted.Add(1)
|
||||
s.mu.Lock()
|
||||
s.conns[c] = struct{}{}
|
||||
s.mu.Unlock()
|
||||
go s.serve(c)
|
||||
}
|
||||
}()
|
||||
go s.selfTest()
|
||||
return nil
|
||||
}
|
||||
|
||||
// selfTest checks that a client connecting to 127.0.0.1:<port> actually reaches
|
||||
// THIS listener, and says so in the log when it does not.
|
||||
//
|
||||
// Binding successfully is not the same as being reachable. OpsLog listens on
|
||||
// 0.0.0.0, and Windows lets a second program bind the SAME port on the specific
|
||||
// address 127.0.0.1. Connections to localhost then go to the MORE SPECIFIC
|
||||
// listener — the other program — while ours sits there having logged "sharing
|
||||
// CAT on port 4532" and never seeing a single client.
|
||||
//
|
||||
// Seen in the field with Nexus, which starts its own rigctld on 127.0.0.1:4532
|
||||
// and connects to it. Neither program reports anything wrong; the operator gets
|
||||
// a CAT timeout from a daemon with no radio behind it, and OpsLog's log is
|
||||
// silent because nothing ever arrived. Three exchanges went into finding that,
|
||||
// so it is worth one line at startup.
|
||||
//
|
||||
// The counter can only be raised by our own accept loop, so a real client
|
||||
// arriving during the probe makes this pass, never fail wrongly.
|
||||
func (s *Server) selfTest() {
|
||||
before := s.accepted.Load()
|
||||
addr := fmt.Sprintf("127.0.0.1:%d", s.port)
|
||||
c, err := net.DialTimeout("tcp", addr, 2*time.Second)
|
||||
if err != nil {
|
||||
s.log("rigctld: WARNING — could not reach our own CAT port at %s (%v); "+
|
||||
"clients on this PC will not find OpsLog", addr, err)
|
||||
return
|
||||
}
|
||||
defer c.Close()
|
||||
// Give the accept loop a moment: the dial returns as soon as the handshake
|
||||
// completes, which can be marginally before Accept hands the connection over.
|
||||
for i := 0; i < 20; i++ {
|
||||
if s.accepted.Load() > before {
|
||||
return // it reached us — nothing to say
|
||||
}
|
||||
time.Sleep(50 * time.Millisecond)
|
||||
}
|
||||
s.log("rigctld: WARNING — another program is already answering on %s. "+
|
||||
"It will receive the CAT connections meant for OpsLog, which will look "+
|
||||
"like a timeout in that program and silence here. Close it, or move "+
|
||||
"OpsLog's shared CAT to a different port.", addr)
|
||||
}
|
||||
|
||||
// releasePTT drops the transmitter when whoever was holding it goes away.
|
||||
//
|
||||
// Nothing else will. The Kenwood/Elecraft backend deliberately suspends its
|
||||
// wire poll while PTT is held (a K3 answers "?;" to IF; during transmit), so a
|
||||
// client that crashes, is killed, or simply has its socket closed under it
|
||||
// leaves the rig keyed with nobody watching — and closing the socket is exactly
|
||||
// what Stop() does on every settings save. Seen in the field: a K3 sat in
|
||||
// transmit for 29 s, until the CAT link happened to be rebuilt.
|
||||
//
|
||||
// Swap makes this once-only, so the Stop() path and the per-connection defer it
|
||||
// triggers can both call it without double-unkeying.
|
||||
func (s *Server) releasePTT(why string) {
|
||||
if !s.ptt.Swap(false) {
|
||||
return
|
||||
}
|
||||
s.log("rigctld: %s while the rig was keyed — dropping PTT", why)
|
||||
if err := s.rig.SetPTT(false); err != nil {
|
||||
s.log("rigctld: emergency unkey failed: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func (s *Server) Stop() {
|
||||
// Before anything is torn down: reloadCAT calls us BEFORE it restarts the CAT
|
||||
// backend, so the rig is still reachable here and an unkey still lands.
|
||||
s.releasePTT("CAT sharing stopped")
|
||||
|
||||
s.mu.Lock()
|
||||
s.closed = true
|
||||
ln := s.ln
|
||||
@@ -138,6 +230,8 @@ func (s *Server) serve(c net.Conn) {
|
||||
delete(s.conns, c)
|
||||
s.mu.Unlock()
|
||||
_ = c.Close()
|
||||
// A client that walks away mid-over must not leave the rig transmitting.
|
||||
s.releasePTT(fmt.Sprintf("client %s left", c.RemoteAddr()))
|
||||
}()
|
||||
s.log("rigctld: client connected from %s", c.RemoteAddr())
|
||||
r := bufio.NewReader(c)
|
||||
@@ -189,6 +283,24 @@ func (s *Server) handle(line string) (resp string, quit bool) {
|
||||
return "CHKVFO 0\n", false
|
||||
case "\\get_powerstat", "get_powerstat":
|
||||
return "1\n", false
|
||||
|
||||
// Three commands a client may issue as a matter of course. Refusing them with
|
||||
// RPRT -11 is allowed, and a tolerant client carries on — but nothing obliges
|
||||
// it to, and Nexus sends all three around every transmit. Answering costs
|
||||
// nothing and removes them as suspects when something really is wrong.
|
||||
case "\\get_lock_mode", "get_lock_mode":
|
||||
// Truthful: OpsLog never locks the dial against its own clients.
|
||||
return "0\n", false
|
||||
case "\\set_lock_mode", "set_lock_mode":
|
||||
// Accepted and ignored, like set_vfo below: there is no lock to set, and
|
||||
// failing here would abort a client's whole transmit sequence over a
|
||||
// setting that has no effect either way.
|
||||
return rprt(0), false
|
||||
case "\\stop_morse", "stop_morse":
|
||||
// Nothing is queued here — CW over CAT is keyed by the rig's own keyer
|
||||
// through the backend, not buffered in this server. "Stopped" is therefore
|
||||
// accurate rather than polite.
|
||||
return rprt(0), false
|
||||
case "q", "Q", "\\quit":
|
||||
return "", true
|
||||
|
||||
@@ -228,20 +340,39 @@ func (s *Server) handle(line string) (resp string, quit bool) {
|
||||
return rprt(0), false
|
||||
|
||||
case "t", "\\get_ptt":
|
||||
// We do not read PTT back from every backend, and answering "transmitting"
|
||||
// wrongly would make a client hold off for ever. Reporting RX is the safe
|
||||
// direction: the worst case is a client that transmits when we said it
|
||||
// could, which is what it was going to do anyway.
|
||||
// Echo the last commanded PTT state. WSJT-X/JTDX poll this WHILE
|
||||
// transmitting to confirm the rig is keyed; answering a blanket "0" (RX)
|
||||
// made them decide PTT had failed and abort the over after ~1-2 s.
|
||||
if s.ptt.Load() {
|
||||
return "1\n", false
|
||||
}
|
||||
return "0\n", false
|
||||
case "T", "\\set_ptt":
|
||||
if len(args) < 1 {
|
||||
return rprt(-1), false
|
||||
}
|
||||
on := args[0] != "0"
|
||||
// Only touch the radio on a CHANGE.
|
||||
//
|
||||
// A client is free to restate PTT as often as it likes, and one does:
|
||||
// Nexus sends set_ptt 0 about sixteen times a second, so the Flex was
|
||||
// getting "xmit 0" every 60 ms forever. Worse than wasteful — its own
|
||||
// "xmit 1" landed between two of them and was overwritten in the same
|
||||
// millisecond, so the radio never stayed keyed and the operator saw a
|
||||
// transmit request that simply did nothing.
|
||||
//
|
||||
// Repeating a state is not a request to change it. The first call always
|
||||
// goes through, since we cannot know how the radio was left.
|
||||
if s.pttKnown.Load() && s.ptt.Load() == on {
|
||||
return rprt(0), false
|
||||
}
|
||||
if err := s.rig.SetPTT(on); err != nil {
|
||||
s.log("rigctld: set_ptt %v failed: %v", on, err)
|
||||
return rprt(-9), false
|
||||
}
|
||||
s.ptt.Store(on)
|
||||
s.pttKnown.Store(true)
|
||||
s.log("rigctld: PTT %s", map[bool]string{true: "ON", false: "off"}[on])
|
||||
return rprt(0), false
|
||||
|
||||
case "v", "\\get_vfo":
|
||||
@@ -259,7 +390,31 @@ func (s *Server) handle(line string) (resp string, quit bool) {
|
||||
}
|
||||
return fmt.Sprintf("%d\nVFOB\n", n), false
|
||||
case "S", "\\set_split_vfo":
|
||||
return rprt(0), false // see set_vfo — split is driven from the rig
|
||||
// "S <0|1> <VFO>". The VFO argument is ignored: which dial transmits is the
|
||||
// rig's own business, and every backend here puts it on the second one.
|
||||
//
|
||||
// This used to answer RPRT 0 and do NOTHING. WSJT-X in "Split Operating:
|
||||
// Rig" sends this and set_split_freq, believed both, and transmitted on the
|
||||
// RECEIVE frequency — on a pileup, straight onto the DX, while the software
|
||||
// showed exactly what the operator had asked for. A lie that leaves no
|
||||
// trace anywhere is the worst kind of bug, so it now works or says so.
|
||||
if len(args) < 1 {
|
||||
return rprt(-1), false
|
||||
}
|
||||
if args[0] != "0" {
|
||||
// Arming needs a frequency, and WSJT-X sends set_split_freq AFTER this.
|
||||
// Remember the request and let that command do the work: alone, this
|
||||
// would arm split on whatever the transmit VFO happens to hold.
|
||||
s.splitWanted.Store(true)
|
||||
return rprt(0), false
|
||||
}
|
||||
s.splitWanted.Store(false)
|
||||
if err := s.rig.SetSplit(false, 0); err != nil {
|
||||
s.log("rigctld: split off failed: %v", err)
|
||||
return rprt(-9), false
|
||||
}
|
||||
s.log("rigctld: split off")
|
||||
return rprt(0), false
|
||||
case "i", "\\get_split_freq":
|
||||
_, tx := s.rig.Split()
|
||||
if tx <= 0 {
|
||||
@@ -267,9 +422,37 @@ func (s *Server) handle(line string) (resp string, quit bool) {
|
||||
}
|
||||
return fmt.Sprintf("%d\n", tx), false
|
||||
case "I", "\\set_split_freq":
|
||||
if len(args) < 1 {
|
||||
return rprt(-1), false
|
||||
}
|
||||
// Hamlib sends a float ("14075300.000000"), so parse as one.
|
||||
hz, err := strconv.ParseFloat(args[0], 64)
|
||||
if err != nil || hz <= 0 {
|
||||
return rprt(-1), false
|
||||
}
|
||||
if err := s.rig.SetSplit(true, int64(hz)); err != nil {
|
||||
s.log("rigctld: split TX %.0f Hz failed: %v", hz, err)
|
||||
return rprt(-9), false
|
||||
}
|
||||
s.splitWanted.Store(true)
|
||||
s.log("rigctld: split ON, TX %.0f Hz", hz)
|
||||
return rprt(0), false
|
||||
|
||||
default:
|
||||
// A frame ending in ';' is not a rigctl command at all — it is raw rig
|
||||
// dialect (Kenwood/Elecraft/Yaesu), which means the client is configured
|
||||
// with a RIG MODEL pointing at this port instead of "Hamlib NET rigctl".
|
||||
//
|
||||
// Worth naming, because the symptom hides the cause completely: we answer
|
||||
// RPRT -11 like any unknown command, but that reply has no ';' to terminate
|
||||
// on, so the client's parser waits and then reports "reply incomplete, got
|
||||
// nothing". The operator sees a timeout and concludes the CAT share is
|
||||
// broken, when it is a one-line setting in the other program.
|
||||
if strings.HasSuffix(line, ";") && !strings.Contains(line, " ") {
|
||||
s.log("rigctld: %q is a raw rig command, not rigctl — the client is set to a RIG MODEL; "+
|
||||
"it must be set to \"Hamlib NET rigctl\" (rig 2) at this address", line)
|
||||
return rprt(-11), false
|
||||
}
|
||||
// RPRT -11 is "command not implemented". Answering something is essential:
|
||||
// a client waiting on a silent socket hangs rather than degrading.
|
||||
s.log("rigctld: unimplemented command %q", line)
|
||||
|
||||
@@ -0,0 +1,94 @@
|
||||
package rigctld
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net"
|
||||
"strings"
|
||||
"sync"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
// A listener that binds successfully is not necessarily the one clients reach.
|
||||
// Windows lets a second program bind the same port on the specific address
|
||||
// 127.0.0.1 while ours holds 0.0.0.0, and localhost connections then go to the
|
||||
// more specific one. Seen with Nexus, which starts its own rigctld on 4532.
|
||||
func TestSelfTestWarnsWhenAnotherProgramHoldsLocalhost(t *testing.T) {
|
||||
// Squat 127.0.0.1 first, the way the other program does.
|
||||
squat, err := net.Listen("tcp", "127.0.0.1:0")
|
||||
if err != nil {
|
||||
t.Skipf("cannot bind localhost here: %v", err)
|
||||
}
|
||||
defer squat.Close()
|
||||
port := squat.Addr().(*net.TCPAddr).Port
|
||||
go func() {
|
||||
for {
|
||||
c, err := squat.Accept()
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
c.Close()
|
||||
}
|
||||
}()
|
||||
|
||||
var mu sync.Mutex
|
||||
var lines []string
|
||||
s := New(port, nil, func(f string, a ...any) {
|
||||
mu.Lock()
|
||||
lines = append(lines, fmt.Sprintf(f, a...))
|
||||
mu.Unlock()
|
||||
})
|
||||
if err := s.Start(); err != nil {
|
||||
// The wildcard bind is refused on some setups; nothing to prove then.
|
||||
t.Skipf("wildcard bind refused: %v", err)
|
||||
}
|
||||
defer s.Stop()
|
||||
|
||||
deadline := time.Now().Add(4 * time.Second)
|
||||
for time.Now().Before(deadline) {
|
||||
mu.Lock()
|
||||
got := strings.Join(lines, "\n")
|
||||
mu.Unlock()
|
||||
if strings.Contains(got, "another program is already answering") {
|
||||
return
|
||||
}
|
||||
time.Sleep(50 * time.Millisecond)
|
||||
}
|
||||
mu.Lock()
|
||||
defer mu.Unlock()
|
||||
t.Errorf("no warning was logged while another listener owned localhost:%d.\nlog was:\n%s",
|
||||
port, strings.Join(lines, "\n"))
|
||||
}
|
||||
|
||||
// The healthy case must stay silent: a warning on every clean start would be
|
||||
// noise, and noise in a log is what makes the real line easy to miss.
|
||||
func TestSelfTestIsSilentWhenReachable(t *testing.T) {
|
||||
// A real, free port: with 0 the OS picks one but s.port stays 0, so the probe
|
||||
// would dial 127.0.0.1:0 and prove nothing.
|
||||
probe, err := net.Listen("tcp", "127.0.0.1:0")
|
||||
if err != nil {
|
||||
t.Skipf("cannot bind: %v", err)
|
||||
}
|
||||
port := probe.Addr().(*net.TCPAddr).Port
|
||||
probe.Close()
|
||||
|
||||
var mu sync.Mutex
|
||||
var lines []string
|
||||
s := New(port, nil, func(f string, a ...any) {
|
||||
mu.Lock()
|
||||
lines = append(lines, fmt.Sprintf(f, a...))
|
||||
mu.Unlock()
|
||||
})
|
||||
if err := s.Start(); err != nil {
|
||||
t.Skipf("start: %v", err)
|
||||
}
|
||||
defer s.Stop()
|
||||
time.Sleep(1500 * time.Millisecond)
|
||||
mu.Lock()
|
||||
defer mu.Unlock()
|
||||
for _, l := range lines {
|
||||
if strings.Contains(l, "WARNING") {
|
||||
t.Errorf("a reachable port still warned: %q", l)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2,11 +2,13 @@ package rigctld
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"errors"
|
||||
"fmt"
|
||||
"net"
|
||||
"strings"
|
||||
"sync"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
// fakeRig stands in for the CAT manager.
|
||||
@@ -20,11 +22,26 @@ type fakeRig struct {
|
||||
setFreqs []int64
|
||||
setModes []string
|
||||
failSet bool
|
||||
// noSplit models a backend that cannot set split — the case that must reach
|
||||
// the client as a refusal instead of a silent success.
|
||||
noSplit bool
|
||||
splitCalls []string
|
||||
}
|
||||
|
||||
func (f *fakeRig) Freq() int64 { f.mu.Lock(); defer f.mu.Unlock(); return f.freq }
|
||||
func (f *fakeRig) Mode() string { f.mu.Lock(); defer f.mu.Unlock(); return f.mode }
|
||||
func (f *fakeRig) Split() (bool, int64) { f.mu.Lock(); defer f.mu.Unlock(); return f.split, f.txFreq }
|
||||
|
||||
func (f *fakeRig) SetSplit(on bool, txHz int64) error {
|
||||
f.mu.Lock()
|
||||
defer f.mu.Unlock()
|
||||
if f.noSplit {
|
||||
return errors.New("this radio cannot set split from software")
|
||||
}
|
||||
f.splitCalls = append(f.splitCalls, fmt.Sprintf("%v:%d", on, txHz))
|
||||
f.split, f.txFreq = on, txHz
|
||||
return nil
|
||||
}
|
||||
func (f *fakeRig) SetFreq(hz int64) error {
|
||||
f.mu.Lock()
|
||||
defer f.mu.Unlock()
|
||||
@@ -138,6 +155,28 @@ func TestHandleReportsBackendFailure(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
// get_ptt must echo the last commanded PTT state. WSJT-X/JTDX poll get_ptt while
|
||||
// transmitting to confirm the rig is keyed; a blanket "0" made them decide PTT
|
||||
// had failed and abort the over after a second or two.
|
||||
func TestGetPTTEchoesSetPTT(t *testing.T) {
|
||||
s := New(0, &fakeRig{}, nil)
|
||||
if got, _ := s.handle("t"); got != "0\n" {
|
||||
t.Fatalf("initial get_ptt = %q, want 0", got)
|
||||
}
|
||||
if got, _ := s.handle("T 1"); got != "RPRT 0\n" {
|
||||
t.Fatalf("set_ptt 1 = %q, want RPRT 0", got)
|
||||
}
|
||||
if got, _ := s.handle("t"); got != "1\n" {
|
||||
t.Fatalf("get_ptt after T 1 = %q, want 1 — client would abort TX", got)
|
||||
}
|
||||
if got, _ := s.handle("T 0"); got != "RPRT 0\n" {
|
||||
t.Fatalf("set_ptt 0 = %q, want RPRT 0", got)
|
||||
}
|
||||
if got, _ := s.handle("t"); got != "0\n" {
|
||||
t.Fatalf("get_ptt after T 0 = %q, want 0", got)
|
||||
}
|
||||
}
|
||||
|
||||
// dump_state is parsed POSITIONALLY by Hamlib clients: WSJT-X reads the first
|
||||
// line as the protocol version and refuses to continue if the block is short or
|
||||
// misshapen. Pinning its shape is what stops a well-meaning edit from silently
|
||||
@@ -212,6 +251,66 @@ func TestServerOverTCP(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
// A client that vanishes mid-over must not leave the transmitter keyed. Nothing
|
||||
// else would notice: the Kenwood/Elecraft backend stops polling while PTT is
|
||||
// held, so a K3 was seen sitting in transmit for 29 s after WSJT-X's socket was
|
||||
// closed under it by a settings save.
|
||||
func TestPTTIsDroppedWhenTheClientDisappears(t *testing.T) {
|
||||
rig := &fakeRig{freq: 14074000, mode: "FT8"}
|
||||
s := New(0, rig, nil)
|
||||
ln, err := net.Listen("tcp", "127.0.0.1:0")
|
||||
if err != nil {
|
||||
t.Fatalf("listen: %v", err)
|
||||
}
|
||||
s.mu.Lock()
|
||||
s.ln = ln
|
||||
s.mu.Unlock()
|
||||
go func() {
|
||||
for {
|
||||
c, err := ln.Accept()
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
go s.serve(c)
|
||||
}
|
||||
}()
|
||||
defer s.Stop()
|
||||
|
||||
c, err := net.DialTimeout("tcp", ln.Addr().String(), dialTimeout)
|
||||
if err != nil {
|
||||
t.Fatalf("dial: %v", err)
|
||||
}
|
||||
r := bufio.NewReader(c)
|
||||
// "T 3" is what WSJT-X sends for PTT_ON_DATA — the form seen in the field.
|
||||
if _, err := c.Write([]byte("T 3\n")); err != nil {
|
||||
t.Fatalf("write: %v", err)
|
||||
}
|
||||
line, _ := r.ReadString('\n')
|
||||
if strings.TrimSpace(line) != "RPRT 0" {
|
||||
t.Fatalf("set_ptt = %q, want RPRT 0", strings.TrimSpace(line))
|
||||
}
|
||||
rig.mu.Lock()
|
||||
keyed := rig.ptt
|
||||
rig.mu.Unlock()
|
||||
if !keyed {
|
||||
t.Fatalf("rig is not keyed after T 3 — the test proves nothing")
|
||||
}
|
||||
|
||||
_ = c.Close()
|
||||
// The unkey happens on the serve goroutine's defer, so poll briefly.
|
||||
deadline := time.Now().Add(2 * time.Second)
|
||||
for time.Now().Before(deadline) {
|
||||
rig.mu.Lock()
|
||||
keyed = rig.ptt
|
||||
rig.mu.Unlock()
|
||||
if !keyed {
|
||||
return
|
||||
}
|
||||
time.Sleep(10 * time.Millisecond)
|
||||
}
|
||||
t.Error("rig still keyed after the client disconnected — the transmitter was left on air")
|
||||
}
|
||||
|
||||
func TestModeMapping(t *testing.T) {
|
||||
for _, c := range []struct{ adif, hamlib string }{
|
||||
{"SSB", "USB"}, {"LSB", "LSB"}, {"CW", "CW"}, {"RTTY", "RTTY"},
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
package rigctld
|
||||
|
||||
import (
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
// WSJT-X in "Split Operating: Rig" sends set_split_vfo then set_split_freq. Both
|
||||
// used to answer RPRT 0 and do NOTHING: the software believed it was
|
||||
// transmitting up the band while the radio stayed on the receive frequency —
|
||||
// on a pileup, straight onto the DX, with no trace anywhere.
|
||||
func TestSetSplitReachesTheRig(t *testing.T) {
|
||||
rig := &fakeRig{freq: 14074000, mode: "FT8"}
|
||||
s := New(0, rig, func(string, ...any) {})
|
||||
|
||||
if got, _ := s.handle("S 1 VFOB"); !strings.HasPrefix(got, "RPRT 0") {
|
||||
t.Fatalf("set_split_vfo answered %q", got)
|
||||
}
|
||||
// Arming alone must NOT touch the rig: without a frequency it would transmit
|
||||
// on whatever the second VFO happened to hold.
|
||||
if len(rig.splitCalls) != 0 {
|
||||
t.Errorf("split was armed before a frequency arrived: %v", rig.splitCalls)
|
||||
}
|
||||
|
||||
if got, _ := s.handle("I 14075300.000000"); !strings.HasPrefix(got, "RPRT 0") {
|
||||
t.Fatalf("set_split_freq answered %q", got)
|
||||
}
|
||||
if len(rig.splitCalls) != 1 || rig.splitCalls[0] != "true:14075300" {
|
||||
t.Fatalf("rig saw %v, want one call arming split on 14075300", rig.splitCalls)
|
||||
}
|
||||
|
||||
if got, _ := s.handle("S 0 VFOA"); !strings.HasPrefix(got, "RPRT 0") {
|
||||
t.Fatalf("split off answered %q", got)
|
||||
}
|
||||
if len(rig.splitCalls) != 2 || !strings.HasPrefix(rig.splitCalls[1], "false:") {
|
||||
t.Errorf("rig saw %v, want split cleared", rig.splitCalls)
|
||||
}
|
||||
}
|
||||
|
||||
// A backend that cannot do split must produce an ERROR the client can report.
|
||||
// Answering success and doing nothing is what caused the original fault, and it
|
||||
// is the one outcome that must never come back.
|
||||
func TestSetSplitRefusalIsReported(t *testing.T) {
|
||||
rig := &fakeRig{freq: 14074000, noSplit: true}
|
||||
s := New(0, rig, func(string, ...any) {})
|
||||
|
||||
s.handle("S 1 VFOB")
|
||||
got, _ := s.handle("I 14075300.000000")
|
||||
if strings.HasPrefix(got, "RPRT 0") {
|
||||
t.Errorf("a rig that cannot split answered %q — the client will transmit on the wrong frequency", got)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,158 @@
|
||||
// Package dcu1 drives rotator controllers that speak the Hy-Gain DCU-1 protocol,
|
||||
// over a serial COM port (or a raw TCP socket, e.g. a serial-over-IP bridge).
|
||||
//
|
||||
// DCU-1 is used by the Hy-Gain DCU-1, the Idiom Press Rotor-EZ, Green Heron
|
||||
// controllers, and the RotorCard DXA (hamsupply) for Yaesu DXA rotors. It is a
|
||||
// DIFFERENT command set from Yaesu GS-232 (see internal/rotator/gs232):
|
||||
// semicolon-terminated, azimuth only.
|
||||
//
|
||||
// Commands (';' terminated — roundTrip appends the ';'):
|
||||
//
|
||||
// AP1nnn set the target bearing nnn (000-359)
|
||||
// AM1 rotate to the target (some controllers move on AP1 alone; AM1 is
|
||||
// harmless and makes the Rotor-EZ/DCU-1 variants that need it work)
|
||||
// AI1 query the current bearing → the reply carries the 3-digit azimuth
|
||||
//
|
||||
// The base DCU-1 set has no dedicated stop; Stop re-commands the current bearing,
|
||||
// which halts rotation.
|
||||
package dcu1
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"io"
|
||||
"net"
|
||||
"regexp"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"go.bug.st/serial"
|
||||
)
|
||||
|
||||
const (
|
||||
dialTimeout = 3 * time.Second
|
||||
ioTimeout = 2 * time.Second
|
||||
)
|
||||
|
||||
// Client is a stateless per-call sender, mirroring the gs232/pst/rotgenius idiom.
|
||||
// Exactly one of (Host, Port) or ComPort is used.
|
||||
type Client struct {
|
||||
Host string
|
||||
Port int
|
||||
ComPort string // serial transport: "COM5" etc.
|
||||
// Baud varies by controller (a Hy-Gain DCU-1 is 4800; Green Heron / RotorCard
|
||||
// can differ). Zero keeps 4800.
|
||||
Baud int
|
||||
}
|
||||
|
||||
// New returns a TCP Client (a serial-over-IP bridge in front of the controller).
|
||||
func New(host string, port int) *Client {
|
||||
if host == "" {
|
||||
host = "127.0.0.1"
|
||||
}
|
||||
if port <= 0 || port > 65535 {
|
||||
port = 4001
|
||||
}
|
||||
return &Client{Host: host, Port: port}
|
||||
}
|
||||
|
||||
// NewSerial returns a Client over the controller's COM port.
|
||||
func NewSerial(comPort string, baud int) *Client {
|
||||
return &Client{ComPort: comPort, Baud: baud}
|
||||
}
|
||||
|
||||
// roundTrip opens a connection, sends one ';'-terminated command and (when
|
||||
// wantReply) reads until a 3-digit bearing is present. cmd must NOT carry the
|
||||
// ';'.
|
||||
func (c *Client) roundTrip(cmd string, wantReply bool) (string, error) {
|
||||
var conn io.ReadWriteCloser
|
||||
if c.ComPort != "" {
|
||||
baud := c.Baud
|
||||
if baud <= 0 {
|
||||
baud = 4800
|
||||
}
|
||||
sp, err := serial.Open(c.ComPort, &serial.Mode{BaudRate: baud})
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("open rotator %s @ %d baud: %w", c.ComPort, baud, err)
|
||||
}
|
||||
_ = sp.SetReadTimeout(200 * time.Millisecond)
|
||||
conn = sp
|
||||
} else {
|
||||
nc, err := net.DialTimeout("tcp", net.JoinHostPort(c.Host, strconv.Itoa(c.Port)), dialTimeout)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("connect DCU-1 %s:%d: %w", c.Host, c.Port, err)
|
||||
}
|
||||
_ = nc.SetDeadline(time.Now().Add(ioTimeout))
|
||||
conn = nc
|
||||
}
|
||||
defer conn.Close()
|
||||
if _, err := conn.Write([]byte(cmd + ";")); err != nil {
|
||||
return "", fmt.Errorf("send %q: %w", cmd, err)
|
||||
}
|
||||
if !wantReply {
|
||||
return "", nil
|
||||
}
|
||||
buf := make([]byte, 64)
|
||||
var sb strings.Builder
|
||||
deadline := time.Now().Add(ioTimeout)
|
||||
for time.Now().Before(deadline) {
|
||||
n, err := conn.Read(buf)
|
||||
if n > 0 {
|
||||
sb.Write(buf[:n])
|
||||
// The DCU-1 reply carries the bearing as three digits (framing varies —
|
||||
// ";nnn", "nnn;", "+0nnn"). Stop once we have them rather than on a
|
||||
// specific terminator, so any flavour reads cleanly.
|
||||
if azRe.MatchString(sb.String()) {
|
||||
break
|
||||
}
|
||||
}
|
||||
// A serial read that times out returns (0, nil) — keep polling until the
|
||||
// overall deadline; a real error ends the read.
|
||||
if err != nil {
|
||||
break
|
||||
}
|
||||
}
|
||||
line := strings.TrimSpace(sb.String())
|
||||
if line == "" {
|
||||
return "", fmt.Errorf("no reply to %q", cmd)
|
||||
}
|
||||
return line, nil
|
||||
}
|
||||
|
||||
// GoTo points the antenna at az (0-359): set the target, then rotate.
|
||||
func (c *Client) GoTo(az int) error {
|
||||
az = ((az % 360) + 360) % 360
|
||||
if _, err := c.roundTrip(fmt.Sprintf("AP1%03d", az), false); err != nil {
|
||||
return err
|
||||
}
|
||||
_, err := c.roundTrip("AM1", false)
|
||||
return err
|
||||
}
|
||||
|
||||
// Stop halts rotation. The base DCU-1 set has no stop command, so re-command the
|
||||
// current bearing — the controller stops when the target equals where it is.
|
||||
func (c *Client) Stop() error {
|
||||
az, _, err := c.Heading()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
_, err = c.roundTrip(fmt.Sprintf("AP1%03d", az), false)
|
||||
return err
|
||||
}
|
||||
|
||||
// azRe matches the 3-digit bearing in any of the DCU-1 reply framings.
|
||||
var azRe = regexp.MustCompile(`(\d{3})`)
|
||||
|
||||
// Heading queries the current azimuth. Returns the raw reply for diagnostics.
|
||||
func (c *Client) Heading() (az int, raw string, err error) {
|
||||
raw, err = c.roundTrip("AI1", true)
|
||||
if err != nil {
|
||||
return 0, raw, err
|
||||
}
|
||||
m := azRe.FindStringSubmatch(raw)
|
||||
if m == nil {
|
||||
return 0, raw, fmt.Errorf("unrecognised azimuth reply %q", raw)
|
||||
}
|
||||
az, _ = strconv.Atoi(m[1])
|
||||
return az % 360, raw, nil
|
||||
}
|
||||
@@ -228,6 +228,18 @@ func (c *Client) PowerOn() error {
|
||||
func (c *Client) PowerOff() error {
|
||||
err := c.sendCmd(cmdOff)
|
||||
applog.Printf("spe: power OFF — SWITCH OFF key sent (err=%v)", err)
|
||||
// Drop the link and mark the amp offline at once, exactly as a fresh start
|
||||
// would see it. The amp stops answering its UART once off, but the connection
|
||||
// that was already open BEFORE the off keystroke kept reading as "connected"
|
||||
// (stale/queued frames), so the UI never showed OFF and PowerOn — which only
|
||||
// wakes a DISCONNECTED amp — did nothing until the operator restarted OpsLog.
|
||||
// The poll loop reopens the port on its next tick; a plain reopen never wakes a
|
||||
// switched-off amp (only PowerOn's RTS/DTR edge does), so it stays offline.
|
||||
time.Sleep(100 * time.Millisecond) // let the 6-byte OFF command flush before we close
|
||||
c.mu.Lock()
|
||||
c.dropLocked()
|
||||
c.mu.Unlock()
|
||||
c.setErr(fmt.Errorf("switched off"))
|
||||
return err
|
||||
}
|
||||
|
||||
|
||||
+126
-39
@@ -23,6 +23,12 @@ const (
|
||||
ubReadTimeout = 4 * time.Second // was 1s — too tight for a remote link
|
||||
ubKeepAlive = 15 * time.Second // OS-level TCP keepalive
|
||||
ubMaxPollTimeout = 3 // consecutive read timeouts tolerated before reconnecting
|
||||
// How long a just-commanded direction is trusted AFTER the motors have stopped
|
||||
// but before the antenna's status confirms it. The timer is held off entirely
|
||||
// while the motors are still moving, so this is only the grace period for the
|
||||
// confirmation poll to arrive once the elements have settled — generous, because
|
||||
// over a remote link that poll lags by several seconds.
|
||||
ubPendingDirGrace = 8 * time.Second
|
||||
)
|
||||
|
||||
// Protocol constants
|
||||
@@ -82,8 +88,22 @@ type Client struct {
|
||||
// yet (Frequency==0) — otherwise the deadband is bypassed and every small QSY
|
||||
// re-tunes the motors.
|
||||
lastSetKHz int
|
||||
|
||||
// moveCmdAt is when a move (frequency or direction) was last COMMANDED. The
|
||||
// status poll runs every couple of seconds, so without this the "moving" flag
|
||||
// — which drives the UI indicator and the Flex TX-inhibit — appeared up to a
|
||||
// poll late even though the elements start moving at once. GetStatus reports
|
||||
// motion during a short window after a command so both react immediately.
|
||||
moveCmdAt time.Time
|
||||
}
|
||||
|
||||
// ubMoveOptimisticWindow is how long after a commanded move GetStatus reports
|
||||
// "moving" before the status poll has had a chance to read the real motor state.
|
||||
// It only needs to bridge one poll interval; once a poll sees real motion, that
|
||||
// takes over. Bounded, so if the antenna never reports motion the flag still
|
||||
// clears rather than latching the TX-inhibit on for ever.
|
||||
const ubMoveOptimisticWindow = 3 * time.Second
|
||||
|
||||
// LastSetKHz returns the frequency (kHz) most recently commanded to the antenna,
|
||||
// or 0 if none yet.
|
||||
func (c *Client) LastSetKHz() int {
|
||||
@@ -221,12 +241,30 @@ func (c *Client) pollLoop() {
|
||||
}
|
||||
|
||||
c.statusMu.Lock()
|
||||
// Keep a just-commanded direction until the antenna reports it.
|
||||
// Keep a just-commanded direction until the antenna actually reports it.
|
||||
// Over a remote link the confirmation arrives several seconds after the
|
||||
// command — the motors flip the elements first — so the old fixed 4 s
|
||||
// timeout expired WHILE the change was still in flight, and the stale poll
|
||||
// reverted the UI to the old pattern even though the antenna was on its way
|
||||
// to the new one. Now: while the motors are still moving the change is in
|
||||
// progress, so hold the commanded pattern and keep resetting the timer;
|
||||
// only once the motors have stopped does the short grace window run, giving
|
||||
// the confirmation poll time to land. The poll only wins if the motors are
|
||||
// idle AND the antenna still reports a different pattern past that window —
|
||||
// i.e. the command genuinely did not take.
|
||||
if c.pendingDirSet {
|
||||
if time.Since(c.pendingDirAt) > 4*time.Second || status.Direction == c.pendingDir {
|
||||
c.pendingDirSet = false
|
||||
} else {
|
||||
status.Direction = c.pendingDir
|
||||
if status.MotorsMoving != 0 {
|
||||
c.pendingDirAt = time.Now() // still repositioning — don't start the grace timer
|
||||
}
|
||||
switch {
|
||||
case status.Direction == c.pendingDir:
|
||||
c.pendingDirSet = false // confirmed by the antenna
|
||||
case time.Since(c.pendingDirAt) > ubPendingDirGrace:
|
||||
c.pendingDirSet = false // motors idle, still unconfirmed → accept the poll
|
||||
log.Printf("Ultrabeam: antenna never confirmed direction %d (reports %d) — dropping the hold",
|
||||
c.pendingDir, status.Direction)
|
||||
default:
|
||||
status.Direction = c.pendingDir // still changing, or within the grace window
|
||||
}
|
||||
}
|
||||
c.lastStatus = status
|
||||
@@ -246,7 +284,19 @@ func (c *Client) GetStatus() (*Status, error) {
|
||||
return &Status{Connected: false}, nil
|
||||
}
|
||||
|
||||
return c.lastStatus, nil
|
||||
// Copy so the optimistic-motion tweak below never mutates the cached status
|
||||
// the poll goroutine owns.
|
||||
st := *c.lastStatus
|
||||
// Optimistic motion: right after a commanded move, report "moving" until a
|
||||
// status poll can read the real motor state (~one poll interval). The elements
|
||||
// start moving the instant the operator clicks a band/pattern, so this makes
|
||||
// the UI indicator and the Flex TX-inhibit react immediately instead of a poll
|
||||
// later. Real polled motion takes over once seen; the window is bounded so the
|
||||
// flag can't latch the inhibit on for ever.
|
||||
if st.Connected && st.MotorsMoving == 0 && !c.moveCmdAt.IsZero() && time.Since(c.moveCmdAt) < ubMoveOptimisticWindow {
|
||||
st.MotorsMoving = 1 // sentinel: optimistically moving (read only as != 0)
|
||||
}
|
||||
return &st, nil
|
||||
}
|
||||
|
||||
// getNextSeq returns the next sequence number
|
||||
@@ -277,10 +327,9 @@ func quoteByte(b byte) []byte {
|
||||
return []byte{b}
|
||||
}
|
||||
|
||||
// buildPacket creates a complete packet with checksum and escaping
|
||||
func (c *Client) buildPacket(cmd byte, data []byte) []byte {
|
||||
seq := c.getNextSeq()
|
||||
|
||||
// buildPacket creates a complete packet with checksum and escaping. The seq is
|
||||
// supplied by the caller so sendCommand can match the reply against it.
|
||||
func (c *Client) buildPacket(seq, cmd byte, data []byte) []byte {
|
||||
// Calculate checksum on unquoted data
|
||||
payload := append([]byte{seq, cmd}, data...)
|
||||
chk := calculateChecksum(payload)
|
||||
@@ -365,39 +414,27 @@ func (c *Client) sendCommand(cmd byte, data []byte) ([]byte, error) {
|
||||
return nil, fmt.Errorf("not connected")
|
||||
}
|
||||
|
||||
// Build and send packet
|
||||
packet := c.buildPacket(cmd, data)
|
||||
// Flush anything already sitting in the stream before we send. The antenna
|
||||
// does NOT echo our sequence number — its replies carry their own counter — so
|
||||
// a reply cannot be matched to its request. Instead we keep the exchange 1:1:
|
||||
// a reply left behind by an earlier timed-out command is discarded here, so
|
||||
// the reply we read next belongs to THIS command. Reading a stale reply as the
|
||||
// current one crossed STATUS with READ_BANDS/PROGRESS — phantom frequencies (a
|
||||
// spurious follow-loop re-tune), dropped connections and wrong element lengths.
|
||||
c.drainStale()
|
||||
|
||||
_, err := c.conn.Write(packet)
|
||||
if err != nil {
|
||||
seq := c.getNextSeq()
|
||||
packet := c.buildPacket(seq, cmd, data)
|
||||
if _, err := c.conn.Write(packet); err != nil {
|
||||
return nil, fmt.Errorf("failed to write: %w", err)
|
||||
}
|
||||
|
||||
// Read reply with timeout (generous — tolerates remote-link latency).
|
||||
// Read the reply with a timeout generous enough for a remote link.
|
||||
c.conn.SetReadDeadline(time.Now().Add(ubReadTimeout))
|
||||
|
||||
// Read until we get a complete packet
|
||||
var buffer []byte
|
||||
for {
|
||||
b, err := c.reader.ReadByte()
|
||||
buffer, err := c.readPacket()
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to read: %w", err)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
buffer = append(buffer, b)
|
||||
|
||||
// Check if we have a complete packet
|
||||
if b == ETX && len(buffer) > 0 && buffer[0] == STX {
|
||||
break
|
||||
}
|
||||
|
||||
// Prevent infinite loop
|
||||
if len(buffer) > 256 {
|
||||
return nil, fmt.Errorf("packet too long")
|
||||
}
|
||||
}
|
||||
|
||||
// Parse reply
|
||||
_, replyCmd, payload, err := parsePacket(buffer)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to parse reply: %w", err)
|
||||
@@ -426,6 +463,45 @@ func (c *Client) sendCommand(cmd byte, data []byte) ([]byte, error) {
|
||||
}
|
||||
}
|
||||
|
||||
// drainStale discards any bytes already waiting in the stream — a reply left
|
||||
// behind by a command that timed out. A short read deadline lets it consume what
|
||||
// is there and stop quickly when the stream is clean. Caller holds connMu.
|
||||
func (c *Client) drainStale() {
|
||||
c.conn.SetReadDeadline(time.Now().Add(5 * time.Millisecond))
|
||||
buf := make([]byte, 256)
|
||||
for {
|
||||
n, err := c.reader.Read(buf)
|
||||
if n == 0 || err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// readPacket reads one complete STX…ETX frame, skipping any leading bytes until
|
||||
// an STX so a partial/garbage remnant left in the stream can't derail the parse.
|
||||
// STX/ETX/DLE are all high-bit (0xF5/0xFA/0xF6) and the escaping clears the MSB,
|
||||
// so a raw ETX only ever appears as the real terminator. Caller holds connMu and
|
||||
// has set a read deadline.
|
||||
func (c *Client) readPacket() ([]byte, error) {
|
||||
var buffer []byte
|
||||
for {
|
||||
b, err := c.reader.ReadByte()
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to read: %w", err)
|
||||
}
|
||||
if len(buffer) == 0 && b != STX {
|
||||
continue // resync to the start of a frame
|
||||
}
|
||||
buffer = append(buffer, b)
|
||||
if b == ETX {
|
||||
return buffer, nil
|
||||
}
|
||||
if len(buffer) > 256 {
|
||||
return nil, fmt.Errorf("packet too long")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// queryStatus queries general status (command 1)
|
||||
func (c *Client) queryStatus() (*Status, error) {
|
||||
reply, err := c.sendCommand(CMD_STATUS, nil)
|
||||
@@ -433,7 +509,13 @@ func (c *Client) queryStatus() (*Status, error) {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if len(reply) < 12 {
|
||||
// An RCU-06 controller — seen behind an RS232-to-Ethernet bridge — answers with
|
||||
// an 11-byte status frame: the standard one WITHOUT the trailing FreqMax byte.
|
||||
// The packet checksum was already verified, so a short-but-valid frame is real,
|
||||
// not a fragment. Accept it and default the missing tail fields instead of
|
||||
// reconnect-looping on "reply too short". reply[9]/[10] (MotorsMoving, FreqMin)
|
||||
// are the last we truly need, so 10 bytes is the floor.
|
||||
if len(reply) < 10 {
|
||||
return nil, fmt.Errorf("status reply too short: %d bytes", len(reply))
|
||||
}
|
||||
|
||||
@@ -446,8 +528,12 @@ func (c *Client) queryStatus() (*Status, error) {
|
||||
Direction: int(reply[6] & 0x0F),
|
||||
OffState: (reply[7] & 0x02) != 0,
|
||||
MotorsMoving: int(reply[9]),
|
||||
FreqMin: int(reply[10]),
|
||||
FreqMax: int(reply[11]),
|
||||
}
|
||||
if len(reply) > 10 {
|
||||
status.FreqMin = int(reply[10])
|
||||
}
|
||||
if len(reply) > 11 {
|
||||
status.FreqMax = int(reply[11])
|
||||
}
|
||||
|
||||
return status, nil
|
||||
@@ -513,6 +599,7 @@ func (c *Client) SetFrequency(freqKhz int, direction int) error {
|
||||
c.statusMu.Lock()
|
||||
c.pendingDir, c.pendingDirAt, c.pendingDirSet = direction, time.Now(), true
|
||||
c.lastSetKHz = freqKhz
|
||||
c.moveCmdAt = time.Now() // start reporting motion at once — see ubMoveOptimisticWindow
|
||||
if c.lastStatus != nil {
|
||||
c.lastStatus.Direction = direction // reflect immediately
|
||||
}
|
||||
|
||||
@@ -0,0 +1,94 @@
|
||||
package ultrabeam
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"bytes"
|
||||
"net"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
// sendCommand must flush any bytes already in the stream (a reply left by an
|
||||
// earlier timed-out command) before reading, then return the reply to THIS
|
||||
// command. The antenna does not echo our sequence number, so keeping the stream
|
||||
// clean is the only way to stay in sync.
|
||||
func TestSendCommandFlushesStaleThenReadsReply(t *testing.T) {
|
||||
srvConn, cliConn := net.Pipe()
|
||||
defer srvConn.Close()
|
||||
defer cliConn.Close()
|
||||
|
||||
c := &Client{conn: cliConn, reader: bufio.NewReader(cliConn)}
|
||||
srv := &Client{reader: bufio.NewReader(srvConn)}
|
||||
|
||||
errc := make(chan error, 1)
|
||||
go func() {
|
||||
// Leftover from a "previous" command still sitting in the stream. The Write
|
||||
// blocks until drainStale consumes it, so it is guaranteed flushed before
|
||||
// the real exchange.
|
||||
if _, err := srvConn.Write(c.buildPacket(9, UB_OK, []byte{0xDE, 0xAD})); err != nil {
|
||||
errc <- err
|
||||
return
|
||||
}
|
||||
// Now serve the actual request.
|
||||
req, err := srv.readPacket()
|
||||
if err != nil {
|
||||
errc <- err
|
||||
return
|
||||
}
|
||||
seq, _, _, err := parsePacket(req)
|
||||
if err != nil {
|
||||
errc <- err
|
||||
return
|
||||
}
|
||||
_, err = srvConn.Write(c.buildPacket(seq, UB_OK, []byte{0x11, 0x22, 0x33}))
|
||||
errc <- err
|
||||
}()
|
||||
|
||||
payload, err := c.sendCommand(CMD_STATUS, nil)
|
||||
if err != nil {
|
||||
t.Fatalf("sendCommand: %v", err)
|
||||
}
|
||||
if !bytes.Equal(payload, []byte{0x11, 0x22, 0x33}) {
|
||||
t.Fatalf("payload = % X, want 11 22 33 — stale reply not flushed", payload)
|
||||
}
|
||||
if err := <-errc; err != nil {
|
||||
t.Fatalf("server: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
// readPacket must resynchronise to the next STX, dropping any partial/garbage
|
||||
// bytes left in the stream, so one corrupt frame can't misalign every frame
|
||||
// after it.
|
||||
func TestReadPacketResyncsToSTX(t *testing.T) {
|
||||
frame := (&Client{}).buildPacket(5, UB_OK, []byte{0x01, 0x02})
|
||||
stream := append([]byte{0x11, 0x22, 0x33}, frame...) // leading garbage, then a real frame
|
||||
c := &Client{reader: bufio.NewReader(bytes.NewReader(stream))}
|
||||
|
||||
got, err := c.readPacket()
|
||||
if err != nil {
|
||||
t.Fatalf("readPacket: %v", err)
|
||||
}
|
||||
seq, cmd, payload, err := parsePacket(got)
|
||||
if err != nil {
|
||||
t.Fatalf("parsePacket: %v", err)
|
||||
}
|
||||
if seq != 5 || cmd != UB_OK || !bytes.Equal(payload, []byte{0x01, 0x02}) {
|
||||
t.Fatalf("seq=%d cmd=%d payload=% X, want 5 / OK / 01 02", seq, cmd, payload)
|
||||
}
|
||||
}
|
||||
|
||||
// A commanded move must report motion immediately (before the next status poll),
|
||||
// then fall back to the real motor state once the window elapses.
|
||||
func TestOptimisticMotionAfterCommand(t *testing.T) {
|
||||
c := &Client{lastStatus: &Status{Connected: true, MotorsMoving: 0}}
|
||||
|
||||
c.moveCmdAt = time.Now()
|
||||
if st, _ := c.GetStatus(); st.MotorsMoving == 0 {
|
||||
t.Fatal("just after a move command, GetStatus should report motion")
|
||||
}
|
||||
|
||||
c.moveCmdAt = time.Now().Add(-ubMoveOptimisticWindow - time.Second)
|
||||
if st, _ := c.GetStatus(); st.MotorsMoving != 0 {
|
||||
t.Fatal("past the window with motors idle, GetStatus must report no motion")
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,553 @@
|
||||
// Package webpub publishes the log as a file an operator can put on a website:
|
||||
// a self-contained HTML page or a CSV, written locally and optionally uploaded
|
||||
// by FTP/FTPS.
|
||||
//
|
||||
// Design notes that matter:
|
||||
//
|
||||
// - The local file is ALWAYS written first and the upload layered on top. A
|
||||
// network failure then leaves a good file on disk rather than a truncated
|
||||
// one on the server, and the operator can publish it by any other means.
|
||||
// - The page is self-contained: no external CSS, font or script. It has to
|
||||
// work dropped into any hosting, including one that blocks third-party
|
||||
// requests, and it must not leak the reader's visit to anyone.
|
||||
// - Every ADIF field is offered, because an operator publishing a county hunt
|
||||
// or an award chase needs fields no curated list would have guessed. That
|
||||
// puts the judgement on them, and it is a real one: this page is PUBLIC, and
|
||||
// the catalogue includes the correspondent's address, e-mail and the
|
||||
// operator's own street. Nothing is published unless it is chosen, and the
|
||||
// default selection stays the eight columns a reader of someone else's log
|
||||
// actually looks for.
|
||||
package webpub
|
||||
|
||||
import (
|
||||
"crypto/tls"
|
||||
"encoding/csv"
|
||||
"fmt"
|
||||
"html"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"sort"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/jlaffaye/ftp"
|
||||
|
||||
"hamlog/internal/qso"
|
||||
)
|
||||
|
||||
// Config is the whole feature's configuration. Stored per profile.
|
||||
type Config struct {
|
||||
Enabled bool `json:"enabled"`
|
||||
Format string `json:"format"` // "html" | "csv"
|
||||
Folder string `json:"folder"` // local output folder
|
||||
FileName string `json:"file_name"` // e.g. "log.html"
|
||||
Title string `json:"title"` // page heading; blank → callsign
|
||||
Count int `json:"count"` // publish the last N QSOs
|
||||
// IntervalMin is the periodic refresh in minutes. 0 = only republish when a
|
||||
// QSO is logged. Every publish is debounced regardless (see Publisher).
|
||||
IntervalMin int `json:"interval_min"`
|
||||
Columns []string `json:"columns"`
|
||||
|
||||
FTPEnabled bool `json:"ftp_enabled"`
|
||||
FTPHost string `json:"ftp_host"`
|
||||
FTPPort int `json:"ftp_port"`
|
||||
FTPUser string `json:"ftp_user"`
|
||||
FTPPassword string `json:"ftp_password"`
|
||||
FTPTLS bool `json:"ftp_tls"` // explicit AUTH TLS (FTPS)
|
||||
FTPFolder string `json:"ftp_folder"`
|
||||
FTPFileName string `json:"ftp_file_name"`
|
||||
}
|
||||
|
||||
// Column is one publishable field: a stable key, the header printed in the
|
||||
// file, and how to read it off a QSO.
|
||||
type Column struct {
|
||||
Key string
|
||||
Header string
|
||||
// Group is the section a picker shows this under. With every ADIF field on
|
||||
// offer, a flat list is unusable — the grouping IS what makes it navigable.
|
||||
Group string
|
||||
Value func(q *qso.QSO) string
|
||||
}
|
||||
|
||||
func str(p *int) string {
|
||||
if p == nil {
|
||||
return ""
|
||||
}
|
||||
return strconv.Itoa(*p)
|
||||
}
|
||||
|
||||
func str64(p *int64) string {
|
||||
if p == nil {
|
||||
return ""
|
||||
}
|
||||
return strconv.FormatInt(*p, 10)
|
||||
}
|
||||
|
||||
// flt drops a trailing ".0": a distance reads better as "1420" than "1420.0",
|
||||
// and a bearing as "142.5" keeps the half-degree that matters.
|
||||
func flt(p *float64) string {
|
||||
if p == nil {
|
||||
return ""
|
||||
}
|
||||
return strconv.FormatFloat(*p, 'f', -1, 64)
|
||||
}
|
||||
|
||||
func stamp(t time.Time) string {
|
||||
if t.IsZero() {
|
||||
return ""
|
||||
}
|
||||
return t.UTC().Format("2006-01-02 15:04")
|
||||
}
|
||||
|
||||
// Columns is every field a QSO can carry, in ADIF order, grouped for the picker.
|
||||
//
|
||||
// Generated from the qso.QSO struct rather than curated by hand: the previous
|
||||
// list held 23 of them, so anyone wanting to publish a county, a satellite pass
|
||||
// or an award reference simply could not. A hand list also silently rots — a new
|
||||
// ADIF field is added to the struct and nobody remembers this file exists.
|
||||
//
|
||||
// The stored configuration keeps KEYS, so order and grouping can change freely.
|
||||
var Columns = []Column{
|
||||
// Date and time are one column in the database and two here: a log reads by
|
||||
// day, and a reader scanning for "that evening" should not have to parse a
|
||||
// timestamp. Frequency is stored in Hz and published in MHz.
|
||||
{"date", "Date", "QSO", func(q *qso.QSO) string { return q.QSODate.UTC().Format("2006-01-02") }},
|
||||
{"time", "UTC", "QSO", func(q *qso.QSO) string { return q.QSODate.UTC().Format("15:04") }},
|
||||
{"freq", "Freq", "QSO", func(q *qso.QSO) string {
|
||||
if q.FreqHz == nil || *q.FreqHz == 0 {
|
||||
return ""
|
||||
}
|
||||
return strconv.FormatFloat(float64(*q.FreqHz)/1e6, 'f', 3, 64)
|
||||
}},
|
||||
{"callsign", "Callsign", "QSO", func(q *qso.QSO) string { return q.Callsign }},
|
||||
{"qso_date_off", "End", "QSO", func(q *qso.QSO) string { return stamp(q.QSODateOff) }},
|
||||
{"band", "Band", "QSO", func(q *qso.QSO) string { return q.Band }},
|
||||
{"band_rx", "Band RX", "QSO", func(q *qso.QSO) string { return q.BandRX }},
|
||||
{"mode", "Mode", "QSO", func(q *qso.QSO) string { return q.Mode }},
|
||||
{"submode", "Submode", "QSO", func(q *qso.QSO) string { return q.Submode }},
|
||||
{"freq_rx_hz", "Freq RX", "QSO", func(q *qso.QSO) string { return str64(q.FreqRXHz) }},
|
||||
{"rst_sent", "RST S", "QSO", func(q *qso.QSO) string { return q.RSTSent }},
|
||||
{"rst_rcvd", "RST R", "QSO", func(q *qso.QSO) string { return q.RSTRcvd }},
|
||||
{"name", "Name", "QSO", func(q *qso.QSO) string { return q.Name }},
|
||||
{"qth", "QTH", "QSO", func(q *qso.QSO) string { return q.QTH }},
|
||||
{"address", "Address", "QSO", func(q *qso.QSO) string { return q.Address }},
|
||||
{"email", "Email", "QSO", func(q *qso.QSO) string { return q.Email }},
|
||||
{"web", "Web", "QSO", func(q *qso.QSO) string { return q.Web }},
|
||||
{"grid", "Grid", "Location", func(q *qso.QSO) string { return q.Grid }},
|
||||
{"gridsquare_ext", "Grid ext", "Location", func(q *qso.QSO) string { return q.GridExt }},
|
||||
{"vucc_grids", "VUCC", "Location", func(q *qso.QSO) string { return q.VUCCGrids }},
|
||||
{"country", "Country", "Location", func(q *qso.QSO) string { return q.Country }},
|
||||
{"state", "State", "Location", func(q *qso.QSO) string { return q.State }},
|
||||
{"cnty", "County", "Location", func(q *qso.QSO) string { return q.County }},
|
||||
{"dxcc", "Dxcc", "Location", func(q *qso.QSO) string { return str(q.DXCC) }},
|
||||
{"cont", "Cont", "Location", func(q *qso.QSO) string { return q.Continent }},
|
||||
{"cqz", "CQ", "Location", func(q *qso.QSO) string { return str(q.CQZ) }},
|
||||
{"ituz", "ITU", "Location", func(q *qso.QSO) string { return str(q.ITUZ) }},
|
||||
{"iota", "Iota", "Awards", func(q *qso.QSO) string { return q.IOTA }},
|
||||
{"sota_ref", "SOTA", "Awards", func(q *qso.QSO) string { return q.SOTARef }},
|
||||
{"pota_ref", "POTA", "Awards", func(q *qso.QSO) string { return q.POTARef }},
|
||||
{"age", "Age", "QSO", func(q *qso.QSO) string { return str(q.Age) }},
|
||||
{"lat", "Lat", "Location", func(q *qso.QSO) string { return flt(q.Lat) }},
|
||||
{"lon", "Lon", "Location", func(q *qso.QSO) string { return flt(q.Lon) }},
|
||||
{"rig", "Rig", "QSO", func(q *qso.QSO) string { return q.Rig }},
|
||||
{"ant", "Ant", "QSO", func(q *qso.QSO) string { return q.Ant }},
|
||||
{"qsl_sent", "QSL S", "QSL", func(q *qso.QSO) string { return q.QSLSent }},
|
||||
{"qsl_rcvd", "QSL R", "QSL", func(q *qso.QSO) string { return q.QSLRcvd }},
|
||||
{"qsl_sent_date", "Qsl sent date", "QSL", func(q *qso.QSO) string { return q.QSLSentDate }},
|
||||
{"qsl_rcvd_date", "Qsl rcvd date", "QSL", func(q *qso.QSO) string { return q.QSLRcvdDate }},
|
||||
{"qsl_via", "Qsl via", "QSL", func(q *qso.QSO) string { return q.QSLVia }},
|
||||
{"qsl_msg", "Qsl msg", "QSL", func(q *qso.QSO) string { return q.QSLMsg }},
|
||||
{"qslmsg_rcvd", "Qslmsg rcvd", "QSL", func(q *qso.QSO) string { return q.QSLMsgRcvd }},
|
||||
{"lotw_sent", "LoTW S", "QSL", func(q *qso.QSO) string { return q.LOTWSent }},
|
||||
{"lotw_rcvd", "LoTW R", "QSL", func(q *qso.QSO) string { return q.LOTWRcvd }},
|
||||
{"lotw_sent_date", "Lotw sent date", "QSL", func(q *qso.QSO) string { return q.LOTWSentDate }},
|
||||
{"lotw_rcvd_date", "Lotw rcvd date", "QSL", func(q *qso.QSO) string { return q.LOTWRcvdDate }},
|
||||
{"eqsl_sent", "eQSL S", "QSL", func(q *qso.QSO) string { return q.EQSLSent }},
|
||||
{"eqsl_rcvd", "eQSL R", "QSL", func(q *qso.QSO) string { return q.EQSLRcvd }},
|
||||
{"eqsl_sent_date", "Eqsl sent date", "QSL", func(q *qso.QSO) string { return q.EQSLSentDate }},
|
||||
{"eqsl_rcvd_date", "Eqsl rcvd date", "QSL", func(q *qso.QSO) string { return q.EQSLRcvdDate }},
|
||||
{"clublog_qso_upload_date", "Clublog qso upload date", "QSL", func(q *qso.QSO) string { return q.ClublogUploadDate }},
|
||||
{"clublog_qso_upload_status", "Clublog qso upload status", "QSL", func(q *qso.QSO) string { return q.ClublogUploadStatus }},
|
||||
{"hrdlog_qso_upload_date", "Hrdlog qso upload date", "QSL", func(q *qso.QSO) string { return q.HRDLogUploadDate }},
|
||||
{"hrdlog_qso_upload_status", "Hrdlog qso upload status", "QSL", func(q *qso.QSO) string { return q.HRDLogUploadStatus }},
|
||||
{"qrzcom_qso_upload_date", "Qrzcom qso upload date", "QSL", func(q *qso.QSO) string { return q.QRZComUploadDate }},
|
||||
{"qrzcom_qso_upload_status", "Qrzcom qso upload status", "QSL", func(q *qso.QSO) string { return q.QRZComUploadStatus }},
|
||||
{"qrzcom_qso_download_date", "Qrzcom qso download date", "QSL", func(q *qso.QSO) string { return q.QRZComDownloadDate }},
|
||||
{"qrzcom_qso_download_status", "Qrzcom qso download status", "QSL", func(q *qso.QSO) string { return q.QRZComDownloadStatus }},
|
||||
{"contest_id", "Contest", "Contest", func(q *qso.QSO) string { return q.ContestID }},
|
||||
{"srx", "Srx", "Contest", func(q *qso.QSO) string { return str(q.SRX) }},
|
||||
{"stx", "Stx", "Contest", func(q *qso.QSO) string { return str(q.STX) }},
|
||||
{"srx_string", "SRX str", "QSO", func(q *qso.QSO) string { return q.SRXString }},
|
||||
{"stx_string", "STX str", "QSO", func(q *qso.QSO) string { return q.STXString }},
|
||||
{"check", "Check", "Contest", func(q *qso.QSO) string { return q.Check }},
|
||||
{"precedence", "Precedence", "Contest", func(q *qso.QSO) string { return q.Precedence }},
|
||||
{"arrl_sect", "Section", "Contest", func(q *qso.QSO) string { return q.ARRLSect }},
|
||||
{"prop_mode", "Prop", "QSO", func(q *qso.QSO) string { return q.PropMode }},
|
||||
{"sat_name", "Sat", "QSO", func(q *qso.QSO) string { return q.SatName }},
|
||||
{"sat_mode", "Sat mode", "QSO", func(q *qso.QSO) string { return q.SatMode }},
|
||||
{"ant_az", "Ant az", "QSO", func(q *qso.QSO) string { return flt(q.AntAz) }},
|
||||
{"ant_el", "Ant el", "QSO", func(q *qso.QSO) string { return flt(q.AntEl) }},
|
||||
{"ant_path", "Ant path", "QSO", func(q *qso.QSO) string { return q.AntPath }},
|
||||
{"station_callsign", "Station", "QSO", func(q *qso.QSO) string { return q.StationCallsign }},
|
||||
{"operator", "Operator", "QSO", func(q *qso.QSO) string { return q.Operator }},
|
||||
{"my_grid", "My grid", "My station", func(q *qso.QSO) string { return q.MyGrid }},
|
||||
{"my_gridsquare_ext", "My gridsquare ext", "My station", func(q *qso.QSO) string { return q.MyGridExt }},
|
||||
{"my_country", "My country", "My station", func(q *qso.QSO) string { return q.MyCountry }},
|
||||
{"my_state", "My state", "My station", func(q *qso.QSO) string { return q.MyState }},
|
||||
{"my_cnty", "My cnty", "My station", func(q *qso.QSO) string { return q.MyCounty }},
|
||||
{"my_iota", "My iota", "My station", func(q *qso.QSO) string { return q.MyIOTA }},
|
||||
{"my_sota_ref", "My sota ref", "My station", func(q *qso.QSO) string { return q.MySOTARef }},
|
||||
{"my_pota_ref", "My pota ref", "My station", func(q *qso.QSO) string { return q.MyPOTARef }},
|
||||
{"my_dxcc", "My dxcc", "My station", func(q *qso.QSO) string { return str(q.MyDXCC) }},
|
||||
{"my_cq_zone", "My cq zone", "My station", func(q *qso.QSO) string { return str(q.MyCQZone) }},
|
||||
{"my_itu_zone", "My itu zone", "My station", func(q *qso.QSO) string { return str(q.MyITUZone) }},
|
||||
{"my_lat", "My lat", "My station", func(q *qso.QSO) string { return flt(q.MyLat) }},
|
||||
{"my_lon", "My lon", "My station", func(q *qso.QSO) string { return flt(q.MyLon) }},
|
||||
{"my_street", "My street", "My station", func(q *qso.QSO) string { return q.MyStreet }},
|
||||
{"my_city", "My city", "My station", func(q *qso.QSO) string { return q.MyCity }},
|
||||
{"my_postal_code", "My postal code", "My station", func(q *qso.QSO) string { return q.MyPostalCode }},
|
||||
{"my_rig", "My rig", "My station", func(q *qso.QSO) string { return q.MyRig }},
|
||||
{"my_antenna", "My antenna", "My station", func(q *qso.QSO) string { return q.MyAntenna }},
|
||||
{"tx_pwr", "TX pwr", "QSO", func(q *qso.QSO) string { return flt(q.TXPower) }},
|
||||
{"comment", "Comment", "QSO", func(q *qso.QSO) string { return q.Comment }},
|
||||
{"notes", "Notes", "QSO", func(q *qso.QSO) string { return q.Notes }},
|
||||
{"sig", "Sig", "Awards", func(q *qso.QSO) string { return q.SIG }},
|
||||
{"sig_info", "Sig info", "Awards", func(q *qso.QSO) string { return q.SIGInfo }},
|
||||
{"my_sig", "My sig", "My station", func(q *qso.QSO) string { return q.MySIG }},
|
||||
{"my_sig_info", "My sig info", "My station", func(q *qso.QSO) string { return q.MySIGInfo }},
|
||||
{"wwff_ref", "WWFF", "Awards", func(q *qso.QSO) string { return q.WWFFRef }},
|
||||
{"my_wwff_ref", "My wwff ref", "My station", func(q *qso.QSO) string { return q.MyWWFFRef }},
|
||||
{"distance", "Distance", "Location", func(q *qso.QSO) string { return flt(q.Distance) }},
|
||||
{"rx_pwr", "RX pwr", "QSO", func(q *qso.QSO) string { return flt(q.RXPower) }},
|
||||
{"a_index", "A", "QSO", func(q *qso.QSO) string { return flt(q.AIndex) }},
|
||||
{"k_index", "K", "QSO", func(q *qso.QSO) string { return flt(q.KIndex) }},
|
||||
{"sfi", "SFI", "QSO", func(q *qso.QSO) string { return flt(q.SFI) }},
|
||||
{"skcc", "Skcc", "Awards", func(q *qso.QSO) string { return q.SKCC }},
|
||||
{"fists", "Fists", "Awards", func(q *qso.QSO) string { return q.FISTS }},
|
||||
{"ten_ten", "10-10", "Awards", func(q *qso.QSO) string { return q.TenTen }},
|
||||
{"contacted_op", "Op worked", "QSO", func(q *qso.QSO) string { return q.ContactedOp }},
|
||||
{"eq_call", "Eq call", "QSO", func(q *qso.QSO) string { return q.EqCall }},
|
||||
{"pfx", "Pfx", "Location", func(q *qso.QSO) string { return q.PFX }},
|
||||
{"my_name", "My name", "My station", func(q *qso.QSO) string { return q.MyName }},
|
||||
{"class", "Class", "Contest", func(q *qso.QSO) string { return q.Class }},
|
||||
{"darc_dok", "DOK", "Awards", func(q *qso.QSO) string { return q.DarcDOK }},
|
||||
{"my_darc_dok", "My darc dok", "My station", func(q *qso.QSO) string { return q.MyDarcDOK }},
|
||||
{"region", "Region", "Location", func(q *qso.QSO) string { return q.Region }},
|
||||
{"silent_key", "SK", "QSO", func(q *qso.QSO) string { return q.SilentKey }},
|
||||
{"swl", "Swl", "QSO", func(q *qso.QSO) string { return q.SWL }},
|
||||
{"qso_complete", "Complete", "QSO", func(q *qso.QSO) string { return q.QSOComplete }},
|
||||
{"qso_random", "Random", "QSO", func(q *qso.QSO) string { return q.QSORandom }},
|
||||
{"credit_granted", "Credit granted", "QSL", func(q *qso.QSO) string { return q.CreditGranted }},
|
||||
{"credit_submitted", "Credit sub.", "QSL", func(q *qso.QSO) string { return q.CreditSubmitted }},
|
||||
{"my_arrl_sect", "My arrl sect", "My station", func(q *qso.QSO) string { return q.MyARRLSect }},
|
||||
{"my_vucc_grids", "My vucc grids", "My station", func(q *qso.QSO) string { return q.MyVUCCGrids }},
|
||||
{"award_refs", "Award refs", "Awards", func(q *qso.QSO) string { return q.AwardRefs }},
|
||||
}
|
||||
|
||||
// DefaultColumns is what a fresh configuration publishes — the columns a reader
|
||||
// of someone else's log actually looks for.
|
||||
var DefaultColumns = []string{"date", "time", "callsign", "band", "mode", "rst_sent", "rst_rcvd", "country"}
|
||||
|
||||
// legacyKeys maps the short names the hand-written table used onto the ADIF
|
||||
// names the generated one uses. A configuration saved before this change still
|
||||
// publishes the same columns; without it, three of them would vanish silently on
|
||||
// upgrade, which is the worst way for a setting to change.
|
||||
var legacyKeys = map[string]string{
|
||||
"pota": "pota_ref",
|
||||
"sota": "sota_ref",
|
||||
"station": "station_callsign",
|
||||
}
|
||||
|
||||
func columnsFor(keys []string) []Column {
|
||||
if len(keys) == 0 {
|
||||
keys = DefaultColumns
|
||||
}
|
||||
byKey := make(map[string]Column, len(Columns))
|
||||
for _, c := range Columns {
|
||||
byKey[c.Key] = c
|
||||
}
|
||||
out := make([]Column, 0, len(keys))
|
||||
for _, k := range keys {
|
||||
k = strings.TrimSpace(k)
|
||||
if alias, ok := legacyKeys[k]; ok {
|
||||
k = alias
|
||||
}
|
||||
if c, ok := byKey[k]; ok {
|
||||
out = append(out, c)
|
||||
}
|
||||
}
|
||||
if len(out) == 0 { // every stored key unknown (config from a newer build)
|
||||
return columnsFor(DefaultColumns)
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// KnownColumnKeys lists the offered columns, for the settings UI.
|
||||
func KnownColumnKeys() []Column {
|
||||
out := make([]Column, len(Columns))
|
||||
copy(out, Columns)
|
||||
sort.SliceStable(out, func(i, j int) bool { return false }) // keep declared order
|
||||
return out
|
||||
}
|
||||
|
||||
// Normalise fills in the defaults a half-filled config would otherwise carry
|
||||
// into the renderer.
|
||||
func (c *Config) Normalise() {
|
||||
if c.Format != "csv" {
|
||||
c.Format = "html"
|
||||
}
|
||||
if strings.TrimSpace(c.FileName) == "" {
|
||||
if c.Format == "csv" {
|
||||
c.FileName = "log.csv"
|
||||
} else {
|
||||
c.FileName = "log.html"
|
||||
}
|
||||
}
|
||||
if c.Count <= 0 {
|
||||
c.Count = 100
|
||||
}
|
||||
if c.FTPPort <= 0 {
|
||||
c.FTPPort = 21
|
||||
}
|
||||
if len(c.Columns) == 0 {
|
||||
c.Columns = append([]string{}, DefaultColumns...)
|
||||
}
|
||||
if strings.TrimSpace(c.FTPFileName) == "" {
|
||||
c.FTPFileName = c.FileName
|
||||
}
|
||||
}
|
||||
|
||||
// Render builds the file contents for the given QSOs.
|
||||
func Render(cfg Config, qsos []qso.QSO, stationCall string) ([]byte, error) {
|
||||
cfg.Normalise()
|
||||
cols := columnsFor(cfg.Columns)
|
||||
if cfg.Format == "csv" {
|
||||
return renderCSV(cols, qsos)
|
||||
}
|
||||
return renderHTML(cfg, cols, qsos, stationCall), nil
|
||||
}
|
||||
|
||||
func renderCSV(cols []Column, qsos []qso.QSO) ([]byte, error) {
|
||||
var b strings.Builder
|
||||
w := csv.NewWriter(&b)
|
||||
head := make([]string, len(cols))
|
||||
for i, c := range cols {
|
||||
head[i] = c.Header
|
||||
}
|
||||
if err := w.Write(head); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
row := make([]string, len(cols))
|
||||
for i := range qsos {
|
||||
for j, c := range cols {
|
||||
row[j] = c.Value(&qsos[i])
|
||||
}
|
||||
if err := w.Write(row); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
w.Flush()
|
||||
if err := w.Error(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return []byte(b.String()), nil
|
||||
}
|
||||
|
||||
// renderHTML writes a standalone page: inline CSS, inline sort script, no
|
||||
// external request of any kind.
|
||||
func renderHTML(cfg Config, cols []Column, qsos []qso.QSO, stationCall string) []byte {
|
||||
title := strings.TrimSpace(cfg.Title)
|
||||
if title == "" {
|
||||
if stationCall != "" {
|
||||
title = stationCall + " — log"
|
||||
} else {
|
||||
title = "Log"
|
||||
}
|
||||
}
|
||||
esc := html.EscapeString
|
||||
|
||||
var b strings.Builder
|
||||
b.WriteString(`<!doctype html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width,initial-scale=1">
|
||||
<title>` + esc(title) + `</title>
|
||||
<style>
|
||||
:root{color-scheme:light dark;--bg:#fff;--fg:#16181d;--mut:#5b6270;--line:#e2e5ea;--head:#f4f6f8;--zebra:#fafbfc;--accent:#2a78d6}
|
||||
@media (prefers-color-scheme:dark){:root{--bg:#16181d;--fg:#e6e8ec;--mut:#9aa2b1;--line:#2e343f;--head:#1f232b;--zebra:#1b1f26;--accent:#6da7ec}}
|
||||
*{box-sizing:border-box}
|
||||
body{margin:0;padding:1.5rem 1rem;background:var(--bg);color:var(--fg);
|
||||
font:14px/1.5 system-ui,-apple-system,"Segoe UI",Roboto,sans-serif}
|
||||
.wrap{max-width:1100px;margin:0 auto}
|
||||
h1{margin:0 0 .25rem;font-size:1.35rem}
|
||||
.meta{margin:0 0 1rem;color:var(--mut);font-size:.8rem}
|
||||
.scroll{overflow-x:auto;border:1px solid var(--line);border-radius:8px}
|
||||
table{border-collapse:collapse;width:100%;font-variant-numeric:tabular-nums}
|
||||
th,td{padding:.45rem .6rem;text-align:left;border-bottom:1px solid var(--line);white-space:nowrap}
|
||||
th{position:sticky;top:0;background:var(--head);font-size:.72rem;letter-spacing:.05em;
|
||||
text-transform:uppercase;color:var(--mut);cursor:pointer;user-select:none}
|
||||
th:hover{color:var(--fg)}
|
||||
th::after{content:'';font-size:.7em;opacity:.7}
|
||||
th[data-asc="1"]::after{content:' \25B2'}
|
||||
th[data-asc="0"]::after{content:' \25BC'}
|
||||
tbody tr:nth-child(even){background:var(--zebra)}
|
||||
tbody tr:last-child td{border-bottom:0}
|
||||
td.call{font-family:ui-monospace,Consolas,monospace;font-weight:700;color:var(--accent)}
|
||||
.foot{margin-top:.75rem;color:var(--mut);font-size:.75rem}
|
||||
</style>
|
||||
</head>
|
||||
<body><div class="wrap">
|
||||
<h1>` + esc(title) + `</h1>
|
||||
<p class="meta">` + strconv.Itoa(len(qsos)) + ` QSO · ` + time.Now().UTC().Format("2006-01-02 15:04") + ` UTC</p>
|
||||
<div class="scroll"><table><thead><tr>`)
|
||||
for _, c := range cols {
|
||||
b.WriteString(`<th>` + esc(c.Header) + `</th>`)
|
||||
}
|
||||
b.WriteString(`</tr></thead><tbody>`)
|
||||
for i := range qsos {
|
||||
// The row's position as published. Sorting is a view on top of it, so a
|
||||
// third click can put the table back the way the operator first saw it.
|
||||
b.WriteString(`<tr data-i="` + strconv.Itoa(i) + `">`)
|
||||
for _, c := range cols {
|
||||
cls := ""
|
||||
if c.Key == "callsign" {
|
||||
cls = ` class="call"`
|
||||
}
|
||||
b.WriteString(`<td` + cls + `>` + esc(c.Value(&qsos[i])) + `</td>`)
|
||||
}
|
||||
b.WriteString(`</tr>`)
|
||||
}
|
||||
b.WriteString(`</tbody></table></div>
|
||||
<p class="foot">Generated by OpsLog</p>
|
||||
</div>
|
||||
<script>
|
||||
// Click a header to sort: ascending, descending, then back to the published
|
||||
// order. Kept tiny and dependency-free — the page has to work offline and on any
|
||||
// hosting, so no library is loaded.
|
||||
//
|
||||
// NUM is deliberately strict: the whole cell must be a number. parseFloat alone
|
||||
// accepts a numeric PREFIX, so "2026-08-10" became 2026 and every date in a year
|
||||
// compared equal — the date column looked as though it simply would not sort.
|
||||
// Callsigns starting with a digit (8B81SU) hit the same trap.
|
||||
var NUM=/^[+-]?\d+(\.\d+)?$/;
|
||||
document.querySelectorAll('th').forEach(function(th,i){
|
||||
th.addEventListener('click',function(){
|
||||
var tb=th.closest('table').tBodies[0],
|
||||
rows=Array.prototype.slice.call(tb.rows),
|
||||
cur=th.dataset.asc,
|
||||
next=cur===undefined?'1':(cur==='1'?'0':'');
|
||||
if(next===''){
|
||||
// Third click: restore the order the page was published in.
|
||||
rows.sort(function(a,b){return a.dataset.i-b.dataset.i});
|
||||
}else{
|
||||
var asc=next==='1';
|
||||
rows.sort(function(a,b){
|
||||
var x=a.cells[i].textContent.trim(), y=b.cells[i].textContent.trim();
|
||||
// Blanks always sink, whichever way the column is pointing: an empty
|
||||
// cell is missing data, not the smallest value.
|
||||
if(x===''||y==='') return x===y?0:(x===''?1:-1);
|
||||
var c=NUM.test(x)&&NUM.test(y)?(parseFloat(x)-parseFloat(y)):x.localeCompare(y);
|
||||
return asc?c:-c;
|
||||
});
|
||||
}
|
||||
rows.forEach(function(r){tb.appendChild(r)});
|
||||
th.closest('tr').querySelectorAll('th').forEach(function(o){delete o.dataset.asc});
|
||||
if(next!=='') th.dataset.asc=next;
|
||||
});
|
||||
});
|
||||
</script>
|
||||
</body></html>
|
||||
`)
|
||||
return []byte(b.String())
|
||||
}
|
||||
|
||||
// WriteLocal writes the payload into the configured folder and returns the path.
|
||||
func WriteLocal(cfg Config, data []byte) (string, error) {
|
||||
cfg.Normalise()
|
||||
dir := strings.TrimSpace(cfg.Folder)
|
||||
if dir == "" {
|
||||
return "", fmt.Errorf("no output folder set")
|
||||
}
|
||||
if err := os.MkdirAll(dir, 0o755); err != nil {
|
||||
return "", fmt.Errorf("create %s: %w", dir, err)
|
||||
}
|
||||
path := filepath.Join(dir, cfg.FileName)
|
||||
// Write to a temp file and rename over the target: a reader (or a syncing
|
||||
// client) never sees a half-written page.
|
||||
tmp := path + ".tmp"
|
||||
if err := os.WriteFile(tmp, data, 0o644); err != nil {
|
||||
return "", fmt.Errorf("write %s: %w", tmp, err)
|
||||
}
|
||||
if err := os.Rename(tmp, path); err != nil {
|
||||
_ = os.Remove(tmp)
|
||||
return "", fmt.Errorf("replace %s: %w", path, err)
|
||||
}
|
||||
return path, nil
|
||||
}
|
||||
|
||||
// Upload sends the payload to the configured FTP/FTPS server.
|
||||
func Upload(cfg Config, data []byte) error {
|
||||
cfg.Normalise()
|
||||
host := strings.TrimSpace(cfg.FTPHost)
|
||||
if host == "" {
|
||||
return fmt.Errorf("no FTP server set")
|
||||
}
|
||||
c, err := dial(cfg)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer func() { _ = c.Quit() }()
|
||||
|
||||
if err := c.Login(cfg.FTPUser, cfg.FTPPassword); err != nil {
|
||||
return fmt.Errorf("login as %q: %w", cfg.FTPUser, err)
|
||||
}
|
||||
if dir := strings.TrimSpace(cfg.FTPFolder); dir != "" {
|
||||
if err := c.ChangeDir(dir); err != nil {
|
||||
return fmt.Errorf("enter remote folder %q: %w", dir, err)
|
||||
}
|
||||
}
|
||||
if err := c.Stor(cfg.FTPFileName, strings.NewReader(string(data))); err != nil {
|
||||
return fmt.Errorf("upload %q: %w", cfg.FTPFileName, err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func dial(cfg Config) (*ftp.ServerConn, error) {
|
||||
addr := fmt.Sprintf("%s:%d", strings.TrimSpace(cfg.FTPHost), cfg.FTPPort)
|
||||
opts := []ftp.DialOption{ftp.DialWithTimeout(20 * time.Second)}
|
||||
if cfg.FTPTLS {
|
||||
// Explicit FTPS (AUTH TLS), the form virtually every web host offers.
|
||||
// InsecureSkipVerify is NOT set: a certificate that does not validate is
|
||||
// a real warning, and silently accepting it would defeat the point of
|
||||
// ticking the TLS box in the first place.
|
||||
opts = append(opts, ftp.DialWithExplicitTLS(&tls.Config{ServerName: strings.TrimSpace(cfg.FTPHost)}))
|
||||
}
|
||||
c, err := ftp.Dial(addr, opts...)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("connect to %s: %w", addr, err)
|
||||
}
|
||||
return c, nil
|
||||
}
|
||||
|
||||
// Test connects, logs in and enters the remote folder without uploading — the
|
||||
// "Test connection" button. Returns a short human-readable success line.
|
||||
func Test(cfg Config) (string, error) {
|
||||
cfg.Normalise()
|
||||
c, err := dial(cfg)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
defer func() { _ = c.Quit() }()
|
||||
if err := c.Login(cfg.FTPUser, cfg.FTPPassword); err != nil {
|
||||
return "", fmt.Errorf("login as %q: %w", cfg.FTPUser, err)
|
||||
}
|
||||
if dir := strings.TrimSpace(cfg.FTPFolder); dir != "" {
|
||||
if err := c.ChangeDir(dir); err != nil {
|
||||
return "", fmt.Errorf("enter remote folder %q: %w", dir, err)
|
||||
}
|
||||
}
|
||||
cwd, _ := c.CurrentDir()
|
||||
return "connected — remote folder " + cwd, nil
|
||||
}
|
||||
@@ -0,0 +1,49 @@
|
||||
package webpub
|
||||
|
||||
import (
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"hamlog/internal/qso"
|
||||
)
|
||||
|
||||
// The published page carries its own sort script, so a regression there is
|
||||
// silent: the table still renders, it just sorts wrongly. These pin the two
|
||||
// things that were actually broken in the field.
|
||||
|
||||
func renderSample(t *testing.T) string {
|
||||
t.Helper()
|
||||
cfg := Config{Columns: []string{"qso_date", "callsign", "freq"}}
|
||||
cfg.Normalise()
|
||||
qsos := []qso.QSO{
|
||||
{Callsign: "8B81SU", QSODate: time.Date(2026, 8, 10, 9, 56, 0, 0, time.UTC)},
|
||||
{Callsign: "LZ8NG", QSODate: time.Date(2025, 12, 31, 23, 1, 0, 0, time.UTC)},
|
||||
}
|
||||
return string(renderHTML(cfg, columnsFor(cfg.Columns), qsos, "F4BPO"))
|
||||
}
|
||||
|
||||
// A third click restores the published order, which is only possible if each row
|
||||
// remembers where it started.
|
||||
func TestRowsCarryTheirPublishedIndex(t *testing.T) {
|
||||
html := renderSample(t)
|
||||
for _, want := range []string{`<tr data-i="0">`, `<tr data-i="1">`} {
|
||||
if !strings.Contains(html, want) {
|
||||
t.Errorf("published page is missing %s — the reset-to-original click cannot work", want)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// parseFloat accepts a numeric PREFIX, so "2026-08-10" became 2026 and every
|
||||
// date in the same year compared equal: the Date column looked unsortable.
|
||||
// Callsigns starting with a digit ("8B81SU") hit the same trap. The whole cell
|
||||
// must match for a numeric comparison to be used.
|
||||
func TestSortScriptRejectsNumericPrefixes(t *testing.T) {
|
||||
html := renderSample(t)
|
||||
if !strings.Contains(html, `var NUM=/^[+-]?\d+(\.\d+)?$/;`) {
|
||||
t.Error("the anchored numeric test is gone; a bare parseFloat makes dates and 8-prefixed calls sort as equal")
|
||||
}
|
||||
if strings.Contains(html, "n=!isNaN(nx)&&!isNaN(ny)") {
|
||||
t.Error("the old prefix-tolerant numeric detection is back")
|
||||
}
|
||||
}
|
||||
@@ -67,6 +67,17 @@ func acquireInstance(postUpdate bool) bool {
|
||||
return false
|
||||
}
|
||||
|
||||
// processStart is stamped on the very first instruction of main, before the
|
||||
// single-instance guard and before anything else runs.
|
||||
//
|
||||
// It exists to split a slow launch in two, because the log alone could not: the
|
||||
// first line applog writes already sits inside startup(), so everything spent
|
||||
// loading the binary and creating the WebView2 environment happened before the
|
||||
// log begins and was invisible. An operator reporting "nothing happens for three
|
||||
// seconds" was impossible to answer from a file whose first timestamp is the
|
||||
// moment the app was already running.
|
||||
var processStart = time.Now()
|
||||
|
||||
func main() {
|
||||
// Single-instance guard: if OpsLog is already running, focus that window and
|
||||
// exit instead of spawning a duplicate. A second process would open its own
|
||||
|
||||
+1
-1
@@ -21,7 +21,7 @@ import (
|
||||
|
||||
const (
|
||||
// appVersion is stamped on every heartbeat (and could feed the About box).
|
||||
appVersion = "0.23.3"
|
||||
appVersion = "0.24.5"
|
||||
|
||||
// posthogHost is the PostHog ingestion endpoint. EU cloud by default; change
|
||||
// to https://us.i.posthog.com for a US project.
|
||||
|
||||
@@ -150,16 +150,56 @@ func (a *App) DownloadAndApplyUpdate(url string) error {
|
||||
// Swap: rename the running exe out of the way (Windows allows renaming a
|
||||
// running image), move the new one into its place, then relaunch. Roll back if
|
||||
// the second rename fails so we never end up with no exe.
|
||||
oldExe := exe + ".old"
|
||||
_ = os.Remove(oldExe)
|
||||
if err := os.Rename(exe, oldExe); err != nil {
|
||||
_ = os.Remove(newExe)
|
||||
return fmt.Errorf("stage current exe: %w", err)
|
||||
//
|
||||
// The staging name is UNIQUE, not a fixed ".old". With a fixed name, one
|
||||
// leftover that could not be deleted — an antivirus holding it open is the
|
||||
// usual reason — poisoned every later update: the rename replaces its target,
|
||||
// the target was locked, and the operator got "stage current exe: … Accès
|
||||
// refusé" for ever with no way out but deleting the file by hand.
|
||||
oldExe := fmt.Sprintf("%s.old-%d", exe, time.Now().UnixNano())
|
||||
var stageErr error
|
||||
staged := false
|
||||
// Retry briefly: a real-time scanner opens the file it has just seen written
|
||||
// and holds it for a moment, so the first attempt lands exactly in that window.
|
||||
for attempt := 0; attempt < 5; attempt++ {
|
||||
if stageErr = os.Rename(exe, oldExe); stageErr == nil {
|
||||
staged = true
|
||||
break
|
||||
}
|
||||
time.Sleep(time.Duration(150*(attempt+1)) * time.Millisecond)
|
||||
}
|
||||
|
||||
if staged {
|
||||
if err := os.Rename(newExe, exe); err != nil {
|
||||
_ = os.Rename(oldExe, exe) // roll back
|
||||
return fmt.Errorf("install new exe: %w", err)
|
||||
}
|
||||
} else {
|
||||
// Could not rename our own running image at all. Some endpoint protection
|
||||
// (Bitdefender's ransomware remediation among them) blocks precisely that,
|
||||
// and no amount of retrying gets past it.
|
||||
//
|
||||
// So don't fight it: leave the new build beside the old one and let the
|
||||
// relaunch helper do the swap AFTER this process has exited, when the file
|
||||
// is no longer a running image. Reported by several operators, all with the
|
||||
// same "Accès refusé" on the staging rename.
|
||||
applog.Printf("update: cannot rename the running exe (%v) — deferring the swap to after exit", stageErr)
|
||||
pending := exe + ".new"
|
||||
_ = os.Remove(pending)
|
||||
if err := os.Rename(newExe, pending); err != nil {
|
||||
_ = os.Remove(newExe)
|
||||
return fmt.Errorf("stage new exe: %w (the folder %s must be writable, and an antivirus may be holding OpsLog.exe)", err, dir)
|
||||
}
|
||||
if err := a.scheduleDeferredSwap(exe, pending); err != nil {
|
||||
return err
|
||||
}
|
||||
if a.ctx != nil {
|
||||
wruntime.Quit(a.ctx)
|
||||
} else {
|
||||
os.Exit(0)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
// Clear the "downloaded from the internet" mark (NTFS Zone.Identifier stream).
|
||||
// Otherwise Windows SmartScreen wants to prompt "are you sure you want to open
|
||||
// this?" — but since we launch the exe programmatically that prompt never shows,
|
||||
@@ -189,6 +229,46 @@ func (a *App) DownloadAndApplyUpdate(url string) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
// scheduleDeferredSwap hands the exe swap to a detached helper that runs AFTER
|
||||
// this process is gone.
|
||||
//
|
||||
// The fallback for when the running image cannot be renamed at all. Once OpsLog
|
||||
// has exited its exe is an ordinary file again, so the move that was refused a
|
||||
// moment earlier succeeds — and the helper keeps trying for ten seconds, because
|
||||
// an antivirus that was holding the file usually lets go a beat after the
|
||||
// process dies rather than instantly.
|
||||
//
|
||||
// OpsLog is restarted either way. If the move failed, that starts the OLD build
|
||||
// — the update simply has not applied — and the operator keeps a working logger
|
||||
// instead of having it vanish mid-session, which for someone in a QSO is worse
|
||||
// than an update that waits. Only a successful swap passes --post-update, so a
|
||||
// failure leaves the .new file in place for the next attempt rather than having
|
||||
// the cleanup delete the download.
|
||||
func (a *App) scheduleDeferredSwap(exe, pending string) error {
|
||||
// Clear the "downloaded from the internet" mark before it becomes the exe —
|
||||
// SmartScreen silently blocks a programmatic launch of a marked file, and the
|
||||
// mark follows the file across the move.
|
||||
_ = os.Remove(pending + ":Zone.Identifier")
|
||||
|
||||
q := func(s string) string { return strings.ReplaceAll(s, "'", "''") }
|
||||
ps := fmt.Sprintf(
|
||||
"Wait-Process -Id %d -ErrorAction SilentlyContinue; "+
|
||||
"$ok=$false; "+
|
||||
"for ($i=0; $i -lt 40; $i++) { "+
|
||||
"try { Move-Item -LiteralPath '%s' -Destination '%s' -Force -ErrorAction Stop; $ok=$true; break } "+
|
||||
"catch { Start-Sleep -Milliseconds 250 } }; "+
|
||||
"if ($ok) { Start-Process -FilePath '%s' -ArgumentList '--post-update' } "+
|
||||
"else { Start-Process -FilePath '%s' }",
|
||||
os.Getpid(), q(pending), q(exe), q(exe), q(exe))
|
||||
cmd := exec.Command("powershell", "-NoProfile", "-WindowStyle", "Hidden", "-Command", ps)
|
||||
cmd.SysProcAttr = &syscall.SysProcAttr{HideWindow: true, CreationFlags: 0x08000000} // CREATE_NO_WINDOW
|
||||
if err := cmd.Start(); err != nil {
|
||||
return fmt.Errorf("schedule the update swap: %w", err)
|
||||
}
|
||||
applog.Printf("update: swap scheduled for after exit (%s → %s)", filepath.Base(pending), filepath.Base(exe))
|
||||
return nil
|
||||
}
|
||||
|
||||
// downloadWithProgress streams url into dest, emitting "update:progress" (0-100).
|
||||
func (a *App) downloadWithProgress(url, dest string) error {
|
||||
client := &http.Client{Timeout: 10 * time.Minute}
|
||||
@@ -274,12 +354,27 @@ func extractExeFromZip(zipPath, dir string) (string, error) {
|
||||
return "", fmt.Errorf("no .exe inside the archive")
|
||||
}
|
||||
|
||||
// cleanupOldUpdateBinary removes the previous exe left behind by a self-update
|
||||
// (exe + ".old"). Called at startup after a --post-update relaunch. Best-effort:
|
||||
// the file may still be briefly locked, in which case the next launch gets it.
|
||||
// cleanupOldUpdateBinary removes what a self-update left behind. Called at
|
||||
// startup after a --post-update relaunch. Best-effort throughout: a file may
|
||||
// still be locked by a scanner, and the next launch will get it.
|
||||
//
|
||||
// Sweeps a PATTERN, not one name. Staging uses a unique ".old-<nanos>" precisely
|
||||
// so a locked leftover cannot block the next update, which means leftovers
|
||||
// accumulate unless something collects them — and the pre-0.24.1 ".old" may be
|
||||
// sitting there too, from the very update that could not delete it.
|
||||
func cleanupOldUpdateBinary() {
|
||||
if exe, err := os.Executable(); err == nil {
|
||||
_ = os.Remove(exe + ".old")
|
||||
exe, err := os.Executable()
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
_ = os.Remove(exe + ".old") // the old fixed name
|
||||
_ = os.Remove(exe + ".new") // a deferred swap that has been applied
|
||||
matches, err := filepath.Glob(exe + ".old-*")
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
for _, m := range matches {
|
||||
_ = os.Remove(m)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+229
@@ -0,0 +1,229 @@
|
||||
package main
|
||||
|
||||
// Web publishing — the Wails boundary for internal/webpub, plus the scheduling.
|
||||
//
|
||||
// Two triggers, deliberately: a QSO is logged, or the periodic timer fires.
|
||||
// Both go through publishSoon, which DEBOUNCES: a run of contacts must not
|
||||
// produce one FTP session per QSO, and a page that is fifteen seconds stale is
|
||||
// indistinguishable from a live one to anybody reading it on the web.
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"hamlog/internal/applog"
|
||||
"hamlog/internal/qso"
|
||||
"hamlog/internal/webpub"
|
||||
|
||||
wruntime "github.com/wailsapp/wails/v2/pkg/runtime"
|
||||
)
|
||||
|
||||
// publishDebounce is how long a publish request waits for company. Long enough
|
||||
// to fold a burst of logging into one upload, short enough that the page looks
|
||||
// live to a reader who just heard you on the air.
|
||||
const publishDebounce = 15 * time.Second
|
||||
|
||||
type webPublisher struct {
|
||||
mu sync.Mutex
|
||||
timer *time.Timer
|
||||
ticker *time.Ticker
|
||||
tickStp chan struct{}
|
||||
last time.Time
|
||||
lastErr string
|
||||
}
|
||||
|
||||
// WebPublishStatus is what the settings panel shows under the buttons.
|
||||
//
|
||||
// No column list here: the panel gets that from WebPublishColumns(). An
|
||||
// anonymous struct in a bound type also breaks the Wails generator, which has
|
||||
// no name to emit for it.
|
||||
type WebPublishStatus struct {
|
||||
LastRun string `json:"last_run"` // "" = never this session
|
||||
LastErr string `json:"last_err"`
|
||||
}
|
||||
|
||||
// GetWebPublishConfig reads the stored configuration (defaults applied).
|
||||
func (a *App) GetWebPublishConfig() (webpub.Config, error) {
|
||||
var cfg webpub.Config
|
||||
if a.settings == nil {
|
||||
cfg.Normalise()
|
||||
return cfg, fmt.Errorf("db not initialized")
|
||||
}
|
||||
raw, err := a.settings.Get(a.ctx, keyWebPublish)
|
||||
if err == nil && strings.TrimSpace(raw) != "" {
|
||||
// A locked vault hands back "" rather than ciphertext — that reads as "not
|
||||
// configured", which is exactly right here: publishing must not run with a
|
||||
// password we cannot decrypt.
|
||||
_ = json.Unmarshal([]byte(raw), &cfg)
|
||||
}
|
||||
cfg.Normalise()
|
||||
return cfg, nil
|
||||
}
|
||||
|
||||
// SaveWebPublishConfig persists it and restarts the periodic timer.
|
||||
func (a *App) SaveWebPublishConfig(cfg webpub.Config) error {
|
||||
if a.settings == nil {
|
||||
return fmt.Errorf("db not initialized")
|
||||
}
|
||||
cfg.Normalise()
|
||||
b, err := json.Marshal(cfg)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if err := a.settings.Set(a.ctx, keyWebPublish, string(b)); err != nil {
|
||||
return err
|
||||
}
|
||||
a.restartWebPublishTimer()
|
||||
return nil
|
||||
}
|
||||
|
||||
// WebPublishColumns lists the offered columns for the picker.
|
||||
func (a *App) WebPublishColumns() []map[string]string {
|
||||
cols := webpub.KnownColumnKeys()
|
||||
out := make([]map[string]string, 0, len(cols))
|
||||
for _, c := range cols {
|
||||
out = append(out, map[string]string{"key": c.Key, "header": c.Header})
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// TestWebPublishFTP validates the server settings without uploading anything.
|
||||
func (a *App) TestWebPublishFTP(cfg webpub.Config) (string, error) {
|
||||
return webpub.Test(cfg)
|
||||
}
|
||||
|
||||
// PublishLogNow renders and publishes immediately, ignoring the debounce, and
|
||||
// reports what happened. This is the "Publish now" button: the operator is
|
||||
// waiting on the answer, so it runs synchronously and returns the real error.
|
||||
func (a *App) PublishLogNow() (string, error) {
|
||||
cfg, _ := a.GetWebPublishConfig()
|
||||
return a.publish(cfg)
|
||||
}
|
||||
|
||||
// publish does the work: read the QSOs, render, write locally, then upload.
|
||||
//
|
||||
// Local FIRST and upload second, always. A network failure then leaves a good
|
||||
// file on disk that the operator can publish another way, instead of a
|
||||
// truncated one on the server.
|
||||
func (a *App) publish(cfg webpub.Config) (string, error) {
|
||||
if a.qso == nil {
|
||||
return "", fmt.Errorf("logbook not ready")
|
||||
}
|
||||
cfg.Normalise()
|
||||
qsos, err := a.qso.List(a.ctx, qso.ListFilter{Limit: cfg.Count})
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("read the log: %w", err)
|
||||
}
|
||||
station := ""
|
||||
if p, perr := a.profiles.Active(a.ctx); perr == nil {
|
||||
station = p.Callsign
|
||||
}
|
||||
data, err := webpub.Render(cfg, qsos, station)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("build the page: %w", err)
|
||||
}
|
||||
path, err := webpub.WriteLocal(cfg, data)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
msg := fmt.Sprintf("%d QSO → %s", len(qsos), path)
|
||||
if cfg.FTPEnabled {
|
||||
if err := webpub.Upload(cfg, data); err != nil {
|
||||
// The local file IS written — say so, so the operator knows the failure
|
||||
// is the transfer and not the export.
|
||||
return msg, fmt.Errorf("written locally, but the upload failed: %w", err)
|
||||
}
|
||||
msg += fmt.Sprintf(" → ftp://%s/%s", cfg.FTPHost, strings.TrimPrefix(cfg.FTPFolder+"/"+cfg.FTPFileName, "/"))
|
||||
}
|
||||
return msg, nil
|
||||
}
|
||||
|
||||
// publishSoon schedules a debounced publish. Called on every logged QSO.
|
||||
func (a *App) publishSoon() {
|
||||
cfg, _ := a.GetWebPublishConfig()
|
||||
if !cfg.Enabled {
|
||||
return
|
||||
}
|
||||
a.webpub.mu.Lock()
|
||||
defer a.webpub.mu.Unlock()
|
||||
if a.webpub.timer != nil {
|
||||
a.webpub.timer.Stop()
|
||||
}
|
||||
a.webpub.timer = time.AfterFunc(publishDebounce, a.publishNowBackground)
|
||||
}
|
||||
|
||||
// publishNowBackground runs a scheduled publish and records the outcome for the
|
||||
// settings panel. Never surfaces a dialog: this fires while the operator is
|
||||
// working, and a web server that is down must not interrupt logging.
|
||||
func (a *App) publishNowBackground() {
|
||||
cfg, _ := a.GetWebPublishConfig()
|
||||
if !cfg.Enabled {
|
||||
return
|
||||
}
|
||||
msg, err := a.publish(cfg)
|
||||
a.webpub.mu.Lock()
|
||||
a.webpub.last = time.Now()
|
||||
if err != nil {
|
||||
a.webpub.lastErr = err.Error()
|
||||
} else {
|
||||
a.webpub.lastErr = ""
|
||||
}
|
||||
a.webpub.mu.Unlock()
|
||||
if err != nil {
|
||||
applog.Printf("webpublish: %v", err)
|
||||
} else {
|
||||
applog.Printf("webpublish: %s", msg)
|
||||
}
|
||||
if a.ctx != nil {
|
||||
wruntime.EventsEmit(a.ctx, "webpublish:done", msg)
|
||||
}
|
||||
}
|
||||
|
||||
// GetWebPublishStatus reports the last run for the settings panel.
|
||||
func (a *App) GetWebPublishStatus() WebPublishStatus {
|
||||
var st WebPublishStatus
|
||||
a.webpub.mu.Lock()
|
||||
if !a.webpub.last.IsZero() {
|
||||
st.LastRun = a.webpub.last.UTC().Format("2006-01-02 15:04:05") + " UTC"
|
||||
}
|
||||
st.LastErr = a.webpub.lastErr
|
||||
a.webpub.mu.Unlock()
|
||||
return st
|
||||
}
|
||||
|
||||
// restartWebPublishTimer (re)arms the periodic refresh from the saved interval.
|
||||
// Stopped and rebuilt on every save, so a changed interval takes effect at once
|
||||
// rather than after the old one has fired.
|
||||
func (a *App) restartWebPublishTimer() {
|
||||
a.webpub.mu.Lock()
|
||||
if a.webpub.tickStp != nil {
|
||||
close(a.webpub.tickStp)
|
||||
a.webpub.tickStp = nil
|
||||
}
|
||||
a.webpub.mu.Unlock()
|
||||
|
||||
cfg, _ := a.GetWebPublishConfig()
|
||||
if !cfg.Enabled || cfg.IntervalMin <= 0 {
|
||||
return
|
||||
}
|
||||
stop := make(chan struct{})
|
||||
a.webpub.mu.Lock()
|
||||
a.webpub.tickStp = stop
|
||||
a.webpub.mu.Unlock()
|
||||
|
||||
go func(every time.Duration) {
|
||||
t := time.NewTicker(every)
|
||||
defer t.Stop()
|
||||
for {
|
||||
select {
|
||||
case <-stop:
|
||||
return
|
||||
case <-t.C:
|
||||
a.publishNowBackground()
|
||||
}
|
||||
}
|
||||
}(time.Duration(cfg.IntervalMin) * time.Minute)
|
||||
}
|
||||
@@ -6,19 +6,54 @@ export modes.
|
||||
|
||||
## Import
|
||||
|
||||
Import an `.adi` / `.adif` file into the active profile's logbook. On import,
|
||||
OpsLog parses every field, maps standard fields to columns and keeps unknown but
|
||||
valid ADIF fields in a per-QSO **extras** store (editable later). Country /
|
||||
zones are enriched from `cty.dat` where missing. A file **without a header**
|
||||
(records pasted from another log) imports fine.
|
||||
**File → Import** (`Ctrl+O`) → pick an `.adi` / `.adif` file → the **Import ADIF**
|
||||
dialog opens with the options below. Import runs into the **active profile's**
|
||||
logbook. A file **without a header** (records pasted from another log) imports
|
||||
fine. Progress shows live; a summary follows — imported / updated / duplicates /
|
||||
skipped / total — with expandable **error** and **duplicate** lists.
|
||||
|
||||
- **Field remapping**: the import dialog can move a field as it reads it —
|
||||
e.g. the RSGB IOTA contest exports the island reference in `STATE`; add a
|
||||
`STATE → IOTA` row and it lands where the award looks.
|
||||
- **Fill from profile**: optionally stamps your station fields *and* your
|
||||
default confirmation statuses (paper QSL, LoTW, eQSL, Club Log, HRDLog,
|
||||
QRZ.com) on QSOs the file leaves empty — a WSJT-X log carries almost none.
|
||||
Existing values are never overwritten.
|
||||
### Duplicate handling
|
||||
|
||||
A **duplicate** is a record with the same **callsign + UTC minute + band + mode**
|
||||
as a QSO already in the logbook. Pick how they are treated:
|
||||
|
||||
| Mode | What it does |
|
||||
|------|--------------|
|
||||
| **Skip duplicates** *(default)* | Adds only new QSOs; existing ones left untouched. Safe default. |
|
||||
| **Update duplicates** | Merges the file's non-empty fields (QSL / LoTW / eQSL / QRZ statuses & dates, etc.) onto the matching QSO — fields the file omits are kept. Use to re-sync from Log4OM or LoTW. |
|
||||
| **Import everything** | Inserts every record, duplicates included. For deliberately merging two overlapping logs. |
|
||||
|
||||
### Enrichment options
|
||||
|
||||
- **Fix country & zones (cty.dat + ClubLog)** *(on by default)* — recompute
|
||||
Country, DXCC and CQ/ITU zones from `cty.dat`, overriding the file. Corrects
|
||||
what contest software exports wrong (e.g. RG2Y tagged Asiatic instead of
|
||||
European Russia). ClubLog's date-ranged DXpedition overrides are applied on top
|
||||
per QSO date (e.g. TO2A in 2012 → French Guiana) whenever the ClubLog data is
|
||||
downloaded. Everything else in the ADIF is kept as-is. *Tip: combine with
|
||||
**Update duplicates** to re-fix QSOs already in your log.*
|
||||
- **Fill my station fields from my profile** *(off by default)* — backfill empty
|
||||
`MY_*` fields (grid, rig, antenna, address, city, state, county, SOTA/POTA ref,
|
||||
TX power…) plus Operator and Owner callsign from the active profile. Existing
|
||||
values are kept; only `STATION_CALLSIGN` is left untouched so a mixed-call log
|
||||
isn't re-routed. It **also** stamps your default confirmation statuses (paper
|
||||
QSL, LoTW, eQSL, Club Log, HRDLog, QRZ.com — sent & received) on QSOs the file
|
||||
leaves empty. Enable when importing **your own** log; leave off for someone
|
||||
else's.
|
||||
|
||||
### Field remapping (move fields on import)
|
||||
|
||||
Contest software stores the exchange where its own module keeps it. The RSGB IOTA
|
||||
contest, for example, exports the island reference in `STATE` — imported as-is it
|
||||
becomes a US state and the IOTA award stays empty. Click **"The file puts a field
|
||||
in the wrong place…"**, then add a `STATE → IOTA` row (add as many rows as you
|
||||
need). The destination is filled **only where the file left it blank**.
|
||||
|
||||
### Unknown fields
|
||||
|
||||
Any valid ADIF field OpsLog doesn't promote to a column is preserved in a per-QSO
|
||||
**extras** store — editable later and re-exported intact. Nothing valid is
|
||||
dropped.
|
||||
|
||||
## Export
|
||||
|
||||
@@ -41,4 +76,7 @@ not lose your award-reference assignments.
|
||||
|
||||
- To move a batch of QSOs between logs, export selected → import into the other
|
||||
profile.
|
||||
- Re-syncing statuses from another logger (Log4OM, LoTW, QRZ)? Import the file
|
||||
with **Update duplicates** — it merges the new confirmations onto your existing
|
||||
QSOs without creating copies.
|
||||
- Use **Find duplicates** (Tools) after importing to catch overlaps.
|
||||
|
||||
Reference in New Issue
Block a user