Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
284ee4ba7c | ||
|
|
10ef984962 | ||
|
|
bd8719ce99 | ||
|
|
5e38319379 | ||
|
|
7e7ad50f60 | ||
|
|
0f4e31853b | ||
|
|
c222468021 | ||
|
|
2fb4a4d0ce | ||
|
|
e4828482c4 | ||
|
|
8acfda4e42 | ||
|
|
db24c38e63 | ||
|
|
06868e9ed1 | ||
|
|
3ed643e072 | ||
|
|
f0f9898f7c | ||
|
|
73cae855ed | ||
|
|
de3a115ca6 | ||
|
|
1d7633484b | ||
|
|
5ee0ade54b | ||
|
|
e637f0814d | ||
|
|
1a169fdb4f | ||
|
|
3dc31697cd | ||
|
|
242a68080a | ||
|
|
8c7e1c1a3d | ||
|
|
47ddbed665 | ||
|
|
fd7ae77a61 | ||
|
|
3e794f57e0 | ||
|
|
30f74583ff | ||
|
|
f7b9aa2181 | ||
|
|
766b0f95a4 | ||
|
|
8bc4ed68d4 | ||
|
|
d534825e92 | ||
|
|
08d6492df1 | ||
|
|
a156b6ad10 | ||
|
|
3bb92f79b2 | ||
|
|
65cae0d822 | ||
|
|
b24f880d62 | ||
|
|
ef71ddb648 | ||
|
|
0143a84cee | ||
|
|
82721110ed | ||
|
|
aec363b152 | ||
|
|
9a21c936b1 |
@@ -402,6 +402,7 @@ const (
|
||||
|
||||
keyExtLoTWTQSLPath = "extsvc.lotw.tqsl_path"
|
||||
keyExtLoTWStationLoc = "extsvc.lotw.station_location"
|
||||
keyExtLoTWQSLDetail = "extsvc.lotw.qsl_detail" // ask LoTW for the QSL dates and station details (an order of magnitude slower)
|
||||
keyExtLoTWAllCalls = "extsvc.lotw.download_all_calls" // download confirmations for EVERY call on the account, not just this profile's
|
||||
keyExtLoTWForceCall = "extsvc.lotw.force_station_callsign" // override STATION_CALLSIGN at sign time (e.g. F4BPO/P on the F4BPO cert)
|
||||
keyExtLoTWKeyPassword = "extsvc.lotw.key_password"
|
||||
@@ -2123,6 +2124,21 @@ func (a *App) saveWindowState() {
|
||||
// position — which options can't express — remains, and it is set here while the
|
||||
// window is still hidden, so there is no visible jump. Nothing to do for a
|
||||
// maximised or first-run window.
|
||||
// moveWindowTo places the window at an ABSOLUTE desktop coordinate — the same
|
||||
// coordinate system WindowGetPosition reports and window.json stores.
|
||||
//
|
||||
// Wails' WindowSetPosition is relative to the current monitor's work area (see
|
||||
// windowpos_windows.go), so on a monitor left of the primary one it added that
|
||||
// monitor's negative origin to an already-absolute value and the window walked
|
||||
// one screen further off the desktop at every launch. Fall back to it only when
|
||||
// we cannot place the window ourselves — on the primary monitor the two agree.
|
||||
func (a *App) moveWindowTo(x, y int) {
|
||||
if setWindowPosAbsolute(x, y) {
|
||||
return
|
||||
}
|
||||
wruntime.WindowSetPosition(a.ctx, x, y)
|
||||
}
|
||||
|
||||
func (a *App) restoreWindowPosition() {
|
||||
if a.ctx == nil {
|
||||
return
|
||||
@@ -2150,7 +2166,7 @@ func (a *App) restoreWindowPosition() {
|
||||
return
|
||||
}
|
||||
wruntime.WindowUnmaximise(a.ctx)
|
||||
wruntime.WindowSetPosition(a.ctx, ws.X, ws.Y)
|
||||
a.moveWindowTo(ws.X, ws.Y)
|
||||
wruntime.WindowMaximise(a.ctx)
|
||||
gx, gy := wruntime.WindowGetPosition(a.ctx)
|
||||
applog.Printf("window: re-maximised at the saved corner — now at %d,%d", gx, gy)
|
||||
@@ -2178,10 +2194,13 @@ func (a *App) restoreWindowPosition() {
|
||||
}
|
||||
applog.Printf("window: saved position %d,%d is off every monitor (%s) — moved to %d,%d",
|
||||
ws.X, ws.Y, describeMonitors(monitorRects()), nx, ny)
|
||||
wruntime.WindowSetPosition(a.ctx, nx, ny)
|
||||
a.moveWindowTo(nx, ny)
|
||||
return
|
||||
}
|
||||
wruntime.WindowSetPosition(a.ctx, ws.X, ws.Y)
|
||||
a.moveWindowTo(ws.X, ws.Y)
|
||||
if gx, gy := wruntime.WindowGetPosition(a.ctx); gx != ws.X || gy != ws.Y {
|
||||
applog.Printf("window: asked for %d,%d and the window reports %d,%d", ws.X, ws.Y, gx, gy)
|
||||
}
|
||||
}
|
||||
|
||||
// onSomeMonitor reports whether a window at these coordinates would land on the
|
||||
@@ -6919,6 +6938,28 @@ func (a *App) BulkUpdateField(ids []int64, field, value string) (int64, error) {
|
||||
if field == "freq" {
|
||||
return a.bulkSetFrequency(ids, value)
|
||||
}
|
||||
// The station-side numbers. Bounded so a slip cannot stamp CQ zone 400 on a
|
||||
// thousand rows: DXCC entities stop short of 1000, CQ zones at 40, ITU at 90.
|
||||
// Empty clears (NULL).
|
||||
if field == "my_dxcc" || field == "my_cq_zone" || field == "my_itu_zone" {
|
||||
var vp *int
|
||||
if t := strings.TrimSpace(value); t != "" {
|
||||
v, err := strconv.Atoi(t)
|
||||
max := map[string]int{"my_dxcc": 999, "my_cq_zone": 40, "my_itu_zone": 90}[field]
|
||||
if err != nil || v < 1 || v > max {
|
||||
return 0, fmt.Errorf("%s must be a number between 1 and %d (empty to clear)", field, max)
|
||||
}
|
||||
vp = &v
|
||||
}
|
||||
n, err := a.qso.BulkSetIntField(a.ctx, ids, field, vp)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
if n > 0 {
|
||||
a.invalidateAwardStats()
|
||||
}
|
||||
return n, nil
|
||||
}
|
||||
// Some ADIF fields have no promoted column and live in extras_json
|
||||
// (OWNER_CALLSIGN) — those take the JSON path so the rest of the extras on
|
||||
// each QSO survive the edit.
|
||||
@@ -7233,7 +7274,9 @@ func (a *App) SetCompactMode(on bool) {
|
||||
wruntime.WindowSetMinSize(a.ctx, normalMinW, normalMinH)
|
||||
if a.preCompactValid {
|
||||
wruntime.WindowSetSize(a.ctx, a.preCompactW, a.preCompactH)
|
||||
wruntime.WindowSetPosition(a.ctx, a.preCompactX, a.preCompactY)
|
||||
// Absolute, like the capture — see moveWindowTo. Leaving compact mode on a
|
||||
// monitor left of the primary one moved the window a screen further out.
|
||||
a.moveWindowTo(a.preCompactX, a.preCompactY)
|
||||
if a.preCompactMax {
|
||||
wruntime.WindowMaximise(a.ctx)
|
||||
}
|
||||
@@ -11305,11 +11348,19 @@ func (a *App) runManualUpload(svc extsvc.Service, ids []int64, cfg extsvc.Extern
|
||||
}
|
||||
res, err := extsvc.UploadLoTW(ctx, cfg.LoTW, "", strings.Join(recs, "\n"))
|
||||
if err != nil || !res.OK {
|
||||
msg := res.Message
|
||||
if err != nil {
|
||||
// The DETAIL wins over the error string. UploadLoTW returns both: a
|
||||
// terse error ("no QSOs processed") and a Message carrying TQSL's own
|
||||
// account of what happened to the contacts ("…already uploaded", "…out
|
||||
// of date range"). Taking the error whenever there was one threw the
|
||||
// answer away and showed the operator the half that explains nothing.
|
||||
msg := strings.TrimSpace(res.Message)
|
||||
if msg == "" && err != nil {
|
||||
msg = err.Error()
|
||||
} else if err != nil && !strings.Contains(msg, err.Error()) {
|
||||
msg = msg + " (" + err.Error() + ")"
|
||||
}
|
||||
emit("LoTW upload failed: " + msg)
|
||||
emit(" The station location OpsLog signs with must match the callsign on these contacts, and their dates must fall inside the certificate's validity — TQSL refuses the whole batch otherwise.")
|
||||
// The qslmgr:log console is only visible in the QSL Manager — a failure
|
||||
// triggered from the Recent QSOs right-click was completely silent, which
|
||||
// read as "send to LoTW does nothing". Surface it as a toast too.
|
||||
@@ -11547,14 +11598,18 @@ func (a *App) runManualUpload(svc extsvc.Service, ids []int64, cfg extsvc.Extern
|
||||
// with award-style NEW flags computed against the log's prior confirmations.
|
||||
type ConfirmationItem struct {
|
||||
Callsign string `json:"callsign"`
|
||||
QSODate string `json:"qso_date"` // ISO UTC
|
||||
Band string `json:"band"`
|
||||
Mode string `json:"mode"`
|
||||
Country string `json:"country"`
|
||||
NewDXCC bool `json:"new_dxcc"`
|
||||
NewBand bool `json:"new_band"`
|
||||
NewMode bool `json:"new_mode"` // new mode CLASS (Phone/CW/Digital) for the entity
|
||||
NewSlot bool `json:"new_slot"`
|
||||
// Station is the callsign the QSO was made UNDER, which the download can now
|
||||
// span ("All my callsigns"): a list mixing F4BPO, F4BPO/P and TM2Q says
|
||||
// nothing useful unless each line says which of them it belongs to.
|
||||
Station string `json:"station"`
|
||||
QSODate string `json:"qso_date"` // ISO UTC
|
||||
Band string `json:"band"`
|
||||
Mode string `json:"mode"`
|
||||
Country string `json:"country"`
|
||||
NewDXCC bool `json:"new_dxcc"`
|
||||
NewBand bool `json:"new_band"`
|
||||
NewMode bool `json:"new_mode"` // new mode CLASS (Phone/CW/Digital) for the entity
|
||||
NewSlot bool `json:"new_slot"`
|
||||
}
|
||||
|
||||
// GetSlotStats returns the worked/confirmed slot + DXCC tallies for the QSL
|
||||
@@ -12097,6 +12152,16 @@ func manualRefFor(existing, code string) string {
|
||||
return ""
|
||||
}
|
||||
|
||||
// GetLoTWQSLDetail reports whether the download asks LoTW for the QSL detail.
|
||||
func (a *App) GetLoTWQSLDetail() bool {
|
||||
return a.settingOr(keyExtLoTWQSLDetail, "") == "1"
|
||||
}
|
||||
|
||||
// SetLoTWQSLDetail stores that choice.
|
||||
func (a *App) SetLoTWQSLDetail(on bool) {
|
||||
a.setSetting(keyExtLoTWQSLDetail, map[bool]string{true: "1", false: "0"}[on])
|
||||
}
|
||||
|
||||
// GetLoTWDownloadAllCalls reports whether the LoTW download ignores the
|
||||
// profile's own call and pulls every callsign on the account.
|
||||
func (a *App) GetLoTWDownloadAllCalls() bool {
|
||||
@@ -12212,7 +12277,17 @@ func (a *App) runDownloadConfirmations(ctx context.Context, svc extsvc.Service,
|
||||
emit(fmt.Sprintf("Downloading all LoTW confirmations for %s…", callLabel))
|
||||
}
|
||||
emit(fmt.Sprintf("Window: since=%q → resolved=%q (scope owncall=%q)", since, sinceDate, ownCall))
|
||||
adifText, err := extsvc.DownloadLoTWConfirmations(ctx, nil, cfg.LoTW, sinceDate, ownCall)
|
||||
// The report arrives over minutes, and a window that says nothing while it
|
||||
// does is indistinguishable from one that has hung — which is what it was
|
||||
// being reported as. Every half-megabyte, say how much has landed.
|
||||
// Adding the QSOs LoTW knows and we do not is the one job that needs the
|
||||
// slow report: without the detail those records would come in with no
|
||||
// grid, state or county, and nothing else would ever fill them.
|
||||
detail := addNotFound || a.settingOr(keyExtLoTWQSLDetail, "") == "1"
|
||||
if detail {
|
||||
emit("Asking for the QSL details too — LoTW takes considerably longer to build that report.")
|
||||
}
|
||||
adifText, err := extsvc.DownloadLoTWConfirmations(ctx, nil, cfg.LoTW, sinceDate, ownCall, detail, emit)
|
||||
if err != nil {
|
||||
emit("Download failed: " + err.Error())
|
||||
done(matched, total)
|
||||
@@ -12316,6 +12391,7 @@ func (a *App) runDownloadConfirmations(ctx context.Context, svc extsvc.Service,
|
||||
}
|
||||
it := ConfirmationItem{
|
||||
Callsign: q.Callsign,
|
||||
Station: strings.ToUpper(strings.TrimSpace(rec["station_callsign"])),
|
||||
QSODate: q.QSODate.UTC().Format(time.RFC3339),
|
||||
Band: q.Band,
|
||||
Mode: q.Mode,
|
||||
@@ -14578,6 +14654,36 @@ func (a *App) FlexBackspaceCW(n int) error {
|
||||
return a.cat.FlexDo(func(fc cat.FlexController) error { return fc.BackspaceCW(n) })
|
||||
}
|
||||
|
||||
// TCISendCW keys a CW message through the SunSDR's own macro keyer, so a TCI
|
||||
// station needs no WinKeyer and no second serial port. Text is already
|
||||
// variable-resolved by the UI.
|
||||
func (a *App) TCISendCW(text string) error {
|
||||
if a.cat == nil {
|
||||
return fmt.Errorf("cat not initialized")
|
||||
}
|
||||
err := a.cat.TCICWDo(func(tc cat.TCICWController) error { return tc.SendCW(text) })
|
||||
if err != nil {
|
||||
applog.Printf("tci cw: TCISendCW(%q) failed: %v", text, err)
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
// TCIStopCW aborts whatever the keyer is sending.
|
||||
func (a *App) TCIStopCW() error {
|
||||
if a.cat == nil {
|
||||
return fmt.Errorf("cat not initialized")
|
||||
}
|
||||
return a.cat.TCICWDo(func(tc cat.TCICWController) error { return tc.StopCW() })
|
||||
}
|
||||
|
||||
// TCISetKeySpeed sets the macro keyer speed in WPM.
|
||||
func (a *App) TCISetKeySpeed(wpm int) error {
|
||||
if a.cat == nil {
|
||||
return fmt.Errorf("cat not initialized")
|
||||
}
|
||||
return a.cat.TCICWDo(func(tc cat.TCICWController) error { return tc.SetCWSpeed(wpm) })
|
||||
}
|
||||
|
||||
// IcomStopCW aborts the CW message currently being sent.
|
||||
func (a *App) IcomStopCW() error {
|
||||
if a.cat == nil {
|
||||
|
||||
@@ -24,6 +24,17 @@ func (a *App) GetKenwoodState() cat.KenwoodTXState {
|
||||
return st
|
||||
}
|
||||
|
||||
// SetKenwoodPanelMode sets the operating mode from the panel's mode row —
|
||||
// CW / USB / LSB / DATA (soundcard, DT0) / RTTY (FSK D, DT2).
|
||||
func (a *App) SetKenwoodPanelMode(mode string) error {
|
||||
return a.kenwoodPanelDo(func(k cat.KenwoodPanelController) error { return k.SetKenwoodPanelMode(mode) })
|
||||
}
|
||||
|
||||
// SetKenwoodRITOffset sets the RIT/XIT offset to an absolute value in Hz.
|
||||
func (a *App) SetKenwoodRITOffset(hz int) error {
|
||||
return a.kenwoodPanelDo(func(k cat.KenwoodPanelController) error { return k.SetKenwoodRITOffset(hz) })
|
||||
}
|
||||
|
||||
func (a *App) SetKenwoodPower(w int) error {
|
||||
return a.kenwoodPanelDo(func(k cat.KenwoodPanelController) error { return k.SetKenwoodPower(w) })
|
||||
}
|
||||
|
||||
@@ -1,4 +1,84 @@
|
||||
[
|
||||
{
|
||||
"version": "0.26.24",
|
||||
"date": "",
|
||||
"en": [
|
||||
"TCI (SunSDR): the meter subscription is renewed when the radio announces it is ready — sent only at connect, it could fall inside the initial state dump and be ignored, which left the transmit power and SWR empty. The log now also records the subscription and the first sensor frames, so a report can tell “the radio never sends them” from “they arrived and were dropped”.",
|
||||
"Sending a spot while in split now pre-fills the RX frequency — where the station actually is — instead of the TX frequency, which spotted the pile-up five up from the DX.",
|
||||
"Cluster: NEW SLOT gets its own colour — the sky cyan the panadapter palette already uses for it, clearly apart from POTA green and the yellows. The NEW SLOT and NEW COUNTY filter chips now wear the same colours as the badges they select, and the NEW CALL filter works even when the slot-highlight display option is off.",
|
||||
"Elecraft console: a mode row — CW, USB, LSB, DATA and DATA RTTY. The two DATA buttons set the K3’s submode as well (DATA A for FT8/FT4, FSK D for RTTY): switching to DATA by mode alone kept whatever submode the last session left, which is how a K3 “in DATA” keys FT8 with no audio.",
|
||||
"DX Cluster settings: “I chase POTA” and “I chase SOTA”, on by default. Unticked, the NEW POTA badge, colour and filter disappear — a new-band + new-POTA spot reads NEW BAND alone — and the reference columns stay empty.",
|
||||
"Elecraft console: RIT and XIT use the same control as the Icom and TCI consoles — ± buttons, mouse wheel, typed value, Ctrl+←/→ — and the power slider moves in 1 W steps instead of 5.",
|
||||
"Bulk edit: My DXCC, My CQ zone and My ITU zone join the My-station fields — numbers checked against their real ranges, empty clears."
|
||||
],
|
||||
"fr": [
|
||||
"TCI (SunSDR) : l'abonnement aux mesures est renouvelé quand la radio annonce qu'elle est prête — envoyé seulement à la connexion, il pouvait tomber pendant l'envoi initial de l'état et être ignoré, laissant la puissance et le ROS vides en émission. Le journal enregistre aussi l'abonnement et les premières trames de mesure, pour distinguer « la radio ne les envoie jamais » de « elles arrivaient et étaient perdues ».",
|
||||
"Envoyer un spot en split préremplit désormais la fréquence RX — là où la station se trouve réellement — au lieu de la fréquence TX, qui spottait le pile-up cinq au-dessus du DX.",
|
||||
"Cluster : NOUVEAU SLOT reçoit sa propre couleur — le cyan ciel que la palette du panadapter lui donne déjà, bien distinct du vert POTA et des jaunes. Les puces de filtre NOUVEAU SLOT et NOUVEAU COMTÉ portent désormais les couleurs des badges qu'elles sélectionnent, et le filtre NOUVEAU CALL fonctionne même quand l'option de surlignage par slot est désactivée.",
|
||||
"Console Elecraft : une rangée de modes — CW, USB, LSB, DATA et DATA RTTY. Les deux boutons DATA règlent aussi le sous-mode du K3 (DATA A pour FT8/FT4, FSK D pour le RTTY) : passer en DATA par le seul mode gardait le sous-mode de la session précédente, et un K3 « en DATA » manipulait le FT8 sans audio.",
|
||||
"Réglages DX Cluster : « Je chasse le POTA » et « Je chasse le SOTA », cochés par défaut. Décochés, le badge, la couleur et le filtre NOUVEAU POTA disparaissent — un spot nouvelle bande + nouveau POTA affiche seulement NOUVELLE BANDE — et les colonnes de références restent vides.",
|
||||
"Console Elecraft : le RIT et le XIT utilisent la même commande que les consoles Icom et TCI — boutons ±, molette, valeur tapée, Ctrl+←/→ — et le curseur de puissance avance par pas de 1 W au lieu de 5.",
|
||||
"Édition groupée : My DXCC, My CQ zone et My ITU zone rejoignent les champs Ma station — valeurs vérifiées contre leurs bornes réelles, vide efface."
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "0.26.23",
|
||||
"date": "",
|
||||
"en": [
|
||||
"LoTW: the downloaded confirmations list gains a Station column, so a list spanning several callsigns says which one each confirmation belongs to. Shown only when the report actually carries more than the one station.",
|
||||
"The band maps follow your IARU region (Settings → General): Region 2’s 40 m runs to 7300 kHz with phone from 7125 and its 80 m to 4000, Region 3’s 80 m to 3900 — the band edges and the CW/digital/phone shading all adjust."
|
||||
],
|
||||
"fr": [
|
||||
"LoTW : la liste des confirmations téléchargées gagne une colonne Station, pour savoir à quel indicatif appartient chaque confirmation quand le téléchargement en couvre plusieurs. Affichée seulement si le rapport en contient effectivement.",
|
||||
"Les cartes de bande suivent votre région IARU (Réglages → Général) : le 40 m de la Région 2 va jusqu'à 7300 kHz avec la phonie dès 7125 et son 80 m jusqu'à 4000, le 80 m de la Région 3 jusqu'à 3900 — les limites de bande et les zones CW/numérique/phonie s'ajustent."
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "0.26.22",
|
||||
"date": "",
|
||||
"en": [
|
||||
"LoTW download: the QSL details (QSL date, grid, state, county) are now optional and off by default — LoTW takes about ten times longer to build that report, twenty minutes against two on the same account, and marking a confirmation needs none of it. Still asked for automatically when adding the QSOs not found in the log.",
|
||||
"Band map: the tooltip now also names a new prefix or a new grid square. They stay off the 22-pixel colour strip, but leaving them out of the text made the two panels look as though they disagreed — the cluster said NEW PFX about a spot the map called Worked, and both were right. The map’s “Worked” also says whose: it is the ENTITY that was worked on that band and mode, not the callsign, which is what made the two readings look contradictory.",
|
||||
"TCI (SunSDR): clicking a cluster spot no longer needs a second click to get the mode right — the sideband was chosen from the frequency the radio had last reported instead of the one just asked for. The log also names the ExpertSDR version now, and says so when it is older than the 1.5 that panorama spots need.",
|
||||
"Two screens: OpsLog no longer walks off the desktop. On a monitor placed left of the primary one, the saved position was being added to that monitor’s own origin at every launch, so the window moved one screen further out each time until it was invisible.",
|
||||
"CW over TCI: a SunSDR can now be keyed through its own macro keyer — pick TCI as the keyer engine (Settings → CW Keyer) and macros, auto-call and the speed control all work over the link already open, with no WinKeyer and no second serial port. NOT TESTED on the air yet.",
|
||||
"LoTW upload: a refusal now shows TQSL’s own explanation — which contacts were already uploaded, which fell outside the certificate’s dates — instead of the bare “no QSOs processed”, and names the two settings that cause it.",
|
||||
"Main tab: the docked cluster now has ONE header row — its title, live count and Filters button sit with Clear filters and Columns, as Recent QSOs beside it already did. The pane is titled DX Cluster.",
|
||||
"A busy cluster no longer makes the rest of the interface sluggish: incoming spots are grouped into fewer, larger updates as the feed gets faster (up to half a second), instead of redrawing the window twenty times a second. A quiet cluster still shows each spot as it lands.",
|
||||
"SunSDR console: the meters work. The S-meter, transmit power and SWR are pushed by the radio only to a client that subscribes, and OpsLog never did — it was reading commands ExpertSDR3 does not send.",
|
||||
"Cluster: the “N new spots” counter no longer jumps to the whole buffer. It was looking for the row it had frozen on, and a station spotted again replaces its row — so the count fell through to “everything is new”.",
|
||||
"E-mail: a refused SMTP login now says what to do about it — Microsoft 365 and outlook.com have switched off password-based SMTP, and an app password does not bring it back.",
|
||||
"TCI panorama spots: the colour was sent as a negative number and ExpertSDR dropped every spot in silence. It now goes out as the unsigned ARGB integer the protocol document uses, and the first few spots are written to the log verbatim.",
|
||||
"Cluster: “Group duplicates” was hiding the same station on OTHER bands and modes — a DXpedition spotted on five bands showed as one line and four slots disappeared. A duplicate is now what it should always have been: the same station on the same band and mode."
|
||||
],
|
||||
"fr": [
|
||||
"Téléchargement LoTW : les détails QSL (date du QSL, locator, état, comté) deviennent optionnels et désactivés par défaut — LoTW met environ dix fois plus longtemps à construire ce rapport, vingt minutes contre deux sur le même compte, et marquer une confirmation n'en a pas besoin. Toujours demandés automatiquement quand on ajoute les QSO absents du log.",
|
||||
"Carte des bandes : l'infobulle indique aussi un nouveau préfixe ou un nouveau locator. Ils restent hors de la bande de couleur de 22 pixels, mais les omettre du texte donnait l'impression que les deux panneaux se contredisaient — le cluster annonçait NOUVEAU PFX pour un spot que la carte disait contacté, et les deux avaient raison. Le « Contacté » de la carte dit aussi de qui il parle : c'est l'ENTITÉ qui a été contactée sur cette bande et ce mode, pas l'indicatif — d'où l'impression de contradiction.",
|
||||
"TCI (SunSDR) : cliquer un spot du cluster ne demande plus un second clic pour obtenir le bon mode — la bande latérale était choisie d'après la fréquence encore annoncée par la radio au lieu de celle qu'on venait de demander. Le journal indique aussi la version d'ExpertSDR, et signale si elle est antérieure à la 1.5 qu'exigent les spots sur le panorama.",
|
||||
"Deux écrans : OpsLog ne s'échappe plus du bureau. Sur un écran placé à gauche de l'écran principal, la position enregistrée était ajoutée à l'origine de cet écran à chaque lancement, si bien que la fenêtre s'éloignait d'un écran à chaque fois jusqu'à devenir invisible.",
|
||||
"CW en TCI : un SunSDR peut désormais être manipulé par son propre keyer à macros — choisissez TCI comme moteur (Réglages → Manipulateur CW) et les macros, l'appel automatique et le réglage de vitesse passent par la liaison déjà ouverte, sans WinKeyer ni second port série. PAS ENCORE TESTÉ sur l'air.",
|
||||
"Envoi LoTW : un refus affiche désormais l'explication de TQSL — quels contacts étaient déjà envoyés, lesquels tombaient hors des dates du certificat — au lieu du seul « no QSOs processed », et nomme les deux réglages qui en sont la cause.",
|
||||
"Onglet Main : le cluster ancré n'a plus qu'UNE ligne d'en-tête — son titre, le compteur live et le bouton Filtres rejoignent Effacer les filtres et Colonnes, comme le faisait déjà la liste des QSO récents à côté. Le panneau s'intitule DX Cluster.",
|
||||
"Un cluster chargé ne ralentit plus le reste de l'interface : les spots entrants sont regroupés en mises à jour moins nombreuses à mesure que le flux s'accélère (jusqu'à une demi-seconde), au lieu de redessiner la fenêtre vingt fois par seconde. Sur un cluster calme, chaque spot s'affiche toujours dès son arrivée.",
|
||||
"Console SunSDR : les mesures fonctionnent. Le S-mètre, la puissance et le ROS ne sont envoyés qu'à un client qui s'abonne, ce qu'OpsLog ne faisait pas — il lisait des commandes qu'ExpertSDR3 n'envoie pas.",
|
||||
"Cluster : le compteur « N nouveaux spots » ne saute plus à la taille du tampon. Il cherchait la ligne sur laquelle il s'était figé, or une station re-spottée remplace sa ligne — le compte basculait donc sur « tout est nouveau ».",
|
||||
"E-mail : un refus d'authentification SMTP explique désormais quoi faire — Microsoft 365 et outlook.com ont désactivé le SMTP par mot de passe, et un mot de passe d'application ne le rétablit pas.",
|
||||
"Spots sur le panorama TCI : la couleur partait en nombre négatif et ExpertSDR écartait chaque spot en silence. Elle est désormais envoyée en entier ARGB non signé, comme dans la documentation du protocole, et les premiers spots sont écrits tels quels dans le journal.",
|
||||
"Cluster : « Grouper les doublons » masquait la même station sur les AUTRES bandes et modes — une expédition spottée sur cinq bandes n'affichait qu'une ligne et quatre créneaux disparaissaient. Un doublon est désormais ce qu'il aurait toujours dû être : la même station sur la même bande et le même mode."
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "0.26.21",
|
||||
"date": "",
|
||||
"en": [
|
||||
"Distances can be shown in miles (Settings → General): the cluster and Recent QSOs columns, the map path box, the rotator buttons and the band-opening list all follow, and the column headers name the unit.",
|
||||
"LoTW download: the report is now counted in megabytes as it arrives, LoTW’s \"busy\" answer (HTTP 503) is retried twice instead of failing, and a transfer that stops moving for two minutes says so rather than showing \"working\" indefinitely."
|
||||
],
|
||||
"fr": [
|
||||
"Les distances peuvent s'afficher en miles (Réglages → Général) : les colonnes du cluster et des QSO récents, l'encart du tracé sur la carte, les boutons du rotor et la liste des ouvertures suivent, et l'unité est indiquée dans les en-têtes de colonne.",
|
||||
"Téléchargement LoTW : le rapport est compté en mégaoctets au fur et à mesure, la réponse « occupé » de LoTW (HTTP 503) est retentée deux fois au lieu d'échouer, et un transfert qui n'avance plus pendant deux minutes le dit au lieu d'afficher « en cours » indéfiniment."
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "0.26.20",
|
||||
"date": "",
|
||||
|
||||
+85
-27
@@ -41,6 +41,7 @@ import {
|
||||
IcomSendCW, YaesuSendCW, YaesuStopCW, SetYaesuKeySpeed, IcomStopCW, IcomSetKeySpeed, IcomSetBreakIn, GetIcomState,
|
||||
KenwoodSendCW, KenwoodStopCW, SetKenwoodKeySpeed,
|
||||
FlexSendCW, FlexStopCW, FlexSetKeySpeed, FlexBackspaceCW,
|
||||
TCISendCW, TCIStopCW, TCISetKeySpeed,
|
||||
GetDVKMessages, GetDVKStatus, DVKPlay, DVKStop,
|
||||
StartCWDecoder, StopCWDecoder, SetCWDecoderPitch,
|
||||
ChatAvailable, GetChatHistory, SendChatMessage, GetOnlineOperators,
|
||||
@@ -57,6 +58,7 @@ import {
|
||||
import { Combobox } from '@/components/ui/combobox';
|
||||
import { applyAwardRefs, parseAwardRefs as parseManualRefs, spotRefList , withIOTARef, withRDARef } from '@/lib/awardRefs';
|
||||
import { ListRadios, SetActiveRadio } from '../wailsjs/go/main/App';
|
||||
import { formatDistance } from '@/lib/units';
|
||||
import { EventsOn, BrowserOpenURL, WindowMinimise, WindowToggleMaximise, WindowIsMaximised, Quit } from '../wailsjs/runtime/runtime';
|
||||
import type { adif as adifModels, lookup as lookupModels, cat as catModels } from '../wailsjs/go/models';
|
||||
import type { QSOForm, WorkedBeforeView, StationSettingsForm, ListsSettingsForm, ModePresetForm } from '@/types';
|
||||
@@ -96,7 +98,7 @@ import { ExportFieldsDialog } from '@/components/ExportFieldsDialog';
|
||||
import { ShutdownProgress } from '@/components/ShutdownProgress';
|
||||
import { ClusterGrid } from '@/components/ClusterGrid';
|
||||
import { cleanSpotter, inferSpotMode, spotModeCategory, spotStatusKey } from '@/lib/spot';
|
||||
import { applySpotDisplay, readSpotDisplayOptions, spotIsWorked, SPOT_DISPLAY_OPTIONS_EXPOSED } from '@/lib/spotDisplay';
|
||||
import { applySpotDisplay, chasePota, readSpotDisplayOptions, spotIsWorked, SPOT_DISPLAY_OPTIONS_EXPOSED } from '@/lib/spotDisplay';
|
||||
import { AnswerDecode, HaltDecodeTx, LogUIError, FlexTXOnBand, GetMatrixColors, GetRotorPresets, GetRowColors, GetSpotTTLMinutes, GetSpotMax, IsNewUSCounty } from '../wailsjs/go/main/App';
|
||||
import { applyMatrixColors } from '@/lib/matrixColors';
|
||||
import { WorkedBeforeGrid } from '@/components/WorkedBeforeGrid';
|
||||
@@ -1489,7 +1491,7 @@ export default function App() {
|
||||
// CI-V 0x17 (no extra hardware — sends over the CAT connection). Macros,
|
||||
// auto-call and <LOGQSO> are shared; only the transport differs.
|
||||
const [wkEngine, setWkEngine] = useState<string>('winkeyer');
|
||||
const cwSource: 'winkeyer' | 'icom' | 'flex' | 'yaesu' | 'kenwood' = wkEngine === 'icom' ? 'icom' : wkEngine === 'flex' ? 'flex' : wkEngine === 'yaesu' ? 'yaesu' : wkEngine === 'kenwood' ? 'kenwood' : 'winkeyer';
|
||||
const cwSource: 'winkeyer' | 'icom' | 'flex' | 'yaesu' | 'kenwood' | 'tci' = wkEngine === 'icom' ? 'icom' : wkEngine === 'flex' ? 'flex' : wkEngine === 'yaesu' ? 'yaesu' : wkEngine === 'kenwood' ? 'kenwood' : wkEngine === 'tci' ? 'tci' : 'winkeyer';
|
||||
// Setting the CW speed has to reach the keyer that is ACTUALLY sending, and
|
||||
// both the CW panel and the Yaesu console can ask for it. With DTR/RTS line
|
||||
// keying the PC does the timing, so the rig's internal keyer speed changes
|
||||
@@ -1503,6 +1505,7 @@ export default function App() {
|
||||
else if (src === 'flex') FlexSetKeySpeed(w).catch(() => {});
|
||||
else if (src === 'yaesu') SetYaesuKeySpeed(w).catch(() => {});
|
||||
else if (src === 'kenwood') SetKenwoodKeySpeed(w).catch(() => {});
|
||||
else if (src === 'tci') TCISetKeySpeed(w).catch(() => {});
|
||||
else WinkeyerSetSpeed(w).catch(() => {});
|
||||
// The rig's own keyer follows too whenever a Yaesu is on CAT, even when it is
|
||||
// not the sending engine: its front panel and OpsLog then agree.
|
||||
@@ -1547,6 +1550,7 @@ export default function App() {
|
||||
: cwSource === 'flex' ? (catState.backend === 'flex' && catState.connected)
|
||||
: cwSource === 'yaesu' ? (catState.backend === 'yaesu' && catState.connected)
|
||||
: cwSource === 'kenwood' ? (catState.backend === 'kenwood' && catState.connected)
|
||||
: cwSource === 'tci' ? (catState.backend === 'tci' && catState.connected)
|
||||
: wkStatus.connected;
|
||||
wkActiveRef.current = wkEnabled && connected;
|
||||
}, [wkEnabled, wkStatus.connected, cwSource, catState.backend, catState.connected]);
|
||||
@@ -2064,6 +2068,9 @@ export default function App() {
|
||||
useEffect(() => { spotStatusRef.current = spotStatus; }, [spotStatus]);
|
||||
// Mirror of spots so the log-triggered refresh reads the current list without
|
||||
// a stale closure.
|
||||
// Arrival times of the last second's spots, for the adaptive batching window
|
||||
// in the cluster:spot listener.
|
||||
const spotRateRef = useRef<number[]>([]);
|
||||
const spotsRef = useRef(spots);
|
||||
useEffect(() => { spotsRef.current = spots; }, [spots]);
|
||||
// The decoded stations, for the same reason: the status refresh and the cache
|
||||
@@ -3591,11 +3598,24 @@ export default function App() {
|
||||
const unsubSpot = EventsOn('cluster:spot', (sp: ClusterSpot) => {
|
||||
// Stage the spot; a short timer resolves its status then commits it.
|
||||
pendingSpotsRef.current.push(sp);
|
||||
// 50 ms is enough to coalesce an RBN burst into one status lookup (the
|
||||
// worked-index is in memory, so resolving is near-instant) while staying
|
||||
// imperceptible.
|
||||
// The window WIDENS with the rate of the feed.
|
||||
//
|
||||
// Every flush commits state that the whole window re-renders on, so a
|
||||
// fixed 50 ms means twenty full renders a second under an RBN firehose —
|
||||
// and that is felt everywhere else: a dropdown highlighting its entries a
|
||||
// beat late as the mouse moves down them, which is what was reported.
|
||||
//
|
||||
// A quiet cluster keeps the 50 ms: a handful of spots an hour should
|
||||
// appear the moment they arrive. A busy one is coalesced instead, and half
|
||||
// a second's delay on a line in a list that is already scrolling past is
|
||||
// not something anyone can see.
|
||||
const now = Date.now();
|
||||
spotRateRef.current = spotRateRef.current.filter((t) => now - t < 1000);
|
||||
spotRateRef.current.push(now);
|
||||
const perSec = spotRateRef.current.length;
|
||||
const window_ms = perSec > 20 ? 500 : perSec > 5 ? 200 : 50;
|
||||
if (pendingSpotTimer.current === undefined) {
|
||||
pendingSpotTimer.current = window.setTimeout(flushPendingSpots, 50);
|
||||
pendingSpotTimer.current = window.setTimeout(flushPendingSpots, window_ms);
|
||||
}
|
||||
// Self-spot: someone spotted OUR callsign — show it in the shared header
|
||||
// toast (same place as the other notifications), not a separate banner.
|
||||
@@ -3967,7 +3987,7 @@ export default function App() {
|
||||
// segment AFTER the <LOGQSO> (which logs and clears the form) still expands its
|
||||
// variables correctly.
|
||||
const parts = rawText.split(/<LOGQSO>/i).map((pt) => resolveCW(pt));
|
||||
const isRig = cwSourceRef.current === 'icom' || cwSourceRef.current === 'flex' || cwSourceRef.current === 'yaesu' || cwSourceRef.current === 'kenwood';
|
||||
const isRig = cwSourceRef.current === 'icom' || cwSourceRef.current === 'flex' || cwSourceRef.current === 'yaesu' || cwSourceRef.current === 'kenwood' || cwSourceRef.current === 'tci';
|
||||
for (let p = 0; p < parts.length; p++) {
|
||||
if (aborted()) return; // ESC / Stop before this segment → stop sending, don't log
|
||||
const resolved = parts[p];
|
||||
@@ -3979,7 +3999,7 @@ export default function App() {
|
||||
// current WPM, so it scales automatically.
|
||||
const keyed = resolved + ' ';
|
||||
setWkSent(resolved);
|
||||
const sendFn = cwSourceRef.current === 'flex' ? FlexSendCW : cwSourceRef.current === 'icom' ? IcomSendCW : cwSourceRef.current === 'yaesu' ? YaesuSendCW : cwSourceRef.current === 'kenwood' ? KenwoodSendCW : null;
|
||||
const sendFn = cwSourceRef.current === 'flex' ? FlexSendCW : cwSourceRef.current === 'icom' ? IcomSendCW : cwSourceRef.current === 'yaesu' ? YaesuSendCW : cwSourceRef.current === 'kenwood' ? KenwoodSendCW : cwSourceRef.current === 'tci' ? TCISendCW : null;
|
||||
if (sendFn) await sendFn(keyed).catch((e) => setError(String(e?.message ?? e)));
|
||||
else await WinkeyerSend(keyed).catch((e) => setError(String(e?.message ?? e)));
|
||||
// WAIT for THIS segment's CW to finish before moving on — so a <LOGQSO>
|
||||
@@ -4022,6 +4042,7 @@ export default function App() {
|
||||
else if (cwSourceRef.current === 'flex') FlexStopCW().catch(() => {});
|
||||
else if (cwSourceRef.current === 'yaesu') YaesuStopCW().catch(() => {});
|
||||
else if (cwSourceRef.current === 'kenwood') KenwoodStopCW().catch(() => {});
|
||||
else if (cwSourceRef.current === 'tci') TCIStopCW().catch(() => {});
|
||||
else WinkeyerStop().catch(() => {});
|
||||
}
|
||||
// runAutoCall sends macro i, waits for the keyer to finish, waits the chosen
|
||||
@@ -4070,6 +4091,10 @@ export default function App() {
|
||||
// send-on-type: key the typed chars verbatim (no variable substitution).
|
||||
function wkSendRaw(chars: string) {
|
||||
if (cwSourceRef.current === 'flex') { FlexSendCW(chars).catch(() => {}); return; }
|
||||
// TCI keys the character as a macro of its own. There is no un-typing it
|
||||
// afterwards — the radio can stop the message but not shorten it — so the
|
||||
// backspace below leaves the TCI engine alone rather than pretending.
|
||||
if (cwSourceRef.current === 'tci') { TCISendCW(chars).catch(() => {}); return; }
|
||||
WinkeyerSend(chars).catch(() => {});
|
||||
}
|
||||
function wkBackspace() {
|
||||
@@ -5845,6 +5870,13 @@ export default function App() {
|
||||
// worked call still matches its own entity status too (new-band/new-slot),
|
||||
// so it stays visible under those chips.
|
||||
const matches = (st !== 'worked' && clusterStatusFilter.has(st))
|
||||
// NEW CALL is a FACT about the callsign (never worked on this band and
|
||||
// mode), surfaced as a status only by the slot-highlight option. The
|
||||
// chip filters on the fact itself, so it works whether or not that
|
||||
// display option is on — worked_slot is computed whenever either
|
||||
// slot option is enabled.
|
||||
|| (clusterStatusFilter.has('new-call') && e?.worked_slot === false
|
||||
&& (!e?.status || e?.status === 'worked' || e?.status === 'new-call'))
|
||||
|| (!!e?.worked_call && clusterStatusFilter.has('worked'))
|
||||
|| (!!e?.new_pota && clusterStatusFilter.has('new-pota'))
|
||||
|| (!!e?.new_county && clusterStatusFilter.has('new-county'))
|
||||
@@ -5901,11 +5933,17 @@ export default function App() {
|
||||
});
|
||||
let rendered = list as (ClusterSpot & { repeats?: number })[];
|
||||
if (clusterGroup) {
|
||||
// A DUPLICATE is the same station on the same band AND mode — the dozen
|
||||
// skimmers that all heard one CQ. The same station on another band is the
|
||||
// opposite of a duplicate: it is the line a DX chaser is scanning for, and
|
||||
// grouping on the callsign alone deleted it. RI1FJL spotted on five bands
|
||||
// showed as one row, so four slots simply vanished from the list.
|
||||
const seen = new Map<string, ClusterSpot & { repeats: number }>();
|
||||
for (const s of list) {
|
||||
const e = seen.get(s.dx_call);
|
||||
const key = `${(s.dx_call ?? '').toUpperCase()}|${(s.band ?? '').toLowerCase()}|${inferSpotMode(s.comment ?? '', s.freq_hz)}`;
|
||||
const e = seen.get(key);
|
||||
if (e) { e.repeats++; }
|
||||
else seen.set(s.dx_call, { ...s, repeats: 1 });
|
||||
else seen.set(key, { ...s, repeats: 1 });
|
||||
}
|
||||
rendered = Array.from(seen.values());
|
||||
}
|
||||
@@ -5945,12 +5983,20 @@ export default function App() {
|
||||
);
|
||||
|
||||
const F_CHIP = 'px-1.5 py-[3px] rounded-md border text-[10px] font-bold tracking-wider transition-opacity';
|
||||
const fChip = (key: string, label: string, cls: string, on: boolean, toggle: () => void) => (
|
||||
<button key={key} type="button" onClick={toggle}
|
||||
className={cn(F_CHIP, on ? cls : `${cls} opacity-40 hover:opacity-80`)}>
|
||||
const fChip = (key: string, label: string, cls: string, on: boolean, toggle: () => void, style?: React.CSSProperties, title?: string) => (
|
||||
<button key={key} type="button" onClick={toggle} title={title}
|
||||
className={cn(F_CHIP, on ? cls : `${cls} opacity-40 hover:opacity-80`)} style={style}>
|
||||
{label}
|
||||
</button>
|
||||
);
|
||||
// chipStyle builds a filter chip in an arbitrary colour — for the statuses
|
||||
// whose grid badge is not one of the semantic tokens the chip classes cover.
|
||||
// A filter that does not look like what it selects has to be learned twice.
|
||||
const chipStyle = (c: string): React.CSSProperties => ({
|
||||
color: c,
|
||||
borderColor: `color-mix(in srgb, ${c} 45%, transparent)`,
|
||||
background: `color-mix(in srgb, ${c} 14%, transparent)`,
|
||||
});
|
||||
|
||||
const renderClusterFilters = () => (
|
||||
<div className="w-56 shrink-0 border-l border-border/60 flex flex-col min-h-0 bg-muted/10">
|
||||
@@ -6066,14 +6112,14 @@ export default function App() {
|
||||
{ k: 'new-band-mode' as SpotFilterKey, label: 'NEW B+M', cls: 'bg-danger-muted text-danger-muted-foreground border-danger-border' },
|
||||
{ k: 'new-band' as SpotFilterKey, label: 'NEW BAND', cls: 'bg-warning-muted text-warning-muted-foreground border-warning-border' },
|
||||
{ k: 'new-mode' as SpotFilterKey, label: 'NEW MODE', cls: 'bg-caution-muted text-caution-muted-foreground border-caution-border' },
|
||||
{ k: 'new-slot' as SpotFilterKey, label: 'NEW SLOT', cls: 'bg-caution-muted text-caution-muted-foreground border-caution-border' },
|
||||
{ k: 'new-slot' as SpotFilterKey, label: 'NEW SLOT', cls: 'border', style: chipStyle('#5AC8FA') },
|
||||
// NEW CALL is about the CALLSIGN, not the entity: never worked on this
|
||||
// band and mode. Only appears when the slot-highlight option is on.
|
||||
{ k: 'new-call' as SpotFilterKey, label: 'NEW CALL', cls: 'bg-caution-muted text-caution-muted-foreground border-caution-border' },
|
||||
// Same colours as the badges in the grid — a filter that does not
|
||||
// look like what it selects has to be learned twice.
|
||||
{ k: 'new-pota' as SpotFilterKey, label: 'NEW POTA', cls: 'bg-success-muted text-success-muted-foreground border-success-border' },
|
||||
{ k: 'new-county' as SpotFilterKey, label: 'NEW COUNTY', cls: 'bg-success-muted text-success-muted-foreground border-success-border' },
|
||||
{ k: 'new-county' as SpotFilterKey, label: 'NEW COUNTY', cls: 'border', style: chipStyle('var(--chart-5)') },
|
||||
{ k: 'new-pfx' as SpotFilterKey, label: 'NEW PFX', cls: 'bg-caution-muted text-caution-muted-foreground border-caution-border' },
|
||||
// Only ever set for a station this receiver decoded over the UDP link.
|
||||
{ k: 'new-grid' as SpotFilterKey, label: 'NEW GRID', cls: 'bg-muted text-foreground border-border' },
|
||||
@@ -6081,8 +6127,9 @@ export default function App() {
|
||||
// worked spots; the separate "Hide worked" checkbox drops them — they
|
||||
// are opposite controls, so don't use both at once.
|
||||
{ k: 'worked' as SpotFilterKey, label: 'WORKED', cls: 'bg-info-muted text-info-muted-foreground border-info-border' },
|
||||
]).map((s) => fChip(s.k, s.label, s.cls, clusterStatusFilter.has(s.k),
|
||||
() => setClusterStatusFilter((cur) => { const n = new Set(cur); if (n.has(s.k)) n.delete(s.k); else n.add(s.k); return n; })))}
|
||||
]).filter((s: any) => s.k !== 'new-pota' || chasePota())
|
||||
.map((s: any) => fChip(s.k, s.label, s.cls, clusterStatusFilter.has(s.k),
|
||||
() => setClusterStatusFilter((cur) => { const n = new Set(cur); if (n.has(s.k)) n.delete(s.k); else n.add(s.k); return n; }), s.style))}
|
||||
</div>,
|
||||
clusterStatusFilter.size > 0 ? (
|
||||
<button type="button" onClick={() => setClusterStatusFilter(new Set())}
|
||||
@@ -6227,13 +6274,19 @@ export default function App() {
|
||||
case 'cluster':
|
||||
return (
|
||||
<div className="h-full w-full min-h-0 flex flex-col bg-card border border-border rounded-lg overflow-hidden">
|
||||
<div className="flex items-center justify-between px-2 py-1 border-b border-border/60 shrink-0">
|
||||
<span className="text-[11px] font-semibold uppercase tracking-wider text-muted-foreground">Cluster</span>
|
||||
{clusterFiltersToggleBtn}
|
||||
</div>
|
||||
<div className="flex-1 min-h-0 flex">
|
||||
<div className="flex-1 min-w-0 flex flex-col min-h-0">
|
||||
<ClusterGrid key={`clg-${activeProfileId ?? 'x'}`} rows={clusterRenderedRows as any} spotStatus={spotStatus} onSpotClick={handleSpotClick} onSpotSelect={handleSpotSelect} />
|
||||
{/* Title, count and Filters ride INSIDE the grid's toolbar: two
|
||||
header rows cost a pane that is often only a few spots tall
|
||||
one of the few lines it has. */}
|
||||
<ClusterGrid key={`clg-${activeProfileId ?? 'x'}`} rows={clusterRenderedRows as any} spotStatus={spotStatus} onSpotClick={handleSpotClick} onSpotSelect={handleSpotSelect}
|
||||
headerLeft={(
|
||||
<>
|
||||
<span className="text-[11px] font-semibold uppercase tracking-wider text-muted-foreground shrink-0">DX Cluster</span>
|
||||
<Badge variant="secondary" className="text-[10px] shrink-0">{spots.length} live</Badge>
|
||||
{clusterFiltersToggleBtn}
|
||||
</>
|
||||
)} />
|
||||
</div>
|
||||
{clusterShowFilters && renderClusterFilters()}
|
||||
</div>
|
||||
@@ -6419,7 +6472,7 @@ export default function App() {
|
||||
disabled={disabled}
|
||||
onClick={() => p && goto(p.bearingShort, 'SP')}
|
||||
title={p
|
||||
? `Rotate short-path · ${Math.round(p.distanceShort).toLocaleString()} km`
|
||||
? `Rotate short-path · ${formatDistance(p.distanceShort)}`
|
||||
: (station.my_grid ? 'No remote grid' : 'Set your station grid in Preferences')}
|
||||
className={cn(
|
||||
'inline-flex items-center gap-1 px-2 py-0.5 transition-colors',
|
||||
@@ -6435,7 +6488,7 @@ export default function App() {
|
||||
type="button"
|
||||
disabled={disabled}
|
||||
onClick={() => p && goto(p.bearingLong, 'LP')}
|
||||
title={p ? `Rotate long-path · ${Math.round(p.distanceLong).toLocaleString()} km` : ''}
|
||||
title={p ? `Rotate long-path · ${formatDistance(p.distanceLong)}` : ''}
|
||||
className={cn(
|
||||
'px-1.5 py-0.5 border-l border-info-border text-[10px] transition-colors',
|
||||
disabled
|
||||
@@ -8570,7 +8623,7 @@ export default function App() {
|
||||
"1.5k" and then appended the unit, giving "1.5kkm" — and even
|
||||
written correctly, "1.5k km" makes a reader do arithmetic to
|
||||
recover a number that was four characters long to begin with. */}
|
||||
<span className="font-mono opacity-80">{o.median_km} km</span>
|
||||
<span className="font-mono opacity-80">{formatDistance(o.median_km)}</span>
|
||||
{/* Out of season is the one an operator must not learn last, so it
|
||||
earns a mark on the badge rather than a line in the tooltip. */}
|
||||
{!o.in_season && <span className="opacity-90">!</span>}
|
||||
@@ -8615,9 +8668,14 @@ export default function App() {
|
||||
// freqMhz display string, which the manual-edit freeze / field locks can
|
||||
// leave stale (that dropped the sub-kHz: on 14134.5 the frozen "14.134"
|
||||
// string spotted 14134). Fall back to the entry field, then the last QSO.
|
||||
//
|
||||
// The RX frequency when split, deliberately: a spot names where the
|
||||
// STATION is, and in split that is where we listen — freq_hz is where
|
||||
// we transmit, and spotting a 5-up pile-up's TX frequency sent the
|
||||
// whole cluster five kHz above the DX.
|
||||
defaultFreqKHz={
|
||||
catState.connected && (catState.freq_hz ?? 0) > 0
|
||||
? Math.round(((catState.freq_hz ?? 0) / 1000) * 10) / 10
|
||||
catState.connected && ((catState.split && (catState.freq_rx_hz ?? 0) > 0 ? catState.freq_rx_hz : catState.freq_hz) ?? 0) > 0
|
||||
? Math.round((((catState.split && (catState.freq_rx_hz ?? 0) > 0 ? catState.freq_rx_hz : catState.freq_hz) ?? 0) / 1000) * 10) / 10
|
||||
: parseFloat(freqMhz) > 0
|
||||
? Math.round(parseFloat(freqMhz) * 1000 * 10) / 10
|
||||
: (qsos[0]?.freq_hz ? Math.round((qsos[0].freq_hz / 1000) * 10) / 10 : 0)
|
||||
|
||||
@@ -2,6 +2,7 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
||||
import { Minus, Plus, Crosshair, X, PanelLeft, PanelRight } from 'lucide-react';
|
||||
import { cn } from '@/lib/utils';
|
||||
import { useI18n } from '@/lib/i18n';
|
||||
import { bandRange, bandSegments, subscribeIaruRegion, type SegMode } from '@/lib/bandplan';
|
||||
import { spotStatusKey, inferSpotMode, spotModeCategory } from '@/lib/spot';
|
||||
import { SPOT_MARKERS, activeMarkers } from '@/lib/spotMarkers';
|
||||
import { applySpotDisplay, readSpotDisplayOptions } from '@/lib/spotDisplay';
|
||||
@@ -76,6 +77,13 @@ const BMP_MARKER_LABEL: Record<string, string> = {
|
||||
new_pota: 'bmp.legendNewPota',
|
||||
new_county: 'bmp.legendNewCounty',
|
||||
worked_call: 'bmp.legendWorkedCall',
|
||||
// Not on the strip — the pill is 22 px and a fourth segment turns it into a
|
||||
// colour code nobody reads — but the TOOLTIP has room, and leaving them out of
|
||||
// it made the two panels contradict each other: the cluster said NEW PFX about
|
||||
// a spot the map called "Worked". Both were true (the entity is worked on this
|
||||
// slot, the WPX prefix never has been) and neither view said so.
|
||||
new_pfx: 'clg2.newPfx',
|
||||
new_grid: 'clg2.newGrid',
|
||||
};
|
||||
|
||||
interface Props {
|
||||
@@ -107,59 +115,26 @@ interface Props {
|
||||
keyNav?: boolean;
|
||||
}
|
||||
|
||||
const BAND_RANGES: Record<string, [number, number]> = {
|
||||
'160m': [1800, 2000],
|
||||
'80m': [3500, 3800],
|
||||
'60m': [5350, 5450],
|
||||
'40m': [7000, 7200],
|
||||
'30m': [10100, 10150],
|
||||
'20m': [14000, 14350],
|
||||
'17m': [18068, 18168],
|
||||
'15m': [21000, 21450],
|
||||
'12m': [24890, 24990],
|
||||
'10m': [28000, 29700],
|
||||
'6m': [50000, 50500],
|
||||
'4m': [70000, 70500],
|
||||
'2m': [144000, 146000],
|
||||
'70cm': [430000, 440000],
|
||||
// Band edges and mode segments come from lib/bandplan, which knows the
|
||||
// operator's IARU region (Settings → General): a Region 2 operator's 40 m runs
|
||||
// to 7300 with phone from 7125, and drawing Region 1's plan under their spots
|
||||
// cut the top 100 kHz of the band off the map.
|
||||
//
|
||||
// Sub-band shading colours: these are IDENTITIES (which mode the segment is
|
||||
// for), not states, so they take categorical hues — never the status tokens.
|
||||
// All three are drawn from the cool end of the categorical order and laid down
|
||||
// at low opacity, so the band plan stays background context while the warm
|
||||
// spot pills keep the foreground. Checked with the palette validator in both
|
||||
// themes (violet failed the dark protan step; magenta clears every check).
|
||||
const SEG_COLOR: Record<SegMode, string> = {
|
||||
cw: 'var(--chart-7)', // magenta
|
||||
digi: 'var(--chart-1)', // blue
|
||||
phone: 'var(--chart-2)', // aqua
|
||||
};
|
||||
|
||||
// Sub-band shading: CW / digital / phone.
|
||||
//
|
||||
// These are IDENTITIES (which mode the segment is for), not states, so they take
|
||||
// categorical hues — never the status tokens. They used to use success / info /
|
||||
// warning, which collided head-on with the spot pills drawn ON TOP of them: amber
|
||||
// is "new band" in this very component's legend, so the whole SSB portion read as
|
||||
// a giant "new band" wash. Status colours are reserved for status.
|
||||
//
|
||||
// All three are drawn from the COOL end of the categorical order and laid down at
|
||||
// low opacity, so the band plan stays background context while the warm spot pills
|
||||
// keep the foreground to themselves.
|
||||
// Checked with the palette validator in BOTH themes. Violet was the first pick
|
||||
// for CW and failed on the dark steps — violet and blue land 1.9 ΔE apart for a
|
||||
// protan reader there, i.e. the same colour. Magenta clears every check on both
|
||||
// surfaces (worst adjacent pair 13.0 light / 15.9 dark).
|
||||
const SEG_CW = 'var(--chart-7)'; // magenta
|
||||
const SEG_DIGI = 'var(--chart-1)'; // blue
|
||||
const SEG_PHONE = 'var(--chart-2)'; // aqua
|
||||
// A band-plan wash is CONTEXT, not data: it must stay under the spot pills that
|
||||
// are read on top of it.
|
||||
const SEG_OPACITY = 0.13;
|
||||
|
||||
const SEGMENT_COLORS: Record<string, [number, number, string][]> = {
|
||||
'160m': [[1800, 1838, SEG_CW], [1838, 1840, SEG_DIGI], [1840, 2000, SEG_PHONE]],
|
||||
'80m': [[3500, 3580, SEG_CW], [3580, 3600, SEG_DIGI], [3600, 3800, SEG_PHONE]],
|
||||
'60m': [[5350, 5450, SEG_PHONE]],
|
||||
'40m': [[7000, 7040, SEG_CW], [7040, 7100, SEG_DIGI], [7100, 7200, SEG_PHONE]],
|
||||
'30m': [[10100, 10130, SEG_CW], [10130, 10150, SEG_DIGI]],
|
||||
'20m': [[14000, 14070, SEG_CW], [14070, 14100, SEG_DIGI], [14100, 14350, SEG_PHONE]],
|
||||
'17m': [[18068, 18095, SEG_CW], [18095, 18110, SEG_DIGI], [18110, 18168, SEG_PHONE]],
|
||||
'15m': [[21000, 21070, SEG_CW], [21070, 21150, SEG_DIGI], [21150, 21450, SEG_PHONE]],
|
||||
'12m': [[24890, 24915, SEG_CW], [24915, 24940, SEG_DIGI], [24940, 24990, SEG_PHONE]],
|
||||
'10m': [[28000, 28070, SEG_CW], [28070, 28300, SEG_DIGI], [28300, 29700, SEG_PHONE]],
|
||||
'6m': [[50000, 50100, SEG_CW], [50100, 50500, SEG_PHONE]],
|
||||
};
|
||||
|
||||
// Small coloured dot + label used in the band-map legend strip.
|
||||
function LegendDot({ cls, colour, label }: { cls?: string; colour?: string; label: string }) {
|
||||
return (
|
||||
@@ -297,13 +272,16 @@ export function BandMap({ band, spots, spotStatus: spotStatusRaw, currentFreqHz,
|
||||
// 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;
|
||||
if (!dispOpts.muteWorked && !dispOpts.slotHighlight && dispOpts.chasePota) 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] ?? [];
|
||||
}, [spotStatusRaw, dispOpts.muteWorked, dispOpts.slotHighlight, dispOpts.chasePota]);
|
||||
// Re-render when the operator changes their IARU region in Settings.
|
||||
const [, setRegionTick] = useState(0);
|
||||
useEffect(() => subscribeIaruRegion(() => setRegionTick((n) => n + 1)), []);
|
||||
const range = bandRange(band);
|
||||
const segments = bandSegments(band).map(([a, b, m]) => [a, b, SEG_COLOR[m]] as [number, number, string]);
|
||||
const [zoomIdx, setZoomIdx] = useState(() => readZoom(band));
|
||||
// The docked map follows the rig, so a band change must bring up THAT band's
|
||||
// remembered zoom.
|
||||
@@ -737,7 +715,7 @@ export function BandMap({ band, spots, spotStatus: spotStatusRaw, currentFreqHz,
|
||||
'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)}${markersFor(entry).map((m) => ' · ' + t(BMP_MARKER_LABEL[m.key])).join('')}${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)}${activeMarkers(entry).map((m) => ' · ' + t(BMP_MARKER_LABEL[m.key])).join('')}${p.spot.comment ? ' · ' + p.spot.comment : ''}${p.spot.spotter ? ' · de ' + p.spot.spotter : ''}`}
|
||||
>
|
||||
{/* Left accent strip. With no extra marker it repeats the status
|
||||
colour, exactly as before; otherwise it splits into one
|
||||
@@ -787,9 +765,9 @@ export function BandMap({ band, spots, spotStatus: spotStatusRaw, currentFreqHz,
|
||||
))}
|
||||
{/* 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")} />
|
||||
<LegendDot colour={SEG_DIGI} label={t("bmp.legendData")} />
|
||||
<LegendDot colour={SEG_PHONE} label={t("bmp.legendPhone")} />
|
||||
<LegendDot colour={SEG_COLOR.cw} label={t("bmp.legendCW")} />
|
||||
<LegendDot colour={SEG_COLOR.digi} label={t("bmp.legendData")} />
|
||||
<LegendDot colour={SEG_COLOR.phone} label={t("bmp.legendPhone")} />
|
||||
</div>
|
||||
<div className="px-3 py-1 text-[9px] text-muted-foreground bg-muted/30 border-t border-border font-mono text-center shrink-0">
|
||||
{t('bmp.footerHint')}
|
||||
|
||||
@@ -60,6 +60,9 @@ const FIELDS: FieldDef[] = [
|
||||
// No promoted column: written into extras_json (see qso.bulkEditableExtras).
|
||||
{ id: 'owner_callsign', label: 'bulk.fOwnerCallsign', group: 'My station', kind: 'text', upper: true },
|
||||
{ id: 'my_grid', label: 'bulk.fMyGrid', group: 'My station', kind: 'text', upper: true },
|
||||
{ id: 'my_dxcc', label: 'bulk.fMyDxcc', group: 'My station', kind: 'text' },
|
||||
{ id: 'my_cq_zone', label: 'bulk.fMyCqZone', group: 'My station', kind: 'text' },
|
||||
{ id: 'my_itu_zone', label: 'bulk.fMyItuZone', group: 'My station', kind: 'text' },
|
||||
{ id: 'my_antenna', label: 'bulk.fMyAntenna', group: 'My station', kind: 'text' },
|
||||
{ id: 'my_rig', label: 'bulk.fMyRig', group: 'My station', kind: 'text' },
|
||||
{ id: 'my_street', label: 'bulk.fMyStreet', group: 'My station', kind: 'text' },
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
// new is being decoded on FT8/FT4/JS8 near here — not that the band is dead.
|
||||
import { useEffect, useMemo, useState } from 'react';
|
||||
import { Radar, Loader2, X } from 'lucide-react';
|
||||
import { formatDistance } from '@/lib/units';
|
||||
import { useI18n } from '@/lib/i18n';
|
||||
import { markerColour } from '@/lib/spotMarkers';
|
||||
import { cn } from '@/lib/utils';
|
||||
@@ -186,7 +187,7 @@ export function ChaseNewPanel({ onPick, onClose }: Props) {
|
||||
title={[
|
||||
s.country,
|
||||
s.grid,
|
||||
s.dist_km ? `${s.dist_km} km` : '',
|
||||
s.dist_km ? formatDistance(s.dist_km) : '',
|
||||
s.freq_hz ? `${(s.freq_hz / 1000).toFixed(1)} kHz` : '',
|
||||
].filter(Boolean).join(' · ')}
|
||||
>
|
||||
|
||||
@@ -13,8 +13,9 @@ 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 { applySpotDisplay, chasePota, chaseSota, readSpotDisplayOptions } from '@/lib/spotDisplay';
|
||||
import { loadLocal, loadRemote, saveState, seedLocal, whenGridPrefsReady } from '@/lib/gridPrefs';
|
||||
import { distanceUnit, distanceValue, subscribeDistanceUnit } from '@/lib/units';
|
||||
import { useI18n } from '@/lib/i18n';
|
||||
|
||||
type TFn = (key: string, vars?: Record<string, string | number>) => string;
|
||||
@@ -83,6 +84,11 @@ type Props = {
|
||||
// stray click while looking took the operator off the station they were
|
||||
// working. Looking and going are now two different gestures.
|
||||
onSpotSelect?: (s: ClusterSpot) => void;
|
||||
// Anything the caller wants on the LEFT of the toolbar — the pane's title, its
|
||||
// live count, its Filters button. Docked in a pane, the title used to sit on a
|
||||
// row of its own above this one, so the cluster ate two lines of a short pane
|
||||
// where Recent QSOs beside it ate one. Reported by VK4DX.
|
||||
headerLeft?: React.ReactNode;
|
||||
};
|
||||
|
||||
const COL_STATE_KEY = 'hamlog.clusterColState.v1';
|
||||
@@ -142,6 +148,12 @@ function statusFor(p: any): SpotStatusEntry | undefined {
|
||||
// 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
|
||||
// NEW SLOT gets its own hue. It shared the amber NEW family while the NEW PFX
|
||||
// marker sits in caution yellow — two different facts, two near-identical
|
||||
// colours in the same cell. Sky cyan, the exact colour the panadapter palette
|
||||
// ships for new-slot (#5AC8FA), so the two views tell one story — and clearly
|
||||
// apart from the POTA green the first attempt (aqua) sat next to.
|
||||
const NEWSLOT = '#5AC8FA';
|
||||
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.
|
||||
@@ -184,9 +196,10 @@ function statusColor(s: SpotStatusEntry | undefined): string | null {
|
||||
case 'new-band-mode':
|
||||
case 'new-band':
|
||||
case 'new-mode':
|
||||
case 'new-slot':
|
||||
case 'new-call':
|
||||
return NEW;
|
||||
case 'new-slot':
|
||||
return NEWSLOT;
|
||||
default:
|
||||
return s?.worked_call ? WKD : null;
|
||||
}
|
||||
@@ -330,7 +343,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',
|
||||
headerName: t('clg2.c.pota'), width: 92, cellClass: 'font-mono',
|
||||
// Through a valueGetter so the chase switch empties the column live.
|
||||
valueGetter: (p: any) => (chasePota() ? p.data?.pota_ref ?? '' : ''),
|
||||
defaultVisible: true,
|
||||
cellStyle: (p: any) => (statusFor(p)?.new_pota
|
||||
? fillStyle(markerColour('new_pota'))
|
||||
@@ -343,7 +358,8 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
|
||||
// which is why the column is off by default rather than an empty column for
|
||||
// everyone who does not watch summits.
|
||||
group: 'Spot', label: t('clg2.c.sota'), colId: 'sota',
|
||||
headerName: t('clg2.c.sota'), field: 'sota_ref' as any, width: 100, cellClass: 'font-mono',
|
||||
headerName: t('clg2.c.sota'), width: 100, cellClass: 'font-mono',
|
||||
valueGetter: (p: any) => (chaseSota() ? p.data?.sota_ref ?? '' : ''),
|
||||
defaultVisible: false,
|
||||
cellStyle: () => ({ color: 'var(--success)' }) as any,
|
||||
},
|
||||
@@ -443,8 +459,13 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
|
||||
},
|
||||
{
|
||||
group: 'Geo', label: t('clg2.c.distance_km'), colId: 'distance_km',
|
||||
headerName: t('clg2.h.distance_km'), field: 'distance_km' as any, width: 80, type: 'rightAligned', cellClass: 'font-mono',
|
||||
valueFormatter: (p) => p.value ? String(p.value) : '',
|
||||
// The header carries the unit, so the cells stay bare numbers and the
|
||||
// column still sorts on the km the backend sent — converting the VALUE
|
||||
// would sort miles as if they were kilometres either way, but it would
|
||||
// also round twice.
|
||||
headerName: t('clg2.h.distance_km') + ' (' + distanceUnit() + ')',
|
||||
field: 'distance_km' as any, width: 90, type: 'rightAligned', cellClass: 'font-mono',
|
||||
valueFormatter: (p) => p.value ? String(distanceValue(p.value)) : '',
|
||||
comparator: (a, b) => (a ?? 0) - (b ?? 0),
|
||||
},
|
||||
{
|
||||
@@ -517,13 +538,15 @@ const GROUP_ORDER = ['Spot', 'Geo'];
|
||||
const CLG_GRP_KEYS: Record<string, string> = { Spot: 'clg2.grpSpot', Geo: 'clg2.grpGeo' };
|
||||
const groupLabel = (t: TFn, g: string): string => t(CLG_GRP_KEYS[g] ?? g);
|
||||
|
||||
export function ClusterGrid({ rows, spotStatus, onSpotClick, onSpotSelect }: Props) {
|
||||
export function ClusterGrid({ rows, spotStatus, onSpotClick, onSpotSelect, headerLeft }: Props) {
|
||||
const { t } = useI18n();
|
||||
const gridRef = useRef<any>(null);
|
||||
const [pickerOpen, setPickerOpen] = useState(false);
|
||||
|
||||
// Localized column catalog — rebuilt when the language changes.
|
||||
const COL_CATALOG = useMemo(() => makeColCatalog(t), [t]);
|
||||
const [distUnit, setDistUnit] = useState(distanceUnit);
|
||||
useEffect(() => subscribeDistanceUnit(() => setDistUnit(distanceUnit())), []);
|
||||
const COL_CATALOG = useMemo(() => makeColCatalog(t), [t, distUnit]);
|
||||
|
||||
// A rebuild makes AG Grid re-apply every colDef hide/width DEFAULT and fire the
|
||||
// matching column events. Without this guard those events were persisted, so a
|
||||
@@ -614,16 +637,27 @@ export function ClusterGrid({ rows, spotStatus, onSpotClick, onSpotSelect }: Pro
|
||||
const [held, setHeld] = useState<ClusterSpot[] | null>(null);
|
||||
const shown = held ?? rows;
|
||||
|
||||
// How many arrived since the freeze. Counted by finding the frozen top row in
|
||||
// the live list rather than by comparing lengths: the list is a ring buffer,
|
||||
// so once it is full the length stops growing and a length comparison would
|
||||
// report nothing new for the rest of the evening.
|
||||
const spotID = (r: ClusterSpot) => `${(r as any).received_at}-${r.dx_call}-${(r as any).source_id}`;
|
||||
// How many arrived since the freeze — counted by TIME, not by finding the
|
||||
// frozen top row again.
|
||||
//
|
||||
// Looking for that row was wrong in the ordinary case: a station spotted again
|
||||
// REPLACES its row (that is the de-dupe), so the row we froze on disappears
|
||||
// from the live list the moment somebody re-spots it — and the count fell
|
||||
// through to "everything is new", jumping from 4 to the buffer cap. Reported
|
||||
// as "it shows 4, 5 new spots and then 500 all at once".
|
||||
//
|
||||
// A timestamp survives both the replacement and the ring buffer, which was the
|
||||
// reason the length was not used either.
|
||||
const spotTime = (r: ClusterSpot) => Date.parse(String((r as any).received_at ?? '')) || 0;
|
||||
const waiting = useMemo(() => {
|
||||
if (!held || held.length === 0) return 0;
|
||||
const top = spotID(held[0]);
|
||||
const i = rows.findIndex((r) => spotID(r) === top);
|
||||
return i < 0 ? rows.length : i; // fell out of the buffer: everything is new
|
||||
const since = spotTime(held[0]);
|
||||
if (!since) return 0; // no usable timestamp — say nothing rather than a number
|
||||
let n = 0;
|
||||
for (const r of rows) {
|
||||
if (spotTime(r) > since) n++;
|
||||
}
|
||||
return n;
|
||||
}, [held, rows]);
|
||||
|
||||
const onBodyScroll = (e: { top: number }) => {
|
||||
@@ -681,7 +715,9 @@ export function ClusterGrid({ rows, spotStatus, onSpotClick, onSpotSelect }: Pro
|
||||
|
||||
return (
|
||||
<>
|
||||
<div className="flex items-center justify-end gap-2 px-2.5 py-1 border-b border-border/60 bg-muted/20">
|
||||
<div className="flex items-center gap-2 px-2.5 py-1 border-b border-border/60 bg-muted/20">
|
||||
{headerLeft}
|
||||
<div className="flex-1" />
|
||||
<Button variant="ghost" size="sm" className="h-7 text-[11px]" onClick={() => gridRef.current?.api?.setFilterModel(null)}
|
||||
title={t('clg2.clearFiltersTitle')}>
|
||||
<FilterX className="size-3.5" /> {t('clg2.clearFilters')}
|
||||
|
||||
@@ -4,17 +4,18 @@ import {
|
||||
GetKenwoodState, RefreshKenwood, SetKenwoodPower, SetKenwoodAFGain, SetKenwoodTX, TuneKenwoodATU,
|
||||
SetKenwoodRFGain, SetKenwoodMicGain, SetKenwoodSquelch, SetKenwoodPreamp, SetKenwoodAtt,
|
||||
SetKenwoodNB, SetKenwoodNR, SetKenwoodAGC, SetKenwoodFilter, SetKenwoodAntenna,
|
||||
SetKenwoodRIT, SetKenwoodXIT, ClearKenwoodRIT, SetKenwoodKeySpeed, ToggleKenwoodATU, NudgeKenwoodRIT,
|
||||
SetKenwoodRIT, SetKenwoodXIT, ClearKenwoodRIT, SetKenwoodKeySpeed, ToggleKenwoodATU, SetKenwoodRITOffset, SetKenwoodPanelMode,
|
||||
GetCATState,
|
||||
} from '../../wailsjs/go/main/App';
|
||||
import { cn } from '@/lib/utils';
|
||||
import { useI18n } from '@/lib/i18n';
|
||||
import { sMeterRST } from '@/lib/rst';
|
||||
import { ShiftRow } from '@/components/ShiftRow';
|
||||
import { MeterBar } from '@/components/MeterBar';
|
||||
import { WheelRange } from '@/components/WheelRange';
|
||||
|
||||
type KenwoodState = {
|
||||
available: boolean; model?: string; elecraft: boolean; mode?: string;
|
||||
available: boolean; model?: string; elecraft: boolean; mode?: string; data_sub?: string;
|
||||
transmitting: boolean; split: boolean; split_tx_hz?: number;
|
||||
s_meter: number; s_meter_raw: number;
|
||||
power_meter: number; swr: number; swr_raw: number;
|
||||
@@ -89,9 +90,34 @@ function Toggle({ label, on, off, onClick }: { label: string; on: boolean; off:
|
||||
);
|
||||
}
|
||||
|
||||
// isDataMode: what the rig reports for MD6 varies — "DATA", or the configured
|
||||
// digital default (FT8…) — so the DATA family is "not one of the native modes".
|
||||
function isDataMode(m?: string): boolean {
|
||||
switch ((m ?? '').toUpperCase()) {
|
||||
case '': case 'CW': case 'USB': case 'LSB': case 'SSB': case 'FM': case 'AM': case 'RTTY':
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
export function ElecraftPanel({ onReportRST }: { onReportRST?: (rst: string) => void }) {
|
||||
const { t } = useI18n();
|
||||
const [st, setSt] = useState<KenwoodState>(ZERO);
|
||||
// Ctrl+Left/Right shifts the RIT by ±10 Hz while RIT is on — the same
|
||||
// keyboard clarifier the Icom and TCI consoles have, for zero-beating a
|
||||
// caller without touching the mouse.
|
||||
const stRef = useRef(st); stRef.current = st;
|
||||
useEffect(() => {
|
||||
const onKey = (e: KeyboardEvent) => {
|
||||
if (!e.ctrlKey || (e.key !== 'ArrowLeft' && e.key !== 'ArrowRight')) return;
|
||||
const v = stRef.current;
|
||||
if (!v.available || !v.rit) return;
|
||||
e.preventDefault();
|
||||
SetKenwoodRITOffset((v.rit_offset || 0) + (e.key === 'ArrowRight' ? 10 : -10)).catch(() => {});
|
||||
};
|
||||
window.addEventListener('keydown', onKey);
|
||||
return () => window.removeEventListener('keydown', onKey);
|
||||
}, []);
|
||||
const [freqHz, setFreqHz] = useState(0);
|
||||
const [err, setErr] = useState('');
|
||||
// Optimistic overlay: a slider must follow the finger, not the poll. Dropped
|
||||
@@ -149,6 +175,28 @@ export function ElecraftPanel({ onReportRST }: { onReportRST?: (rst: string) =>
|
||||
{freqHz > 0 ? (freqHz / 1e6).toFixed(6) : '—'}
|
||||
</div>
|
||||
</div>
|
||||
{/* Mode row. The two DATA buttons are why it exists: MD6 alone keeps
|
||||
whatever submode the last session left, and a K3 "in DATA" with FSK D
|
||||
still armed keys FT8 with no audio. DATA sends MD6+DT0 (DATA A, the
|
||||
soundcard path), RTTY sends MD6+DT2 (FSK D). The active DATA button
|
||||
follows the rig's own DT answer. */}
|
||||
<div className="inline-flex rounded-md border border-border overflow-hidden">
|
||||
{([
|
||||
['CW', 'CW', view.mode === 'CW'],
|
||||
['USB', 'USB', view.mode === 'USB'],
|
||||
['LSB', 'LSB', view.mode === 'LSB'],
|
||||
['DATA', t('k3.modeData'), isDataMode(view.mode) && view.data_sub !== 'FSK D' && view.data_sub !== 'PSK D'],
|
||||
['RTTY', t('k3.modeRtty'), (isDataMode(view.mode) && (view.data_sub === 'FSK D' || view.data_sub === 'PSK D')) || view.mode === 'RTTY'],
|
||||
] as [string, string, boolean][]).map(([cmd, label, on]) => (
|
||||
<button key={cmd} type="button" disabled={off}
|
||||
title={cmd === 'DATA' ? t('k3.modeDataHint') : cmd === 'RTTY' ? t('k3.modeRttyHint') : label}
|
||||
onClick={() => SetKenwoodPanelMode(cmd).catch((e: any) => setErr(String(e?.message ?? e)))}
|
||||
className={cn('px-2.5 py-1.5 text-xs font-bold border-l border-border first:border-l-0',
|
||||
on ? 'bg-primary text-primary-foreground' : 'bg-card text-muted-foreground hover:bg-muted')}>
|
||||
{label}
|
||||
</button>
|
||||
))}
|
||||
</div>
|
||||
<button type="button" className="text-[11px] text-muted-foreground hover:text-foreground flex items-center gap-1"
|
||||
onClick={() => RefreshKenwood().catch(() => {})} title={t('k3.refreshHint')}>
|
||||
<SlidersHorizontal className="size-3.5" />
|
||||
@@ -216,7 +264,7 @@ export function ElecraftPanel({ onReportRST }: { onReportRST?: (rst: string) =>
|
||||
<div className="grid grid-cols-1 lg:grid-cols-2 gap-x-6 gap-y-2">
|
||||
<label className="flex items-center gap-2 text-xs">
|
||||
<span className="w-16 shrink-0 text-muted-foreground">{t('k3.power')}</span>
|
||||
<WheelRange min={0} max={110} step={5} disabled={off}
|
||||
<WheelRange min={0} max={110} step={1} disabled={off}
|
||||
value={view.rf_power ?? 0}
|
||||
onChange={(n) => put({ rf_power: n }, () => SetKenwoodPower(n))} />
|
||||
<span className="w-12 text-right font-mono tabular-nums">{view.rf_power ?? 0} W</span>
|
||||
@@ -279,21 +327,18 @@ export function ElecraftPanel({ onReportRST }: { onReportRST?: (rst: string) =>
|
||||
))}
|
||||
</div>
|
||||
|
||||
{/* RIT / XIT. Clear zeroes both offsets at once — the radio's own RC,
|
||||
and what an operator means by "clear it". */}
|
||||
{/* RIT / XIT — the shared ShiftRow, exactly as the Icom and TCI consoles
|
||||
drive theirs: ± / wheel / type, Ctrl+←/→ while RIT is on. The K3 has
|
||||
ONE offset for both, so both rows show it, like the Icom's. */}
|
||||
<div className="space-y-1.5">
|
||||
<ShiftRow label="RIT" accent="#8b5cf6" on={view.rit} hz={view.rit_offset || 0} disabled={off}
|
||||
onToggle={() => SetKenwoodRIT(!view.rit).catch(setErrMsg)}
|
||||
onSet={(hz) => SetKenwoodRITOffset(hz).catch(setErrMsg)} />
|
||||
<ShiftRow label="XIT" accent="#f59e0b" on={view.xit} hz={view.rit_offset || 0} disabled={off}
|
||||
onToggle={() => SetKenwoodXIT(!view.xit).catch(setErrMsg)}
|
||||
onSet={(hz) => SetKenwoodRITOffset(hz).catch(setErrMsg)} />
|
||||
</div>
|
||||
<div className="flex flex-wrap items-center gap-1.5">
|
||||
<Toggle label="RIT" on={view.rit} off={off} onClick={() => SetKenwoodRIT(!view.rit).catch(setErrMsg)} />
|
||||
<Toggle label="XIT" on={view.xit} off={off} onClick={() => SetKenwoodXIT(!view.xit).catch(setErrMsg)} />
|
||||
{/* The offset itself. A lit RIT button says the feature is on and
|
||||
nothing about where it has put the receiver. */}
|
||||
{[-100, -10, 10, 100].map((d) => (
|
||||
<Toggle key={d} label={(d > 0 ? '+' : '') + d} on={false} off={off}
|
||||
onClick={() => NudgeKenwoodRIT(d).catch(setErrMsg)} />
|
||||
))}
|
||||
<span className="text-[11px] font-mono tabular-nums text-muted-foreground w-16">
|
||||
{view.rit_offset > 0 ? '+' : ''}{view.rit_offset || 0} Hz
|
||||
</span>
|
||||
<Toggle label={t('k3.clear')} on={false} off={off} onClick={() => ClearKenwoodRIT().catch(setErrMsg)} />
|
||||
{/* Antenna only when the radio answered AN — a K3 without the internal
|
||||
ATU has one socket and no switch to offer. */}
|
||||
{view.antenna > 0 && (<>
|
||||
|
||||
@@ -4,6 +4,7 @@ import 'leaflet/dist/leaflet.css';
|
||||
import { nightPolygon } from '../lib/greyline';
|
||||
import { gridToLatLon, gridSquareBounds, greatCirclePoints, pathBetween, destinationPoint } from '@/lib/maidenhead';
|
||||
import { writeUiPref } from '@/lib/uiPref';
|
||||
import { formatDistance } from '@/lib/units';
|
||||
|
||||
// Persisted free-pan view of the world map (when auto-zoom is off).
|
||||
function loadMapView(): { lat: number; lon: number; zoom: number } | null {
|
||||
@@ -446,8 +447,8 @@ export function WorldMap({ fromGrid, toGrid, fromLabel, toLabel, beamAzimuths, b
|
||||
</button>
|
||||
{path && (
|
||||
<div className="absolute bottom-1 left-1 z-[500] rounded-md bg-card/90 backdrop-blur px-2 py-1 text-[11px] font-mono shadow border border-border pointer-events-none">
|
||||
<div><span className="text-muted-foreground">Dist</span> {Math.round(path.distanceShort).toLocaleString()} km
|
||||
<span className="text-muted-foreground"> · LP</span> {Math.round(path.distanceLong).toLocaleString()} km</div>
|
||||
<div><span className="text-muted-foreground">Dist</span> {formatDistance(path.distanceShort)}
|
||||
<span className="text-muted-foreground"> · LP</span> {formatDistance(path.distanceLong)}</div>
|
||||
<div><span className="text-muted-foreground">Az SP</span> {Math.round(path.bearingShort)}°
|
||||
<span className="text-muted-foreground"> · LP</span> {Math.round(path.bearingLong)}°</div>
|
||||
</div>
|
||||
|
||||
@@ -8,7 +8,7 @@ import {
|
||||
Select, SelectTrigger, SelectValue, SelectContent, SelectItem,
|
||||
} from '@/components/ui/select';
|
||||
import { cn } from '@/lib/utils';
|
||||
import { GetLoTWDownloadAllCalls, SetLoTWDownloadAllCalls, OpenExternalURL, FindQSOsForUpload, UploadQSOsManual, DownloadConfirmations, CancelConfirmations, ImportHamlogConfirmations, ExportHamlogUnmatched, OpenADIFFile, SaveADIFFile, SyncPOTAHunterLog, ListQSO, BulkUpdateQSL, UploadCallsign, GetSlotStats } from '../../wailsjs/go/main/App';
|
||||
import { GetLoTWQSLDetail, SetLoTWQSLDetail, GetLoTWDownloadAllCalls, SetLoTWDownloadAllCalls, OpenExternalURL, FindQSOsForUpload, UploadQSOsManual, DownloadConfirmations, CancelConfirmations, ImportHamlogConfirmations, ExportHamlogUnmatched, OpenADIFFile, SaveADIFFile, 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';
|
||||
@@ -31,7 +31,7 @@ const UPLOAD_COLS: ColDef<UploadRow>[] = [
|
||||
];
|
||||
|
||||
type Confirmation = {
|
||||
callsign: string; qso_date: string; band: string; mode: string; country: string;
|
||||
callsign: string; station?: string; qso_date: string; band: string; mode: string; country: string;
|
||||
new_dxcc: boolean; new_band: boolean; new_mode: boolean; new_slot: boolean;
|
||||
};
|
||||
|
||||
@@ -257,7 +257,13 @@ export function QSLManagerPanel({ onEditQSO, actions, paperRequest }: {
|
||||
const [addNotFound, setAddNotFound] = useState(false);
|
||||
// LoTW only: pull the whole account rather than this profile's callsign.
|
||||
const [lotwAllCalls, setLotwAllCalls] = useState(false);
|
||||
useEffect(() => { GetLoTWDownloadAllCalls().then((v: boolean) => setLotwAllCalls(!!v)).catch(() => {}); }, []);
|
||||
// LoTW only: ask for the QSL dates and station details. Ten times slower to
|
||||
// build, so it is a choice rather than the default it used to be.
|
||||
const [lotwDetail, setLotwDetail] = useState(false);
|
||||
useEffect(() => {
|
||||
GetLoTWDownloadAllCalls().then((v: boolean) => setLotwAllCalls(!!v)).catch(() => {});
|
||||
GetLoTWQSLDetail().then((v: boolean) => setLotwDetail(!!v)).catch(() => {});
|
||||
}, []);
|
||||
// Download date window: 'last' = incremental since last pull, 'date' = from a
|
||||
// chosen date, 'all' = everything.
|
||||
const [sinceMode, setSinceMode] = useState<'last' | 'date' | 'all'>('last');
|
||||
@@ -613,6 +619,10 @@ export function QSLManagerPanel({ onEditQSO, actions, paperRequest }: {
|
||||
<thead className="sticky top-0 bg-card">
|
||||
<tr className="text-left text-muted-foreground border-b border-border">
|
||||
<th className="py-1.5 px-2">{t('qslm.thDateUtc')}</th><th className="py-1.5 px-2">{t('qslm.thCallsign')}</th>
|
||||
{/* Which of the operator's callsigns the contact was made
|
||||
under. Only worth a column when the list can hold more than
|
||||
one — see "All my callsigns" on the download. */}
|
||||
{shownConfs.some((c) => c.station) && <th className="py-1.5 px-2">{t('qslm.thStation')}</th>}
|
||||
<th className="py-1.5 px-2">{t('qslm.thBand')}</th><th className="py-1.5 px-2">{t('qslm.thMode')}</th>
|
||||
<th className="py-1.5 px-2">{t('qslm.thCountry')}</th><th className="py-1.5 px-2">{t('qslm.thNew')}</th>
|
||||
</tr>
|
||||
@@ -622,6 +632,9 @@ export function QSLManagerPanel({ onEditQSO, actions, paperRequest }: {
|
||||
<tr key={i} className="border-b border-border/40">
|
||||
<td className="py-1 px-2 font-mono">{fmtDate(c.qso_date)}</td>
|
||||
<td className="py-1 px-2 font-mono font-bold">{c.callsign}</td>
|
||||
{shownConfs.some((x) => x.station) && (
|
||||
<td className="py-1 px-2 font-mono text-muted-foreground">{c.station ?? ''}</td>
|
||||
)}
|
||||
<td className="py-1 px-2">{c.band}</td>
|
||||
<td className="py-1 px-2">{c.mode}</td>
|
||||
<td className="py-1 px-2 text-muted-foreground">{c.country}</td>
|
||||
@@ -751,6 +764,13 @@ export function QSLManagerPanel({ onEditQSO, actions, paperRequest }: {
|
||||
<Checkbox checked={addNotFound} onCheckedChange={(c) => setAddNotFound(!!c)} />
|
||||
{t('qslm.addNotFound')}
|
||||
</label>
|
||||
{service === 'lotw' && (
|
||||
<label className="flex items-center gap-1.5 text-[11px] text-muted-foreground cursor-pointer" title={t('qslm.lotwDetailTitle')}>
|
||||
<Checkbox checked={lotwDetail || addNotFound} disabled={addNotFound}
|
||||
onCheckedChange={(c) => { setLotwDetail(!!c); SetLoTWQSLDetail(!!c); }} />
|
||||
{t('qslm.lotwDetail')}
|
||||
</label>
|
||||
)}
|
||||
{service === 'lotw' && (
|
||||
<label className="flex items-center gap-1.5 text-[11px] text-muted-foreground cursor-pointer" title={t('qslm.lotwAllCallsTitle')}>
|
||||
<Checkbox checked={lotwAllCalls} onCheckedChange={(c) => { setLotwAllCalls(!!c); SetLoTWDownloadAllCalls(!!c); }} />
|
||||
|
||||
@@ -9,6 +9,7 @@ import { formatDateTimeUTC, formatDateOnly, getDateFormat, subscribeDateFormat }
|
||||
import { AgGridReact } from 'ag-grid-react';
|
||||
import { Columns3, FilterX, ListChecks } from 'lucide-react';
|
||||
import type { QSOForm } from '@/types';
|
||||
import { distanceUnit, distanceValue, subscribeDistanceUnit } from '@/lib/units';
|
||||
import { QSOContextMenu, type QSOMenuState } from './QSOContextMenu';
|
||||
import {
|
||||
Dialog, DialogContent, DialogHeader, DialogTitle, DialogFooter, DialogDescription,
|
||||
@@ -177,8 +178,9 @@ export const makeColCatalog = (t: TFn, myGrid?: string): ColEntry[] => [
|
||||
{ group: 'Contacted', label: t('rqg.c.lon'), colId: 'lon', headerName: t('rqg.c.lon'), field: 'lon' as any, width: 90, type: 'rightAligned', cellClass: 'font-mono' },
|
||||
// Derived, not stored: computed from the two locations at display time, like
|
||||
// the cluster grid's own distance column.
|
||||
{ group: 'Contacted', label: t('rqg.c.distance_km'), colId: 'distance_km', headerName: t('rqg.h.distance_km'), width: 90, type: 'rightAligned', cellClass: 'font-mono',
|
||||
valueGetter: (p) => qsoDistanceKm(p.data, myGrid),
|
||||
{ group: 'Contacted', label: t('rqg.c.distance_km'), colId: 'distance_km',
|
||||
headerName: t('rqg.h.distance_km') + ' (' + distanceUnit() + ')', width: 95, type: 'rightAligned', cellClass: 'font-mono',
|
||||
valueGetter: (p) => { const km = qsoDistanceKm(p.data, myGrid); return km ? distanceValue(km) : km; },
|
||||
comparator: (a, b) => (a ?? 0) - (b ?? 0), defaultVisible: true },
|
||||
{ group: 'Contacted', label: t('rqg.c.email'), colId: 'email', headerName: t('rqg.c.email'), field: 'email' as any, width: 180 },
|
||||
{ group: 'Contacted', label: t('rqg.c.web'), colId: 'web', headerName: t('rqg.c.web'), field: 'web' as any, width: 180 },
|
||||
@@ -335,7 +337,9 @@ export function RecentQSOsGrid({ rows, myGrid, selectAllSignal, selectRowSignal,
|
||||
// inside the column definitions, so nothing else would notice.
|
||||
const [dateFmt, setDateFmt] = useState(getDateFormat);
|
||||
useEffect(() => subscribeDateFormat(() => setDateFmt(getDateFormat())), []);
|
||||
const COL_CATALOG = useMemo(() => makeColCatalog(t, myGrid), [t, myGrid, dateFmt]);
|
||||
const [distUnit, setDistUnit] = useState(distanceUnit);
|
||||
useEffect(() => subscribeDistanceUnit(() => setDistUnit(distanceUnit())), []);
|
||||
const COL_CATALOG = useMemo(() => makeColCatalog(t, myGrid), [t, myGrid, dateFmt, distUnit]);
|
||||
|
||||
// Right-click: if the clicked row isn't already part of the selection,
|
||||
// select just it; then open the bulk-action menu on the whole selection.
|
||||
|
||||
@@ -80,6 +80,8 @@ import {
|
||||
} from '@/components/ui/select';
|
||||
import { cn } from '@/lib/utils';
|
||||
import { writeUiPref } from '@/lib/uiPref';
|
||||
import { setUseMiles } from '@/lib/units';
|
||||
import { iaruRegion, setIaruRegion, type IaruRegion } from '@/lib/bandplan';
|
||||
import { getDateFormat, setDateFormat, type DateFormat } from '@/lib/dateFormat';
|
||||
import { useI18n, FlagGB, FlagFR, type Lang } from '@/lib/i18n';
|
||||
import { useTheme, CONCRETE_THEMES, type ThemeChoice } from '@/lib/theme';
|
||||
@@ -688,8 +690,7 @@ function TelemetryToggle() {
|
||||
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
||||
<Checkbox checked={on} disabled={!loaded}
|
||||
onCheckedChange={(c) => { const v = !!c; setOn(v); SetTelemetryEnabled(v).catch(() => {}); }} />
|
||||
{t('settings.telemetry')}
|
||||
<span className="text-xs text-muted-foreground">({t('settings.telemetryHint')})</span>
|
||||
<span title={t('settings.telemetryHint')}>{t('settings.telemetry')}</span>
|
||||
</label>
|
||||
);
|
||||
}
|
||||
@@ -1747,6 +1748,8 @@ function SettingsModalImpl({ onClose, onSaved, initialSection, onMainPaneChanged
|
||||
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 [milesUnit, setMilesUnit] = useState(() => localStorage.getItem('opslog.distanceMiles') === '1');
|
||||
const [region, setRegion] = useState<IaruRegion>(() => iaruRegion());
|
||||
const [clusterWorkedSameSlot, setClusterWorkedSameSlot] = useState(() => localStorage.getItem('opslog.clusterWorkedSameSlot') === '1');
|
||||
// Declared HERE and not in ClusterPanel: that renderer is called as a plain
|
||||
// function by the PANELS map, so it must stay hooks-free.
|
||||
@@ -2065,6 +2068,8 @@ function SettingsModalImpl({ onClose, onSaved, initialSection, onMainPaneChanged
|
||||
try { await SaveGridScopeSettings(next); } catch { /* the panel keeps the choice either way */ }
|
||||
};
|
||||
const [chaseGrids, setChaseGrids] = useState(false);
|
||||
const [chasePotaOn, setChasePotaOn] = useState(() => localStorage.getItem('opslog.chasePota') !== '0');
|
||||
const [chaseSotaOn, setChaseSotaOn] = useState(() => localStorage.getItem('opslog.chaseSota') !== '0');
|
||||
const [chaseNew, setChaseNew] = useState(false);
|
||||
const [spotTTL, setSpotTTL] = useState(0);
|
||||
const [spotTTLText, setSpotTTLText] = useState('0');
|
||||
@@ -4865,7 +4870,7 @@ function SettingsModalImpl({ onClose, onSaved, initialSection, onMainPaneChanged
|
||||
<SelectItem value="yaesu">{t('wk.engYaesu')}</SelectItem>
|
||||
<SelectItem value="kenwood">{t('wk.engKenwood')}</SelectItem>
|
||||
<SelectItem value="flex">{t('wk.engFlex')}</SelectItem>
|
||||
<SelectItem value="tci" disabled>{t('wk.engTci')}</SelectItem>
|
||||
<SelectItem value="tci">{t('wk.engTci')}</SelectItem>
|
||||
</SelectContent>
|
||||
</Select>
|
||||
</div>
|
||||
@@ -4926,6 +4931,22 @@ function SettingsModalImpl({ onClose, onSaved, initialSection, onMainPaneChanged
|
||||
</div>
|
||||
</div>
|
||||
</>
|
||||
) : wk.engine === 'tci' ? (
|
||||
<>
|
||||
{(!catCfg.enabled || catCfg.backend !== 'tci') && (
|
||||
<p className="text-xs font-medium text-warning -mt-1 flex items-start gap-1.5">
|
||||
<span aria-hidden>⚠</span>
|
||||
<span>{t('wk.catWarnTci', { backend: catCfg.enabled ? (catCfg.backend || 'none') : 'disabled' })}</span>
|
||||
</p>
|
||||
)}
|
||||
<p className="text-xs text-muted-foreground -mt-1">{t('wk.tciHint')}</p>
|
||||
<div className="grid grid-cols-4 gap-3">
|
||||
<div className="space-y-1">
|
||||
<Label>{t('wk.speed')}</Label>
|
||||
<Input type="number" min={5} max={60} value={wk.wpm} onChange={(e) => setWkField({ wpm: num(e.target.value, 25) })} className="font-mono" />
|
||||
</div>
|
||||
</div>
|
||||
</>
|
||||
) : wk.engine === 'flex' ? (
|
||||
<>
|
||||
{(!catCfg.enabled || catCfg.backend !== 'flex') && (
|
||||
@@ -5295,11 +5316,6 @@ function SettingsModalImpl({ onClose, onSaved, initialSection, onMainPaneChanged
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
<p className="text-xs text-muted-foreground">
|
||||
{t('clu.freeNodes')} <span className="font-mono">dxc.k0xm.net:7300</span>,{' '}
|
||||
<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'); }} />
|
||||
@@ -5361,11 +5377,24 @@ function SettingsModalImpl({ onClose, onSaved, initialSection, onMainPaneChanged
|
||||
const n = parseInt(raw, 10);
|
||||
if (Number.isFinite(n) && n > 0) SetSpotMax(Math.min(10000, n)).catch(() => {});
|
||||
}} />
|
||||
<span className="text-xs text-muted-foreground">{t('clu.spotMaxHint')}</span>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="border-t border-border/60 pt-3 space-y-2">
|
||||
{/* Chase switches: off, the marker stops being TOLD, everywhere at
|
||||
once — badge, colour, filter chip, reference column. A "new band
|
||||
+ new POTA" spot then reads NEW BAND alone. */}
|
||||
<label className="flex items-center gap-2 text-sm cursor-pointer" title={t('clu.chasePotaHint')}>
|
||||
<Checkbox checked={chasePotaOn}
|
||||
onCheckedChange={(c) => { const v = !!c; setChasePotaOn(v); writeUiPref('opslog.chasePota', v ? '1' : '0'); }} />
|
||||
{t('clu.chasePota')}
|
||||
</label>
|
||||
<label className="flex items-center gap-2 text-sm cursor-pointer" title={t('clu.chaseSotaHint')}>
|
||||
<Checkbox checked={chaseSotaOn}
|
||||
onCheckedChange={(c) => { const v = !!c; setChaseSotaOn(v); writeUiPref('opslog.chaseSota', v ? '1' : '0'); }} />
|
||||
{t('clu.chaseSota')}
|
||||
</label>
|
||||
<label className="flex items-start gap-2 text-sm cursor-pointer">
|
||||
<Checkbox checked={chaseGrids} className="mt-0.5"
|
||||
onCheckedChange={(c) => { setChaseGrids(!!c); SetChaseNewGrids(!!c).catch(() => {}); }} />
|
||||
@@ -6759,7 +6788,7 @@ function SettingsModalImpl({ onClose, onSaved, initialSection, onMainPaneChanged
|
||||
useLocalLogbook(); // SQLite → default logbook file (clears any per-profile path)
|
||||
}}
|
||||
>
|
||||
<SelectTrigger className="h-8 w-72"><SelectValue /></SelectTrigger>
|
||||
<SelectTrigger className="h-8 w-72" title={t('gen.iaruHint')}><SelectValue /></SelectTrigger>
|
||||
<SelectContent>
|
||||
<SelectItem value="sqlite">{t('db.optSqlite')}</SelectItem>
|
||||
<SelectItem value="mysql">{t('db.optMysql')}</SelectItem>
|
||||
@@ -7129,7 +7158,7 @@ function SettingsModalImpl({ onClose, onSaved, initialSection, onMainPaneChanged
|
||||
const { lang, setLang, t } = useI18n();
|
||||
return (
|
||||
<>
|
||||
<SectionHeader title={t('sec.general')} hint={t('gen.hint')} />
|
||||
<SectionHeader title={t('sec.general')} />
|
||||
<div className="space-y-3 max-w-3xl">
|
||||
<div className="flex items-center gap-3">
|
||||
<Label className="text-sm w-40">{t('settings.language')}</Label>
|
||||
@@ -7157,15 +7186,32 @@ function SettingsModalImpl({ onClose, onSaved, initialSection, onMainPaneChanged
|
||||
['us', t('gen.dateUS'), '07-30-2026 14:25']] as [DateFormat, string, string][]).map(([code, label, sample]) => (
|
||||
<button key={code} type="button" title={sample}
|
||||
onClick={() => { setDateFormat(code); setDateFmtSel(code); }}
|
||||
className={cn('flex flex-col items-start px-3 py-1 text-sm font-medium border-l border-border first:border-l-0',
|
||||
className={cn('px-3 py-1.5 text-sm font-medium border-l border-border first:border-l-0',
|
||||
dateFmtSel === code ? 'bg-primary text-primary-foreground' : 'bg-card text-muted-foreground hover:bg-muted')}>
|
||||
{label}
|
||||
<span className="text-[10px] font-mono opacity-70">{sample}</span>
|
||||
</button>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="flex items-center gap-2 text-sm">
|
||||
{/* The IARU region drives the band edges and mode segments the band
|
||||
maps draw — Region 2's 40 m runs to 7300, Region 1's stops at
|
||||
7200 — and nothing else: spots and logging are region-blind. */}
|
||||
<Label className="text-sm w-40 shrink-0">{t('gen.iaruRegion')}</Label>
|
||||
<Select value={String(region)} onValueChange={(v) => {
|
||||
const r = (v === '2' ? 2 : v === '3' ? 3 : 1) as IaruRegion;
|
||||
setRegion(r); setIaruRegion(r);
|
||||
}}>
|
||||
<SelectTrigger className="h-8 w-72"><SelectValue /></SelectTrigger>
|
||||
<SelectContent>
|
||||
<SelectItem value="1">{t('gen.iaruR1')}</SelectItem>
|
||||
<SelectItem value="2">{t('gen.iaruR2')}</SelectItem>
|
||||
<SelectItem value="3">{t('gen.iaruR3')}</SelectItem>
|
||||
</SelectContent>
|
||||
</Select>
|
||||
</div>
|
||||
|
||||
<ThemeSelector />
|
||||
|
||||
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
||||
@@ -7187,11 +7233,10 @@ function SettingsModalImpl({ onClose, onSaved, initialSection, onMainPaneChanged
|
||||
{/* Super Check Partial / N+1 — downloads the community MASTER.SCP list and
|
||||
shows a two-column callsign helper (partial matches + one-edit calls). */}
|
||||
<div className="border-t border-border/60 pt-3 space-y-2">
|
||||
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
||||
<label className="flex items-center gap-2 text-sm cursor-pointer" title={t('scp.settingsHint')}>
|
||||
<Checkbox checked={scp.enabled} disabled={scpBusy} onCheckedChange={(c) => toggleScp(!!c)} />
|
||||
{t('scp.enable')}
|
||||
</label>
|
||||
<p className="text-[11px] text-muted-foreground">{t('scp.settingsHint')}</p>
|
||||
{scp.enabled && (
|
||||
<div className="flex items-center gap-3">
|
||||
<Button variant="outline" size="sm" onClick={downloadScp} disabled={scpBusy}>
|
||||
@@ -7219,11 +7264,18 @@ function SettingsModalImpl({ onClose, onSaved, initialSection, onMainPaneChanged
|
||||
</label>
|
||||
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
||||
<Checkbox checked={groupDigital} onCheckedChange={(c) => { const v = !!c; setGroupDigital(v); writeUiPref('opslog.groupDigitalSlots', v ? '1' : '0'); }} />
|
||||
{t('gen.groupDigital')} <span className="text-xs text-muted-foreground">{t('gen.groupDigitalHint')}</span>
|
||||
<span title={t('gen.groupDigitalHint')}>{t('gen.groupDigital')}</span>
|
||||
</label>
|
||||
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
||||
{/* Distances are computed in km everywhere and converted at display
|
||||
time — see lib/units. Changing this repaints the columns that
|
||||
already carry a distance; nothing stored moves. */}
|
||||
<Checkbox checked={milesUnit} onCheckedChange={(c) => { const v = !!c; setMilesUnit(v); setUseMiles(v); }} />
|
||||
{t('gen.miles')}
|
||||
</label>
|
||||
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
||||
<Checkbox checked={checkUpdates} onCheckedChange={(c) => { const v = !!c; setCheckUpdates(v); writeUiPref('opslog.checkUpdates', v ? '1' : '0'); }} />
|
||||
{t('gen.checkUpdates')} <span className="text-xs text-muted-foreground">{t('gen.checkUpdatesHint')}</span>
|
||||
{t('gen.checkUpdates')}
|
||||
</label>
|
||||
<TelemetryToggle />
|
||||
|
||||
@@ -7286,12 +7338,7 @@ function SettingsModalImpl({ onClose, onSaved, initialSection, onMainPaneChanged
|
||||
}}
|
||||
className="mt-0.5"
|
||||
/>
|
||||
<span>
|
||||
{t('gen.clubUse')}
|
||||
<span className="block text-xs text-muted-foreground mt-0.5">
|
||||
{t('gen.clubDesc')}
|
||||
</span>
|
||||
</span>
|
||||
<span title={t('gen.clubDesc')}>{t('gen.clubUse')}</span>
|
||||
</label>
|
||||
<div className="flex items-center gap-3 pl-6">
|
||||
<Button variant="outline" size="sm" className="h-8" disabled={clubBusy}
|
||||
|
||||
@@ -26,7 +26,7 @@ interface Props {
|
||||
wpm: number;
|
||||
macros: WKMacro[];
|
||||
sent: string; // text echoed back by the keyer as it transmits
|
||||
source: 'winkeyer' | 'icom' | 'flex' | 'yaesu' | 'kenwood'; // CW output engine (chosen in Settings → CW Keyer)
|
||||
source: 'winkeyer' | 'icom' | 'flex' | 'yaesu' | 'kenwood' | 'tci'; // CW output engine (chosen in Settings → CW Keyer)
|
||||
breakIn?: number; // Icom CW break-in: 0=OFF, 1=SEMI, 2=FULL
|
||||
onSetBreakIn?: (mode: number) => void;
|
||||
onSelectPort: (p: string) => void;
|
||||
@@ -109,16 +109,16 @@ export function WinkeyerPanel({
|
||||
<Radio className="size-4 text-primary shrink-0" />
|
||||
{/* CW output engine (chosen in Settings → CW Keyer). */}
|
||||
<span className="text-xs font-semibold uppercase tracking-wider text-muted-foreground shrink-0">
|
||||
{source === 'icom' ? 'Icom CW' : source === 'flex' ? 'Flex CWX' : source === 'yaesu' ? 'Yaesu CW' : source === 'kenwood' ? 'Kenwood CW' : 'WinKeyer'}
|
||||
{source === 'icom' ? 'Icom CW' : source === 'flex' ? 'Flex CWX' : source === 'yaesu' ? 'Yaesu CW' : source === 'kenwood' ? 'Kenwood CW' : source === 'tci' ? 'TCI CW' : 'WinKeyer'}
|
||||
</span>
|
||||
<span className={cn('size-2 rounded-full', connected ? (status.busy ? 'bg-warning animate-pulse' : 'bg-success') : 'bg-muted-foreground/40')}
|
||||
title={connected ? (status.busy ? t('wkp.sending') : t('wkp.connectedV', { version: status.version })) : t('wkp.disconnected')} />
|
||||
<div className="flex-1" />
|
||||
{source === 'icom' || source === 'flex' || source === 'yaesu' || source === 'kenwood' ? (
|
||||
{source === 'icom' || source === 'flex' || source === 'yaesu' || source === 'kenwood' || source === 'tci' ? (
|
||||
<span className="text-[11px] font-medium text-muted-foreground">
|
||||
{source === 'flex'
|
||||
? (connected ? t('wkp.cwxReady') : t('wkp.cwxOffline'))
|
||||
: source === 'yaesu' || source === 'kenwood'
|
||||
: source === 'yaesu' || source === 'kenwood' || source === 'tci'
|
||||
? (connected ? t('wkp.rigReady') : t('wkp.rigOffline'))
|
||||
: (connected ? t('wkp.civReady') : t('wkp.civOffline'))}
|
||||
</span>
|
||||
|
||||
@@ -0,0 +1,113 @@
|
||||
// IARU band plans, by region.
|
||||
//
|
||||
// The band maps used to carry one hard-coded table — Region 1's — so a US or
|
||||
// Australian operator saw 40 m stop at 7200 while stations sat spotted at 7250,
|
||||
// and the SSB wash started 25 kHz early. The region is a station-level fact the
|
||||
// operator states once (Settings → General); everything drawing a band edge or
|
||||
// a mode segment reads it from here.
|
||||
//
|
||||
// The tables are deliberately coarse: a band map's wash is CONTEXT, not a
|
||||
// regulatory chart. Only the segments that differ between regions in ways an
|
||||
// operator notices are split out; national fine print (US licence classes,
|
||||
// beacon slots) does not belong in a background tint.
|
||||
import { writeUiPref } from '@/lib/uiPref';
|
||||
|
||||
export type IaruRegion = 1 | 2 | 3;
|
||||
export const KEY_IARU_REGION = 'opslog.iaruRegion';
|
||||
|
||||
export function iaruRegion(): IaruRegion {
|
||||
try {
|
||||
const v = localStorage.getItem(KEY_IARU_REGION);
|
||||
return v === '2' ? 2 : v === '3' ? 3 : 1;
|
||||
} catch { return 1; }
|
||||
}
|
||||
|
||||
export function setIaruRegion(r: IaruRegion): void {
|
||||
writeUiPref(KEY_IARU_REGION, String(r));
|
||||
listeners.forEach((l) => l());
|
||||
}
|
||||
|
||||
// The band maps capture the plan inside their render, so a change must reach
|
||||
// them the way the distance unit reaches the grids.
|
||||
const listeners = new Set<() => void>();
|
||||
export function subscribeIaruRegion(fn: () => void): () => void {
|
||||
listeners.add(fn);
|
||||
return () => { listeners.delete(fn); };
|
||||
}
|
||||
|
||||
export type SegMode = 'cw' | 'digi' | 'phone';
|
||||
type Seg = [number, number, SegMode];
|
||||
|
||||
interface Plan {
|
||||
ranges: Record<string, [number, number]>;
|
||||
segments: Record<string, Seg[]>;
|
||||
}
|
||||
|
||||
// Region 1 — Europe / Africa / Middle East / northern Asia. The baseline the
|
||||
// other two override.
|
||||
const R1: Plan = {
|
||||
ranges: {
|
||||
'160m': [1800, 2000], '80m': [3500, 3800], '60m': [5350, 5450],
|
||||
'40m': [7000, 7200], '30m': [10100, 10150], '20m': [14000, 14350],
|
||||
'17m': [18068, 18168], '15m': [21000, 21450], '12m': [24890, 24990],
|
||||
'10m': [28000, 29700], '6m': [50000, 50500], '4m': [70000, 70500],
|
||||
'2m': [144000, 146000], '70cm': [430000, 440000],
|
||||
},
|
||||
segments: {
|
||||
'160m': [[1800, 1838, 'cw'], [1838, 1840, 'digi'], [1840, 2000, 'phone']],
|
||||
'80m': [[3500, 3580, 'cw'], [3580, 3600, 'digi'], [3600, 3800, 'phone']],
|
||||
'60m': [[5350, 5450, 'phone']],
|
||||
'40m': [[7000, 7040, 'cw'], [7040, 7100, 'digi'], [7100, 7200, 'phone']],
|
||||
'30m': [[10100, 10130, 'cw'], [10130, 10150, 'digi']],
|
||||
'20m': [[14000, 14070, 'cw'], [14070, 14100, 'digi'], [14100, 14350, 'phone']],
|
||||
'17m': [[18068, 18095, 'cw'], [18095, 18110, 'digi'], [18110, 18168, 'phone']],
|
||||
'15m': [[21000, 21070, 'cw'], [21070, 21150, 'digi'], [21150, 21450, 'phone']],
|
||||
'12m': [[24890, 24915, 'cw'], [24915, 24940, 'digi'], [24940, 24990, 'phone']],
|
||||
'10m': [[28000, 28070, 'cw'], [28070, 28300, 'digi'], [28300, 29700, 'phone']],
|
||||
'6m': [[50000, 50100, 'cw'], [50100, 50500, 'phone']],
|
||||
},
|
||||
};
|
||||
|
||||
// Region 2 — the Americas. 80 m runs to 4000 and 40 m to 7300, with phone from
|
||||
// 7125 (the whole point of asking the region: a KP4 ragchew on 7250 must not
|
||||
// hang past the top of the map).
|
||||
const R2: Plan = {
|
||||
ranges: {
|
||||
...R1.ranges,
|
||||
'80m': [3500, 4000], '40m': [7000, 7300],
|
||||
'6m': [50000, 54000], '2m': [144000, 148000], '70cm': [420000, 450000],
|
||||
},
|
||||
segments: {
|
||||
...R1.segments,
|
||||
'80m': [[3500, 3570, 'cw'], [3570, 3600, 'digi'], [3600, 4000, 'phone']],
|
||||
'40m': [[7000, 7040, 'cw'], [7040, 7125, 'digi'], [7125, 7300, 'phone']],
|
||||
'6m': [[50000, 50100, 'cw'], [50100, 54000, 'phone']],
|
||||
},
|
||||
};
|
||||
|
||||
// Region 3 — Asia-Pacific. 80 m to 3900; 40 m as Region 1's shape.
|
||||
const R3: Plan = {
|
||||
ranges: {
|
||||
...R1.ranges,
|
||||
'80m': [3500, 3900],
|
||||
'6m': [50000, 54000], '2m': [144000, 148000], '70cm': [430000, 450000],
|
||||
},
|
||||
segments: {
|
||||
...R1.segments,
|
||||
'80m': [[3500, 3535, 'cw'], [3535, 3600, 'digi'], [3600, 3900, 'phone']],
|
||||
'6m': [[50000, 50100, 'cw'], [50100, 54000, 'phone']],
|
||||
},
|
||||
};
|
||||
|
||||
function plan(): Plan {
|
||||
const r = iaruRegion();
|
||||
return r === 2 ? R2 : r === 3 ? R3 : R1;
|
||||
}
|
||||
|
||||
export function bandRange(band: string): [number, number] | undefined {
|
||||
return plan().ranges[band];
|
||||
}
|
||||
|
||||
export function bandSegments(band: string): Seg[] {
|
||||
return plan().segments[band] ?? [];
|
||||
}
|
||||
+32
-10
File diff suppressed because one or more lines are too long
@@ -11,7 +11,25 @@
|
||||
//
|
||||
// They compose deliberately: mute what is done, light up what is not.
|
||||
|
||||
export type SpotDisplayOptions = { muteWorked: boolean; slotHighlight: boolean };
|
||||
export type SpotDisplayOptions = {
|
||||
muteWorked: boolean; slotHighlight: boolean;
|
||||
// Chase switches (Settings → DX Cluster), ON by default. An operator who does
|
||||
// not chase parks does not want NEW POTA shouting from every activator spot:
|
||||
// off, the marker is withdrawn at the display layer — a "new band + new POTA"
|
||||
// spot simply reads NEW BAND — and the reference column goes quiet. The facts
|
||||
// keep being computed; only the telling stops, so ticking the box back on
|
||||
// needs no rescan.
|
||||
chasePota: boolean; chaseSota: boolean;
|
||||
};
|
||||
|
||||
// chasePota/chaseSota read the switches directly — for the places that show a
|
||||
// REFERENCE rather than a status (the POTA and SOTA columns).
|
||||
export function chasePota(): boolean {
|
||||
try { return localStorage.getItem('opslog.chasePota') !== '0'; } catch { return true; }
|
||||
}
|
||||
export function chaseSota(): boolean {
|
||||
try { return localStorage.getItem('opslog.chaseSota') !== '0'; } catch { return true; }
|
||||
}
|
||||
|
||||
// Both options are withdrawn from the filter panel for now. The machinery below
|
||||
// is deliberately kept whole — it is correct and hard-won — so putting the two
|
||||
@@ -23,14 +41,19 @@ export type SpotDisplayOptions = { muteWorked: boolean; slotHighlight: boolean }
|
||||
export const SPOT_DISPLAY_OPTIONS_EXPOSED = false;
|
||||
|
||||
export function readSpotDisplayOptions(): SpotDisplayOptions {
|
||||
if (!SPOT_DISPLAY_OPTIONS_EXPOSED) return { muteWorked: false, slotHighlight: false };
|
||||
// The EXPOSED flag only withdraws the two original switches; the chase
|
||||
// switches are live regardless.
|
||||
if (!SPOT_DISPLAY_OPTIONS_EXPOSED) {
|
||||
return { muteWorked: false, slotHighlight: false, chasePota: chasePota(), chaseSota: chaseSota() };
|
||||
}
|
||||
try {
|
||||
return {
|
||||
muteWorked: localStorage.getItem('opslog.clusterMuteWorked') === '1',
|
||||
slotHighlight: localStorage.getItem('opslog.clusterSlotHighlight') === '1',
|
||||
chasePota: chasePota(), chaseSota: chaseSota(),
|
||||
};
|
||||
} catch {
|
||||
return { muteWorked: false, slotHighlight: false };
|
||||
return { muteWorked: false, slotHighlight: false, chasePota: true, chaseSota: true };
|
||||
}
|
||||
}
|
||||
|
||||
@@ -72,6 +95,9 @@ export function applySpotDisplay<T extends Entry>(s: T, o: SpotDisplayOptions):
|
||||
if (o.muteWorked) {
|
||||
e = { ...e, worked_call: false } as NonNullable<T>;
|
||||
}
|
||||
if (!o.chasePota && e.new_pota) {
|
||||
e = { ...e, new_pota: false } as NonNullable<T>;
|
||||
}
|
||||
return e;
|
||||
}
|
||||
|
||||
|
||||
@@ -40,6 +40,10 @@ const PORTABLE_KEYS = [
|
||||
'opslog.clusterFilterSource', 'opslog.clusterGroup', 'opslog.clusterBands',
|
||||
'opslog.clusterLockBand', 'opslog.clusterLockMode', 'opslog.clusterStatusFilter',
|
||||
'opslog.clusterModeFilter', 'opslog.clusterSearch', 'opslog.clusterHideWorked',
|
||||
'opslog.distanceMiles', // distances shown in statute miles rather than km
|
||||
'opslog.iaruRegion', // IARU region (1/2/3) — band edges and segments on the band maps
|
||||
'opslog.chasePota', // show POTA references and the NEW POTA marker on spots
|
||||
'opslog.chaseSota', // show SOTA references on spots
|
||||
'opslog.activeTab', // last selected tab
|
||||
'opslog.mainSplit', // Main tab: width share of the left pane (percent) — legacy, read once to seed mainShares
|
||||
'opslog.mainShares', // Main tab: column shares per column count, as {2:[..],3:[..],4:[..]}
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
// Distance units.
|
||||
//
|
||||
// Everything is COMPUTED in kilometres — the great-circle maths, the backend's
|
||||
// distance_km on a spot, the map's path lengths — and converted once, here, at
|
||||
// display time. Storing miles anywhere would mean two sources of truth for the
|
||||
// same number and a rounding error that grows with every hop.
|
||||
//
|
||||
// The preference is portable (see lib/uiPref): an operator who works in miles
|
||||
// works in miles on every machine they copy their folder to.
|
||||
import { writeUiPref } from '@/lib/uiPref';
|
||||
|
||||
export const KEY_MILES = 'opslog.distanceMiles';
|
||||
const KM_PER_MILE = 1.609344; // statute miles, the ones a US licence is used in
|
||||
|
||||
export function useMiles(): boolean {
|
||||
try { return localStorage.getItem(KEY_MILES) === '1'; } catch { return false; }
|
||||
}
|
||||
|
||||
export function setUseMiles(on: boolean): void {
|
||||
writeUiPref(KEY_MILES, on ? '1' : '0');
|
||||
listeners.forEach((l) => l());
|
||||
}
|
||||
|
||||
// subscribeDistanceUnit notifies on a change. The grids capture the unit inside
|
||||
// their column definitions (header text and formatter both), so without this a
|
||||
// toggle would only show up on the next language change or restart.
|
||||
const listeners = new Set<() => void>();
|
||||
export function subscribeDistanceUnit(fn: () => void): () => void {
|
||||
listeners.add(fn);
|
||||
return () => { listeners.delete(fn); };
|
||||
}
|
||||
|
||||
// distanceValue converts a distance in km to the operator's unit, rounded to a
|
||||
// whole unit — the precision the inputs actually justify (a 4-character grid is
|
||||
// a square tens of kilometres wide).
|
||||
export function distanceValue(km: number): number {
|
||||
if (!isFinite(km)) return 0;
|
||||
return Math.round(useMiles() ? km / KM_PER_MILE : km);
|
||||
}
|
||||
|
||||
// distanceUnit is the short label: "km" or "mi".
|
||||
export function distanceUnit(): string {
|
||||
return useMiles() ? 'mi' : 'km';
|
||||
}
|
||||
|
||||
// formatDistance is value + unit, thousands-separated: "12 345 km".
|
||||
export function formatDistance(km: number): string {
|
||||
return `${distanceValue(km).toLocaleString()} ${distanceUnit()}`;
|
||||
}
|
||||
@@ -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.26.20';
|
||||
export const APP_VERSION = '0.26.23';
|
||||
|
||||
// Author / credits, shown in Help -> About.
|
||||
export const APP_AUTHOR = 'F4BPO';
|
||||
|
||||
Vendored
+14
@@ -505,6 +505,8 @@ export function GetLiveStations():Promise<Array<main.LiveStation>>;
|
||||
|
||||
export function GetLoTWDownloadAllCalls():Promise<boolean>;
|
||||
|
||||
export function GetLoTWQSLDetail():Promise<boolean>;
|
||||
|
||||
export function GetLoTWUsersStatus():Promise<main.LoTWUsersStatus>;
|
||||
|
||||
export function GetLogFilePath():Promise<string>;
|
||||
@@ -1143,6 +1145,8 @@ export function SetKenwoodNB(arg1:boolean):Promise<void>;
|
||||
|
||||
export function SetKenwoodNR(arg1:boolean):Promise<void>;
|
||||
|
||||
export function SetKenwoodPanelMode(arg1:string):Promise<void>;
|
||||
|
||||
export function SetKenwoodPower(arg1:number):Promise<void>;
|
||||
|
||||
export function SetKenwoodPreamp(arg1:boolean):Promise<void>;
|
||||
@@ -1151,6 +1155,8 @@ export function SetKenwoodRFGain(arg1:number):Promise<void>;
|
||||
|
||||
export function SetKenwoodRIT(arg1:boolean):Promise<void>;
|
||||
|
||||
export function SetKenwoodRITOffset(arg1:number):Promise<void>;
|
||||
|
||||
export function SetKenwoodSquelch(arg1:number):Promise<void>;
|
||||
|
||||
export function SetKenwoodTX(arg1:boolean):Promise<void>;
|
||||
@@ -1161,6 +1167,8 @@ export function SetLinkedAmps(arg1:Array<string>):Promise<void>;
|
||||
|
||||
export function SetLoTWDownloadAllCalls(arg1:boolean):Promise<void>;
|
||||
|
||||
export function SetLoTWQSLDetail(arg1:boolean):Promise<void>;
|
||||
|
||||
export function SetMotorFollow(arg1:boolean,arg2:number,arg3:string):Promise<void>;
|
||||
|
||||
export function SetOpsLogQSLReceived(arg1:number,arg2:boolean):Promise<void>;
|
||||
@@ -1275,6 +1283,12 @@ export function SyncFolderNow():Promise<number>;
|
||||
|
||||
export function SyncPOTAHunterLog(arg1:boolean,arg2:boolean):Promise<main.POTASyncResult>;
|
||||
|
||||
export function TCISendCW(arg1:string):Promise<void>;
|
||||
|
||||
export function TCISetKeySpeed(arg1:number):Promise<void>;
|
||||
|
||||
export function TCIStopCW():Promise<void>;
|
||||
|
||||
export function TailLogFile(arg1:number):Promise<string>;
|
||||
|
||||
export function TestCloudlogUpload():Promise<string>;
|
||||
|
||||
@@ -950,6 +950,10 @@ export function GetLoTWDownloadAllCalls() {
|
||||
return window['go']['main']['App']['GetLoTWDownloadAllCalls']();
|
||||
}
|
||||
|
||||
export function GetLoTWQSLDetail() {
|
||||
return window['go']['main']['App']['GetLoTWQSLDetail']();
|
||||
}
|
||||
|
||||
export function GetLoTWUsersStatus() {
|
||||
return window['go']['main']['App']['GetLoTWUsersStatus']();
|
||||
}
|
||||
@@ -2226,6 +2230,10 @@ export function SetKenwoodNR(arg1) {
|
||||
return window['go']['main']['App']['SetKenwoodNR'](arg1);
|
||||
}
|
||||
|
||||
export function SetKenwoodPanelMode(arg1) {
|
||||
return window['go']['main']['App']['SetKenwoodPanelMode'](arg1);
|
||||
}
|
||||
|
||||
export function SetKenwoodPower(arg1) {
|
||||
return window['go']['main']['App']['SetKenwoodPower'](arg1);
|
||||
}
|
||||
@@ -2242,6 +2250,10 @@ export function SetKenwoodRIT(arg1) {
|
||||
return window['go']['main']['App']['SetKenwoodRIT'](arg1);
|
||||
}
|
||||
|
||||
export function SetKenwoodRITOffset(arg1) {
|
||||
return window['go']['main']['App']['SetKenwoodRITOffset'](arg1);
|
||||
}
|
||||
|
||||
export function SetKenwoodSquelch(arg1) {
|
||||
return window['go']['main']['App']['SetKenwoodSquelch'](arg1);
|
||||
}
|
||||
@@ -2262,6 +2274,10 @@ export function SetLoTWDownloadAllCalls(arg1) {
|
||||
return window['go']['main']['App']['SetLoTWDownloadAllCalls'](arg1);
|
||||
}
|
||||
|
||||
export function SetLoTWQSLDetail(arg1) {
|
||||
return window['go']['main']['App']['SetLoTWQSLDetail'](arg1);
|
||||
}
|
||||
|
||||
export function SetMotorFollow(arg1, arg2, arg3) {
|
||||
return window['go']['main']['App']['SetMotorFollow'](arg1, arg2, arg3);
|
||||
}
|
||||
@@ -2490,6 +2506,18 @@ export function SyncPOTAHunterLog(arg1, arg2) {
|
||||
return window['go']['main']['App']['SyncPOTAHunterLog'](arg1, arg2);
|
||||
}
|
||||
|
||||
export function TCISendCW(arg1) {
|
||||
return window['go']['main']['App']['TCISendCW'](arg1);
|
||||
}
|
||||
|
||||
export function TCISetKeySpeed(arg1) {
|
||||
return window['go']['main']['App']['TCISetKeySpeed'](arg1);
|
||||
}
|
||||
|
||||
export function TCIStopCW() {
|
||||
return window['go']['main']['App']['TCIStopCW']();
|
||||
}
|
||||
|
||||
export function TailLogFile(arg1) {
|
||||
return window['go']['main']['App']['TailLogFile'](arg1);
|
||||
}
|
||||
|
||||
@@ -1072,6 +1072,7 @@ export namespace cat {
|
||||
model?: string;
|
||||
elecraft: boolean;
|
||||
mode?: string;
|
||||
data_sub?: string;
|
||||
transmitting: boolean;
|
||||
split: boolean;
|
||||
split_tx_hz: number;
|
||||
@@ -1108,6 +1109,7 @@ export namespace cat {
|
||||
this.model = source["model"];
|
||||
this.elecraft = source["elecraft"];
|
||||
this.mode = source["mode"];
|
||||
this.data_sub = source["data_sub"];
|
||||
this.transmitting = source["transmitting"];
|
||||
this.split = source["split"];
|
||||
this.split_tx_hz = source["split_tx_hz"];
|
||||
|
||||
@@ -35,6 +35,11 @@ type KenwoodTXState struct {
|
||||
Model string `json:"model,omitempty"`
|
||||
Elecraft bool `json:"elecraft"` // a K3/K4 rather than a Kenwood
|
||||
Mode string `json:"mode,omitempty"`
|
||||
// DataSub is the K3/K4 DATA submode while in DATA mode (DT): "DATA A",
|
||||
// "AFSK A", "FSK D" or "PSK D". Empty on a Kenwood, and outside DATA. The
|
||||
// panel's two DATA buttons need it to show WHICH data mode the rig is in —
|
||||
// FT8 wants DATA A, RTTY wants FSK D, and MD6 alone cannot say which.
|
||||
DataSub string `json:"data_sub,omitempty"`
|
||||
|
||||
Transmitting bool `json:"transmitting"`
|
||||
Split bool `json:"split"`
|
||||
@@ -107,10 +112,12 @@ type KenwoodPanelController interface {
|
||||
SetKenwoodRIT(bool) error
|
||||
SetKenwoodXIT(bool) error
|
||||
NudgeKenwoodRIT(int) error
|
||||
SetKenwoodRITOffset(int) error
|
||||
ClearKenwoodRIT() error
|
||||
SetKenwoodTX(bool) error
|
||||
TuneKenwoodATU() error
|
||||
ToggleKenwoodATU() error
|
||||
SetKenwoodPanelMode(string) error
|
||||
}
|
||||
|
||||
// kenwoodPanelSlowBeat is how many polls pass between full re-reads of the
|
||||
@@ -212,6 +219,14 @@ func (k *Kenwood) readPanelSettings() {
|
||||
if v, ok := k.askNum("NR;", "NR", 1); ok {
|
||||
k.panel.NR = v != 0
|
||||
}
|
||||
// The DATA submode, Elecraft only (a plain Kenwood has no DT and would "?;"
|
||||
// it). Read every settings beat: the operator changes it from the rig's own
|
||||
// front panel mid-session, and the two DATA buttons must follow.
|
||||
if k.elecraft {
|
||||
if v, ok := k.askNum("DT;", "DT", 1); ok {
|
||||
k.panel.DataSub = kenwoodDataSubName(v)
|
||||
}
|
||||
}
|
||||
if v, ok := k.askNum("GT;", "GT", 3); ok {
|
||||
k.panel.AGC = kenwoodAGCName(v)
|
||||
}
|
||||
@@ -564,6 +579,16 @@ func (k *Kenwood) SetKenwoodXIT(on bool) error {
|
||||
|
||||
// ClearKenwoodRIT zeroes the RIT/XIT offset, both at once — which is what RC
|
||||
// does and what the operator means by "clear it".
|
||||
// SetKenwoodRITOffset writes the offset as an ABSOLUTE value — what the shared
|
||||
// ShiftRow control speaks. Nudge stays for the keyboard clarifier; both funnel
|
||||
// into the same RO write.
|
||||
func (k *Kenwood) SetKenwoodRITOffset(hz int) error {
|
||||
k.mu.Lock()
|
||||
cur := k.panel.RITOffset
|
||||
k.mu.Unlock()
|
||||
return k.NudgeKenwoodRIT(hz - cur)
|
||||
}
|
||||
|
||||
func (k *Kenwood) ClearKenwoodRIT() error {
|
||||
return k.setPanel("RC;")
|
||||
}
|
||||
@@ -650,3 +675,58 @@ func (k *Kenwood) askNum(cmd, prefix string, digits int) (int, bool) {
|
||||
}
|
||||
return n, true
|
||||
}
|
||||
|
||||
// kenwoodDataSubName decodes DT (K3/K4 programmer's reference).
|
||||
func kenwoodDataSubName(v int) string {
|
||||
switch v {
|
||||
case 0:
|
||||
return "DATA A"
|
||||
case 1:
|
||||
return "AFSK A"
|
||||
case 2:
|
||||
return "FSK D"
|
||||
case 3:
|
||||
return "PSK D"
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
// SetKenwoodPanelMode is the panel's mode row: CW / USB / LSB / DATA / RTTY.
|
||||
//
|
||||
// It exists because SetMode is the LOGGER's path — it maps an ADIF mode and
|
||||
// honours the data-mode preference — while a panel button is the operator
|
||||
// saying exactly what the rig should do. The two DATA cases are the point:
|
||||
// "DATA" is MD6 + DT0 (DATA A, the soundcard submode FT8/FT4 modulate through)
|
||||
// and "RTTY" is MD6 + DT2 (FSK D, the K3's direct-keyed RTTY). MD6 alone keeps
|
||||
// whatever submode a prior session left, which is how a K3 "in DATA" transmits
|
||||
// FT8 with no audio — the report behind this row.
|
||||
func (k *Kenwood) SetKenwoodPanelMode(mode string) error {
|
||||
k.mu.Lock()
|
||||
defer k.mu.Unlock()
|
||||
if k.port == nil {
|
||||
return fmt.Errorf("kenwood: not connected")
|
||||
}
|
||||
var cmds []string
|
||||
switch strings.ToUpper(strings.TrimSpace(mode)) {
|
||||
case "CW":
|
||||
cmds = []string{"MD3;"}
|
||||
case "USB":
|
||||
cmds = []string{"MD2;"}
|
||||
case "LSB":
|
||||
cmds = []string{"MD1;"}
|
||||
case "DATA":
|
||||
cmds = []string{"MD6;", "DT0;"}
|
||||
case "RTTY":
|
||||
cmds = []string{"MD6;", "DT2;"}
|
||||
default:
|
||||
return fmt.Errorf("kenwood panel: unknown mode %q", mode)
|
||||
}
|
||||
for _, c := range cmds {
|
||||
if err := k.write(c); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
// Re-read the settings on the next poll so Mode and DataSub confirm at once.
|
||||
k.panelCycle = kenwoodPanelSlowBeat
|
||||
return nil
|
||||
}
|
||||
|
||||
+111
-6
@@ -27,6 +27,14 @@ type TCI struct {
|
||||
|
||||
digitalDefault string // surfaced when the rig reports a digital mode (FT8/…)
|
||||
spotsEnabled bool // mirror cluster spots onto the TCI panorama
|
||||
// wantFreq is the frequency last COMMANDED and not yet echoed back, used to
|
||||
// pick the sideband before the radio has confirmed the move.
|
||||
wantFreq int64
|
||||
// What the server said it is, from its "protocol:" announcement.
|
||||
serverName string
|
||||
serverVersion string
|
||||
// How many spots have been logged verbatim (the first few only).
|
||||
spotsSent int
|
||||
|
||||
// OnSpotClick is called when the user clicks one of our spots on the TCI
|
||||
// panorama (callsign + freq), so the host can fill the entry form. Set before
|
||||
@@ -149,6 +157,15 @@ func (t *TCI) Connect() error {
|
||||
t.mu.Unlock()
|
||||
debugLog.Printf("TCI: connected to %s", url)
|
||||
go t.reader(conn)
|
||||
// Ask for the meters. Nothing measures anything until this goes out: the
|
||||
// S-meter, the transmit power and the SWR are all pushed by the radio, and
|
||||
// only to a client that has subscribed. 200 ms is the rate the protocol's own
|
||||
// examples use — fast enough for a needle, slow enough not to flood a socket
|
||||
// that also carries audio.
|
||||
if t.spotsEnabled {
|
||||
debugLog.Printf("TCI: panorama spots are ON — spots will be sent to the radio")
|
||||
}
|
||||
t.subscribeSensors("connect")
|
||||
if t.spotsEnabled {
|
||||
// Forget what we thought was on the panorama at the same moment the radio
|
||||
// is told to drop it. Kept, the memory would suppress the next spot for
|
||||
@@ -228,11 +245,19 @@ func (t *TCI) SendSpot(s SpotInfo) error {
|
||||
// other two matching what already works here.
|
||||
_ = t.send(fmt.Sprintf("spot_delete:%s;", call))
|
||||
}
|
||||
// TCI's SPOT command wants the colour as a signed 32-bit DECIMAL integer in
|
||||
// 0xAARRGGBB order — NOT a "0x…" hex string (e.g. "spot:UN7GK,cw,14025000,
|
||||
// -16776961,test;"). ExpertSDR silently drops a spot whose colour field it
|
||||
// can't parse as a number, which is why spots never showed on the panorama
|
||||
// while tuning (a separate command) still worked.
|
||||
// The colour is a DECIMAL ARGB integer, and an UNSIGNED one.
|
||||
//
|
||||
// Expert Electronics' own protocol document gives the whole command:
|
||||
//
|
||||
// SPOT:RN6LHF,CW,7100000,16711680,ANY_TEXT;
|
||||
//
|
||||
// 16711680 is 0x00FF0000 — positive, alpha zero. This backend was sending
|
||||
// the same number as a SIGNED 32-bit value, taken from a third-party
|
||||
// example: with the alpha byte set to FF for opacity, 0xFFFFA500 becomes
|
||||
// -22336, and a spot whose colour field ExpertSDR cannot read is dropped in
|
||||
// silence. Reported on ExpertSDR3 1.3 (which speaks TCI 2.x, so the version
|
||||
// was never the problem): everything else worked and the panorama stayed
|
||||
// empty.
|
||||
hex := strings.TrimPrefix(strings.TrimPrefix(strings.TrimSpace(s.Color), "#"), "0x")
|
||||
if hex == "" {
|
||||
hex = "FFFFA500" // opaque orange default
|
||||
@@ -253,7 +278,15 @@ func (t *TCI) SendSpot(s SpotInfo) error {
|
||||
}
|
||||
// Commas/semicolons would break TCI's comma-separated argument parsing.
|
||||
text := strings.NewReplacer(",", " ", ";", " ").Replace(s.Comment)
|
||||
return t.send(fmt.Sprintf("spot:%s,%s,%d,%d,%s;", call, mode, s.FreqHz, int32(argb), text))
|
||||
cmd := fmt.Sprintf("spot:%s,%s,%d,%d,%s;", call, mode, s.FreqHz, argb, text)
|
||||
// The first few, verbatim. A spot that the radio ignores leaves no trace at
|
||||
// all — no reply, no error — so the only evidence that OpsLog sent one, and
|
||||
// in what shape, is this line.
|
||||
if n := t.spotsSent; n < 3 {
|
||||
t.spotsSent = n + 1
|
||||
debugLog.Printf("TCI: sending spot #%d: %s", n+1, strings.TrimSuffix(cmd, ";"))
|
||||
}
|
||||
return t.send(cmd)
|
||||
}
|
||||
|
||||
// Disconnect closes the WebSocket; the reader goroutine then exits.
|
||||
@@ -334,6 +367,11 @@ func (t *TCI) ReadState() (RigState, error) {
|
||||
|
||||
// SetFrequency tunes VFO A (the main/RX VFO).
|
||||
func (t *TCI) SetFrequency(hz int64) error {
|
||||
// Remember what we ASKED for. SetMode reads it to choose the sideband, and
|
||||
// the radio's own echo can be a moment behind — see SetMode.
|
||||
t.mu.Lock()
|
||||
t.wantFreq = hz
|
||||
t.mu.Unlock()
|
||||
return t.send(fmt.Sprintf("vfo:0,0,%d;", hz))
|
||||
}
|
||||
|
||||
@@ -342,6 +380,17 @@ func (t *TCI) SetFrequency(hz int64) error {
|
||||
func (t *TCI) SetMode(mode string) error {
|
||||
t.mu.Lock()
|
||||
freq := t.freqA
|
||||
// Prefer the frequency we just COMMANDED over the one the radio has echoed.
|
||||
//
|
||||
// Clicking a spot sets the frequency and then the mode, and the sideband is
|
||||
// chosen from the frequency (below 10 MHz → LSB). Read from the echo, that
|
||||
// is the frequency we were on BEFORE the click whenever the echo has not
|
||||
// landed yet: a 14 MHz spot clicked from 7 MHz got LSB, and clicking the same
|
||||
// spot again — now that the echo has arrived — got USB. Reported from a
|
||||
// SunSDR as "the frequency is right, the mode is wrong until I click twice".
|
||||
if t.wantFreq > 0 {
|
||||
freq = t.wantFreq
|
||||
}
|
||||
t.mu.Unlock()
|
||||
m := adifToTCIMode(mode, freq)
|
||||
if m == "" {
|
||||
@@ -411,6 +460,24 @@ func (t *TCI) SetTXAudioSource(src string) {
|
||||
}
|
||||
|
||||
// send writes a command to the WebSocket (one writer at a time).
|
||||
// subscribeSensors asks the radio to push its meters. Nothing measures anything
|
||||
// until this goes out — the S-meter, the transmit power and the SWR are all
|
||||
// subscription-only (TCI §4.4) — and it is sent at connect AND again at every
|
||||
// "ready", because a subscription sent during the server's initial dump can be
|
||||
// dropped. 200 ms is the rate the protocol's own examples use.
|
||||
func (t *TCI) subscribeSensors(when string) {
|
||||
// Both cases, deliberately. Every other command this backend sends works in
|
||||
// lower case, but the meters stayed silent on a real SunSDR through two
|
||||
// rounds of fixes — and the protocol document's own examples are upper case
|
||||
// (TX_SENSORS_ENABLE:true,200;). A server that is case-insensitive ignores
|
||||
// the duplicate; one that is not finally hears the subscription.
|
||||
e1 := t.send("rx_sensors_enable:true,200;")
|
||||
e2 := t.send("tx_sensors_enable:true,200;")
|
||||
_ = t.send("RX_SENSORS_ENABLE:true,200;")
|
||||
_ = t.send("TX_SENSORS_ENABLE:true,200;")
|
||||
debugLog.Printf("TCI: sensor subscription sent (%s, both cases): rx=%v tx=%v", when, e1, e2)
|
||||
}
|
||||
|
||||
func (t *TCI) send(cmd string) error {
|
||||
t.mu.Lock()
|
||||
c := t.conn
|
||||
@@ -493,6 +560,18 @@ func (t *TCI) handle(msg string) {
|
||||
switch lower {
|
||||
case "device":
|
||||
t.device = strings.TrimSpace(args)
|
||||
// The server's own announcement: "protocol:ExpertSDR3,1.9;" — its name and
|
||||
// the TCI version it speaks. Worth keeping rather than filing under
|
||||
// "unhandled": panorama spots need a version that HAS the spot command, and
|
||||
// without this an operator on an older ExpertSDR sees nothing on the
|
||||
// waterfall and nothing anywhere saying why.
|
||||
case "protocol":
|
||||
t.serverName, t.serverVersion = get(0), get(1)
|
||||
debugLog.Printf("TCI: server is %s, TCI %s", t.serverName, t.serverVersion)
|
||||
if t.spotsEnabled && tciSpotsUnsupported(t.serverVersion) {
|
||||
debugLog.Printf("TCI: this server speaks TCI %s — panorama spots need 1.5 or later, so they will not appear",
|
||||
t.serverVersion)
|
||||
}
|
||||
// The radio ANNOUNCES its audio format at connect —
|
||||
// "audio_stream_sample_type:float32" and "audio_stream_channels:2" — which
|
||||
// is better evidence than anything derived from a frame, and it arrives
|
||||
@@ -505,6 +584,13 @@ func (t *TCI) handle(msg string) {
|
||||
}
|
||||
case "ready", "start":
|
||||
t.ready = true
|
||||
// (Re)subscribe to the meters HERE, not only at connect. ExpertSDR3
|
||||
// dumps its whole state and then says "ready"; a unidirectional control
|
||||
// command sent while that dump is still in flight can be ignored, and
|
||||
// the report from a real SunSDR — transmit meters still empty after the
|
||||
// connect-time subscription — has exactly that shape. From a goroutine:
|
||||
// send takes t.mu, which this handler holds.
|
||||
go t.subscribeSensors("ready")
|
||||
case "stop":
|
||||
t.ready = false
|
||||
case "vfo":
|
||||
@@ -516,6 +602,10 @@ func (t *TCI) handle(msg string) {
|
||||
switch get(1) {
|
||||
case "0":
|
||||
t.freqA = hz
|
||||
// The radio has caught up: from here the echo IS the truth.
|
||||
if t.wantFreq != 0 && absInt64(hz-t.wantFreq) < 100 {
|
||||
t.wantFreq = 0
|
||||
}
|
||||
case "1":
|
||||
t.freqB = hz
|
||||
}
|
||||
@@ -651,3 +741,18 @@ func adifToTCIMode(mode string, freqHz int64) string {
|
||||
return "digu"
|
||||
}
|
||||
}
|
||||
|
||||
// tciSpotsUnsupported reports whether a TCI version predates the spot commands.
|
||||
//
|
||||
// SPOT / SPOT_DELETE / SPOT_CLEAR arrived in TCI 1.5. An older ExpertSDR accepts
|
||||
// the connection, answers frequency and mode perfectly, and silently ignores
|
||||
// every spot — which is indistinguishable from a bug in the logger unless
|
||||
// somebody says so. Anything unparseable is treated as supported: refusing to
|
||||
// draw on a doubt would be the worse mistake.
|
||||
func tciSpotsUnsupported(version string) bool {
|
||||
var maj, min int
|
||||
if n, err := fmt.Sscanf(strings.TrimSpace(version), "%d.%d", &maj, &min); n < 2 || err != nil {
|
||||
return false
|
||||
}
|
||||
return maj < 1 || (maj == 1 && min < 5)
|
||||
}
|
||||
|
||||
@@ -0,0 +1,72 @@
|
||||
package cat
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"strings"
|
||||
)
|
||||
|
||||
// CW keying over TCI — a sixth CW engine, so a SunSDR needs no WinKeyer and no
|
||||
// second serial port: the radio's own macro keyer is driven over the WebSocket
|
||||
// that already carries the CAT.
|
||||
//
|
||||
// The commands, from the TCI command table (confirmed against ars-ka0s/eesdr-tci,
|
||||
// the same source that settled SPOT):
|
||||
//
|
||||
// CW_MACROS:<trx>,<text>; send text through the radio's keyer
|
||||
// CW_MACROS_SPEED:<wpm>; the speed those macros are keyed at
|
||||
// CW_MACROS_STOP; abort what is being keyed
|
||||
// CW_MACROS_EMPTY; the radio saying the buffer has run dry
|
||||
//
|
||||
// CW_MSG (TCI 2.0) does the same with separate before/after callsign fields.
|
||||
// CW_MACROS is used instead because it exists from 1.6 and OpsLog resolves the
|
||||
// variables itself — the text handed here is already what should go on the air.
|
||||
//
|
||||
// Notably absent: there is no backspace. The FlexRadio CWX keyer can un-type
|
||||
// what has not been sent yet; TCI can only stop. So the type-ahead correction
|
||||
// the Flex engine offers is not offered here rather than faked.
|
||||
|
||||
// tciCWTextLimit caps one macro. A runaway paste down a WebSocket that also
|
||||
// carries audio is worth refusing, and no real CW message is this long.
|
||||
const tciCWTextLimit = 512
|
||||
|
||||
// SendCW keys a message through the radio's macro keyer.
|
||||
func (t *TCI) SendCW(text string) error {
|
||||
msg := sanitiseTCICW(text)
|
||||
if msg == "" {
|
||||
return nil
|
||||
}
|
||||
return t.send(fmt.Sprintf("cw_macros:0,%s;", msg))
|
||||
}
|
||||
|
||||
// StopCW aborts the message being keyed.
|
||||
func (t *TCI) StopCW() error { return t.send("cw_macros_stop;") }
|
||||
|
||||
// SetCWSpeed sets the macro keyer speed in words per minute.
|
||||
//
|
||||
// Only the MACRO speed: the paddle keyer has its own (CW_KEYER_SPEED) and an
|
||||
// operator who has set their paddle to 28 wpm did not ask the logger to change
|
||||
// it because a macro went out at 25.
|
||||
func (t *TCI) SetCWSpeed(wpm int) error {
|
||||
if wpm < 5 {
|
||||
wpm = 5
|
||||
}
|
||||
if wpm > 60 {
|
||||
wpm = 60
|
||||
}
|
||||
return t.send(fmt.Sprintf("cw_macros_speed:%d;", wpm))
|
||||
}
|
||||
|
||||
// sanitiseTCICW makes a message safe to put in a TCI command.
|
||||
//
|
||||
// Commas and semicolons are the protocol's own separators — a comma inside the
|
||||
// text would be read as another argument and a semicolon would end the command
|
||||
// early, keying half a message and leaving the rest to be parsed as a command of
|
||||
// its own. Neither belongs in Morse anyway.
|
||||
func sanitiseTCICW(text string) string {
|
||||
s := strings.ToUpper(strings.TrimSpace(text))
|
||||
s = strings.NewReplacer(",", " ", ";", " ", "\r", " ", "\n", " ").Replace(s)
|
||||
if len(s) > tciCWTextLimit {
|
||||
s = s[:tciCWTextLimit]
|
||||
}
|
||||
return strings.TrimSpace(s)
|
||||
}
|
||||
@@ -96,3 +96,26 @@ func (m *Manager) TCIPanelDo(fn func(TCIPanelController) error) error {
|
||||
return fn(tc)
|
||||
})
|
||||
}
|
||||
|
||||
// TCICWController is the radio's CW keyer, as the CW engine uses it.
|
||||
//
|
||||
// Three methods, and no backspace: TCI can stop a message but cannot un-type one
|
||||
// (see tci_cw.go). Kept as its own interface rather than folded into the console
|
||||
// one so a CW engine does not have to depend on forty panel setters to key a
|
||||
// message.
|
||||
type TCICWController interface {
|
||||
SendCW(text string) error
|
||||
StopCW() error
|
||||
SetCWSpeed(wpm int) error
|
||||
}
|
||||
|
||||
// TCICWDo dispatches one keyer command onto the CAT goroutine.
|
||||
func (m *Manager) TCICWDo(fn func(TCICWController) error) error {
|
||||
return m.exec(func(b Backend) error {
|
||||
tc, ok := b.(TCICWController)
|
||||
if !ok {
|
||||
return fmt.Errorf("the active CAT backend is not a TCI radio")
|
||||
}
|
||||
return fn(tc)
|
||||
})
|
||||
}
|
||||
|
||||
@@ -113,7 +113,8 @@ func (t *TCI) handlePanel(name string, get func(int) string, args string) bool {
|
||||
// it. What the radio actually announces after the command settles whether
|
||||
// this is our reading or its doing, and no amount of reasoning will.
|
||||
switch name {
|
||||
case "mute", "sql_enable", "sql_level", "tx_power", "tx_swr", "tune":
|
||||
case "mute", "sql_enable", "sql_level", "tx_power", "tx_swr", "tune",
|
||||
"tx_sensors", "rx_sensors", "rx_channel_sensors":
|
||||
// Logged on arrival so an ANSWER can be told from a SILENCE: the log
|
||||
// showed the transmit meters being asked for and nothing coming back,
|
||||
// which on its own proves nothing — a reply that arrived and failed to
|
||||
@@ -233,6 +234,42 @@ func (t *TCI) handlePanel(name string, get func(int) string, args string) bool {
|
||||
if n, ok := num(get(1)); ok && forRX0() {
|
||||
p.SMeter = n
|
||||
}
|
||||
// The meters of ExpertSDR3. The S-meter used to be read only from RX_SMETER
|
||||
// and the transmit ones from TX_POWER / TX_SWR — commands this radio simply
|
||||
// never sends, which is why the console's meters sat empty on a SunSDR in
|
||||
// both RX and TX while everything else worked.
|
||||
//
|
||||
// The protocol's own answer (TCI Protocol.pdf, §4.4) is a SUBSCRIPTION:
|
||||
//
|
||||
// RX_SENSORS:<rx>,<dBm>; (deprecated in 2.0)
|
||||
// RX_CHANNEL_SENSORS:<rx>,<channel>,<dBm>; (its replacement)
|
||||
// TX_SENSORS:<trx>,<mic dBm>,<power W>,<peak W>,<SWR>;
|
||||
//
|
||||
// none of which arrives until the client asks with RX_SENSORS_ENABLE and
|
||||
// TX_SENSORS_ENABLE — see Connect.
|
||||
case "rx_sensors":
|
||||
if v, err := strconv.ParseFloat(strings.TrimSpace(get(1)), 64); err == nil && forRX0() {
|
||||
p.SMeter = int(v)
|
||||
}
|
||||
case "rx_channel_sensors":
|
||||
// Main channel (A) of receiver 0: the one the console is showing.
|
||||
if v, err := strconv.ParseFloat(strings.TrimSpace(get(2)), 64); err == nil &&
|
||||
get(0) == "0" && get(1) == "0" {
|
||||
p.SMeter = int(v)
|
||||
}
|
||||
case "tx_sensors":
|
||||
if get(0) != "0" {
|
||||
break
|
||||
}
|
||||
// arg3 is RMS power, arg4 the peak. The peak is what a power meter's
|
||||
// needle does on speech; the RMS is what the operator is asked to keep
|
||||
// under the amplifier's limit — so RMS is the number, as elsewhere.
|
||||
if v, err := strconv.ParseFloat(strings.TrimSpace(get(2)), 64); err == nil {
|
||||
p.TXPowerW = v
|
||||
}
|
||||
if v, err := strconv.ParseFloat(strings.TrimSpace(get(4)), 64); err == nil {
|
||||
p.TXSWR = v
|
||||
}
|
||||
case "tune":
|
||||
if forRX0() {
|
||||
p.Tuning = yes(get(1))
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
package cat
|
||||
|
||||
import "testing"
|
||||
|
||||
func TestTCISpotsUnsupported(t *testing.T) {
|
||||
// SPOT arrived in TCI 1.5. The SunSDR2 PRO report that prompted this was an
|
||||
// ExpertSDR announcing 1.3 — spots accepted and silently dropped.
|
||||
for _, c := range []struct {
|
||||
version string
|
||||
old bool
|
||||
}{
|
||||
{"1.3", true},
|
||||
{"1.4", true},
|
||||
{"1.5", false},
|
||||
{"1.9", false},
|
||||
{"2.0", false},
|
||||
{"", false}, // unparseable → assume it works
|
||||
{"weird", false}, // refusing to draw on a doubt is the worse mistake
|
||||
} {
|
||||
if got := tciSpotsUnsupported(c.version); got != c.old {
|
||||
t.Errorf("tciSpotsUnsupported(%q) = %v, want %v", c.version, got, c.old)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestSanitiseTCICW(t *testing.T) {
|
||||
// The separators must never survive: a comma would become another argument
|
||||
// and a semicolon would end the command with the message half sent.
|
||||
for _, c := range []struct{ in, want string }{
|
||||
{"cq cq de f4bpo", "CQ CQ DE F4BPO"},
|
||||
{" tu 599 ", "TU 599"},
|
||||
{"73, gl", "73 GL"},
|
||||
{"test;cw_macros_stop", "TEST CW_MACROS_STOP"},
|
||||
{"line\r\nbreak", "LINE BREAK"},
|
||||
{" ", ""},
|
||||
} {
|
||||
if got := sanitiseTCICW(c.in); got != c.want {
|
||||
t.Errorf("sanitiseTCICW(%q) = %q, want %q", c.in, got, c.want)
|
||||
}
|
||||
}
|
||||
}
|
||||
+33
-2
@@ -5,6 +5,7 @@ package email
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/wneessen/go-mail"
|
||||
@@ -86,12 +87,42 @@ func SendFiles(cfg Config, to, subject, body string, attachPaths []string) error
|
||||
return fmt.Errorf("smtp client: %w", err)
|
||||
}
|
||||
if err := client.DialAndSend(m); err != nil {
|
||||
return fmt.Errorf("send via %s:%d (%s, %s): %w",
|
||||
cfg.Host, cfg.Port, cfg.Encryption, describeSize(attachPaths), err)
|
||||
return fmt.Errorf("send via %s:%d (%s, %s): %w%s",
|
||||
cfg.Host, cfg.Port, cfg.Encryption, describeSize(attachPaths), err, explainSMTP(err))
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// explainSMTP turns a server's refusal into the thing to go and do.
|
||||
//
|
||||
// A rejection is quoted verbatim above it — the server's own words are the
|
||||
// evidence — but several of them name a policy rather than a mistake, and no
|
||||
// amount of re-checking the password will fix those. Microsoft's is the one
|
||||
// operators keep hitting: basic authentication for SMTP is switched off across
|
||||
// Microsoft 365 and outlook.com, and an app password does not bring it back.
|
||||
func explainSMTP(err error) string {
|
||||
msg := strings.ToLower(err.Error())
|
||||
switch {
|
||||
case strings.Contains(msg, "basic authentication is disabled"),
|
||||
strings.Contains(msg, "5.7.139"):
|
||||
return "\n\nMicrosoft has switched off password-based SMTP for this account. " +
|
||||
"An app password does not restore it — the server refuses the password itself, not the one you typed. " +
|
||||
"On a Microsoft 365 tenant an administrator can re-enable it for this mailbox " +
|
||||
"(Set-CASMailbox -SmtpClientAuthenticationDisabled $false, plus the tenant-wide setting); " +
|
||||
"otherwise use another provider for alerts (a Gmail account with an app password works, so does any ordinary IMAP/SMTP host)."
|
||||
case strings.Contains(msg, "application-specific password"),
|
||||
strings.Contains(msg, "5.7.9"):
|
||||
return "\n\nThis account needs an APP PASSWORD rather than the one you sign in with " +
|
||||
"(Google, Yahoo and others require it once two-factor authentication is on)."
|
||||
case strings.Contains(msg, "5.7.8"), strings.Contains(msg, "authentication failed"),
|
||||
strings.Contains(msg, "535"):
|
||||
return "\n\nThe server rejected the username or the password."
|
||||
case strings.Contains(msg, "must issue a starttls"):
|
||||
return "\n\nThe server requires encryption: set STARTTLS (usually port 587) or SSL (465)."
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
// describeSize reports what was attached, in bytes.
|
||||
//
|
||||
// "An existing connection was forcibly closed" during DATA is the same message
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
package email
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestExplainSMTP(t *testing.T) {
|
||||
// The real refusal, from an operator's Outlook account.
|
||||
outlook := errors.New("SMTP AUTH failed: 535 5.7.139 Authentication unsuccessful, basic authentication is disabled.")
|
||||
if got := explainSMTP(outlook); !strings.Contains(got, "Microsoft has switched off") {
|
||||
t.Errorf("the Microsoft policy refusal is not explained: %q", got)
|
||||
}
|
||||
// A plain wrong password must NOT claim a policy: the advice would send the
|
||||
// operator to an administrator over a typo.
|
||||
wrong := errors.New("535 5.7.8 authentication failed")
|
||||
got := explainSMTP(wrong)
|
||||
if strings.Contains(got, "Microsoft") {
|
||||
t.Errorf("a wrong password was explained as a Microsoft policy: %q", got)
|
||||
}
|
||||
if !strings.Contains(got, "rejected the username") {
|
||||
t.Errorf("a wrong password is not explained: %q", got)
|
||||
}
|
||||
// Anything else is left to speak for itself.
|
||||
if got := explainSMTP(errors.New("dial tcp: i/o timeout")); got != "" {
|
||||
t.Errorf("an unrelated error got an explanation: %q", got)
|
||||
}
|
||||
}
|
||||
+152
-12
@@ -12,6 +12,7 @@ import (
|
||||
"os/exec"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"sync"
|
||||
"syscall"
|
||||
"time"
|
||||
)
|
||||
@@ -20,6 +21,67 @@ import (
|
||||
// document of the user's QSOs (optionally only confirmed ones).
|
||||
const lotwReportURL = "https://lotw.arrl.org/lotwuser/lotwreport.adi"
|
||||
|
||||
const (
|
||||
// How long LoTW may take to START answering. It builds the whole report
|
||||
// before sending anything, so this is the slow part of a big account.
|
||||
lotwHeaderTimeout = 10 * time.Minute
|
||||
// How long the transfer may stall once it HAS started. A download that has
|
||||
// not moved in this long is not slow, it is dead — and saying so beats a
|
||||
// progress window that sits at "working" until someone gives up.
|
||||
lotwIdleTimeout = 2 * time.Minute
|
||||
lotwMaxBytes = 256 * 1024 * 1024
|
||||
)
|
||||
|
||||
// readWithProgress reads the body in chunks, reporting the running total and
|
||||
// failing fast on a stall.
|
||||
//
|
||||
// Reported as it arrives rather than at the end: an 18 MB report over a slow
|
||||
// link is minutes of silence otherwise, which is indistinguishable from a hang —
|
||||
// and that is exactly what operators were reporting.
|
||||
func say(note func(string), msg string) {
|
||||
if note != nil {
|
||||
note(msg)
|
||||
}
|
||||
LogSink("%s", msg)
|
||||
}
|
||||
|
||||
func readWithProgress(ctx context.Context, r io.Reader, note func(string)) ([]byte, error) {
|
||||
var (
|
||||
out []byte
|
||||
total int64
|
||||
last = time.Now()
|
||||
buf = make([]byte, 64*1024)
|
||||
next = int64(256 * 1024) // first report early — proof it is moving
|
||||
)
|
||||
for {
|
||||
if err := ctx.Err(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
n, err := r.Read(buf)
|
||||
if n > 0 {
|
||||
out = append(out, buf[:n]...)
|
||||
total += int64(n)
|
||||
last = time.Now()
|
||||
if total >= next {
|
||||
say(note, fmt.Sprintf(" … %.1f MB received", float64(total)/(1024*1024)))
|
||||
next = total + 512*1024
|
||||
}
|
||||
if total >= lotwMaxBytes {
|
||||
return out, nil
|
||||
}
|
||||
}
|
||||
if err == io.EOF {
|
||||
return out, nil
|
||||
}
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if time.Since(last) > lotwIdleTimeout {
|
||||
return nil, fmt.Errorf("the transfer stalled after %d KB — LoTW stopped sending", total/1024)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// DownloadLoTWConfirmations fetches confirmed QSOs from LoTW as ADIF text.
|
||||
// Uses the LoTW *website* login (Username/Password), not the TQSL cert. When
|
||||
// since is non-empty (YYYY-MM-DD) only confirmations received since then are
|
||||
@@ -27,7 +89,7 @@ const lotwReportURL = "https://lotw.arrl.org/lotwuser/lotwreport.adi"
|
||||
// non-empty, only confirmations for that station callsign are returned (an
|
||||
// LoTW account holds every call you operate — F4BPO, F4BPO/P, TM2Q — so this
|
||||
// scopes the pull to the active profile's call).
|
||||
func DownloadLoTWConfirmations(ctx context.Context, client *http.Client, cfg ServiceConfig, since, ownCall string) (string, error) {
|
||||
func DownloadLoTWConfirmations(ctx context.Context, client *http.Client, cfg ServiceConfig, since, ownCall string, detail bool, note func(string)) (string, error) {
|
||||
user := strings.TrimSpace(cfg.Username)
|
||||
if user == "" || cfg.Password == "" {
|
||||
return "", fmt.Errorf("lotw: website login (username/password) not set")
|
||||
@@ -36,8 +98,19 @@ func DownloadLoTWConfirmations(ctx context.Context, client *http.Client, cfg Ser
|
||||
q.Set("login", user)
|
||||
q.Set("password", cfg.Password)
|
||||
q.Set("qso_query", "1")
|
||||
q.Set("qso_qsl", "yes") // only QSLed (confirmed) records
|
||||
q.Set("qso_qsldetail", "yes") // include QSL_RCVD / QSLRDATE detail
|
||||
q.Set("qso_qsl", "yes") // only QSLed (confirmed) records
|
||||
// qso_qsldetail is what LoTW charges for: it adds the QSL date and the
|
||||
// station's own DXCC / grid / state / county to every record, and takes an
|
||||
// order of magnitude longer to build — a report that arrives in two minutes
|
||||
// without it takes twenty with it, measured on the same account.
|
||||
//
|
||||
// What we actually need to mark a confirmation is call, date, band and mode.
|
||||
// The rest is worth its price only when the download is also ADDING the QSOs
|
||||
// it cannot find, which is the one case where the extra fields are the only
|
||||
// source for them.
|
||||
if detail {
|
||||
q.Set("qso_qsldetail", "yes")
|
||||
}
|
||||
if c := strings.TrimSpace(ownCall); c != "" {
|
||||
q.Set("qso_owncall", c) // restrict to this station callsign
|
||||
}
|
||||
@@ -57,20 +130,87 @@ func DownloadLoTWConfirmations(ctx context.Context, client *http.Client, cfg Ser
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("lotw: build request: %w", err)
|
||||
}
|
||||
// Named, because LoTW's front end throttles unidentified clients harder than
|
||||
// it throttles known ones, and an operator reporting a 503 deserves a request
|
||||
// that says who is asking.
|
||||
req.Header.Set("User-Agent", "OpsLog")
|
||||
if client == nil {
|
||||
// A full account is tens of megabytes and LoTW builds it slowly — several
|
||||
// minutes for a log of 30 000 QSOs, all of it before the first byte. The
|
||||
// old two-minute limit turned that into "context deadline exceeded while
|
||||
// reading body", which reads as a network fault rather than as "ask for
|
||||
// less at a time".
|
||||
client = &http.Client{Timeout: 20 * time.Minute}
|
||||
// NO overall deadline. A full account is tens of megabytes and LoTW spends
|
||||
// minutes building it before the first byte; a total timeout turns a slow
|
||||
// but healthy download into "context deadline exceeded", and a longer one
|
||||
// turns a dead connection into a window that says "working" for twenty
|
||||
// minutes. What matters is not how long it takes but whether it is still
|
||||
// moving — see the idle watchdog below.
|
||||
client = &http.Client{
|
||||
Transport: &http.Transport{
|
||||
Proxy: http.ProxyFromEnvironment,
|
||||
ResponseHeaderTimeout: lotwHeaderTimeout,
|
||||
TLSHandshakeTimeout: 30 * time.Second,
|
||||
},
|
||||
}
|
||||
}
|
||||
// LoTW answers 503 when it is busy, which for a report covering more than a
|
||||
// few days is often — other loggers get the same answer and simply ask
|
||||
// again. Three tries, spaced, and each one said out loud: an operator whose
|
||||
// download takes four minutes because the ARRL is loaded should be able to
|
||||
// see that rather than guess it.
|
||||
// LoTW sends nothing at all until the whole report is built — minutes for a
|
||||
// large account. That silence was the entire complaint: a window saying
|
||||
// "working" with no way to tell a busy server from a dead one. Count it out
|
||||
// loud until the first byte.
|
||||
beat := make(chan struct{})
|
||||
go func() {
|
||||
start := time.Now()
|
||||
tick := time.NewTicker(15 * time.Second)
|
||||
defer tick.Stop()
|
||||
for {
|
||||
select {
|
||||
case <-beat:
|
||||
return
|
||||
case <-ctx.Done():
|
||||
return
|
||||
case <-tick.C:
|
||||
say(note, fmt.Sprintf(" … still waiting for LoTW to build the report (%.0f s)", time.Since(start).Seconds()))
|
||||
}
|
||||
}
|
||||
}()
|
||||
// Stopped where the WAIT ends, not where the function does: deferred, the
|
||||
// heartbeat went on counting between the megabyte lines and read as if the
|
||||
// report were still being built while it was already arriving.
|
||||
stopBeat := sync.OnceFunc(func() { close(beat) })
|
||||
defer stopBeat()
|
||||
|
||||
var resp *http.Response
|
||||
for attempt := 1; ; attempt++ {
|
||||
resp, err = client.Do(req) //nolint:bodyclose // closed below or in the retry
|
||||
if err == nil && resp.StatusCode != http.StatusServiceUnavailable &&
|
||||
resp.StatusCode != http.StatusBadGateway && resp.StatusCode != http.StatusGatewayTimeout {
|
||||
break
|
||||
}
|
||||
if attempt >= 3 {
|
||||
break
|
||||
}
|
||||
wait := time.Duration(attempt*20) * time.Second
|
||||
if resp != nil {
|
||||
say(note, fmt.Sprintf("LoTW is busy (HTTP %d) — asking again in %s…", resp.StatusCode, wait))
|
||||
resp.Body.Close()
|
||||
} else {
|
||||
say(note, fmt.Sprintf("LoTW did not answer (%v) — asking again in %s…", err, wait))
|
||||
}
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
return "", ctx.Err()
|
||||
case <-time.After(wait):
|
||||
}
|
||||
req = req.Clone(ctx)
|
||||
}
|
||||
resp, err := client.Do(req)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("lotw: request failed: %w", err)
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
body, err := io.ReadAll(io.LimitReader(resp.Body, 256*1024*1024))
|
||||
stopBeat()
|
||||
say(note, fmt.Sprintf("LoTW answered (HTTP %d) — receiving…", resp.StatusCode))
|
||||
body, err := readWithProgress(ctx, resp.Body, note)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("lotw: read response: %w", err)
|
||||
}
|
||||
@@ -378,7 +518,7 @@ func TestLoTW(cfg ServiceConfig, stationDataPath string) (string, error) {
|
||||
}
|
||||
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
|
||||
defer cancel()
|
||||
if _, err := DownloadLoTWConfirmations(ctx, nil, cfg, "2099-01-01", ""); err != nil {
|
||||
if _, err := DownloadLoTWConfirmations(ctx, nil, cfg, "2099-01-01", "", false, nil); err != nil {
|
||||
return "", fmt.Errorf("%s — but the DOWNLOAD login failed: %w", up, err)
|
||||
}
|
||||
return up + ". Download login accepted.", nil
|
||||
|
||||
@@ -868,6 +868,44 @@ var bulkEditableCols = map[string]bool{
|
||||
|
||||
// BulkSetField sets one whitelisted column to value on every listed QSO in a
|
||||
// single statement. value "" clears the field. Returns rows affected.
|
||||
// bulkEditableIntCols are the NUMERIC columns the bulk editor may touch. Their
|
||||
// own path, not the text one: the columns are nullable integers, and while
|
||||
// SQLite would coerce "14" quietly, a shared MySQL logbook would not — and an
|
||||
// empty string is NULL here, never "".
|
||||
var bulkEditableIntCols = map[string]bool{
|
||||
"my_dxcc": true,
|
||||
"my_cq_zone": true,
|
||||
"my_itu_zone": true,
|
||||
}
|
||||
|
||||
// BulkSetIntField sets one integer column across the ids; v nil clears it.
|
||||
func (r *Repo) BulkSetIntField(ctx context.Context, ids []int64, column string, v *int) (int64, error) {
|
||||
if !bulkEditableIntCols[column] {
|
||||
return 0, fmt.Errorf("field %q is not bulk-editable", column)
|
||||
}
|
||||
if len(ids) == 0 {
|
||||
return 0, nil
|
||||
}
|
||||
ph := make([]string, len(ids))
|
||||
args := make([]any, 0, len(ids)+2)
|
||||
var val any
|
||||
if v != nil {
|
||||
val = *v
|
||||
}
|
||||
args = append(args, val, db.NowISO())
|
||||
for i, id := range ids {
|
||||
ph[i] = "?"
|
||||
args = append(args, id)
|
||||
}
|
||||
res, err := r.db.ExecContext(ctx,
|
||||
"UPDATE qso SET "+column+" = ?, updated_at = ? WHERE id IN ("+strings.Join(ph, ",")+")", args...)
|
||||
if err != nil {
|
||||
return 0, fmt.Errorf("bulk set %s: %w", column, err)
|
||||
}
|
||||
n, _ := res.RowsAffected()
|
||||
return n, nil
|
||||
}
|
||||
|
||||
func (r *Repo) BulkSetField(ctx context.Context, ids []int64, column, value string) (int64, error) {
|
||||
if !bulkEditableCols[column] {
|
||||
return 0, fmt.Errorf("field %q is not bulk-editable", column)
|
||||
|
||||
+1
-1
@@ -21,7 +21,7 @@ import (
|
||||
|
||||
const (
|
||||
// appVersion is stamped on every heartbeat (and could feed the About box).
|
||||
appVersion = "0.26.20"
|
||||
appVersion = "0.26.23"
|
||||
|
||||
// posthogHost is the PostHog ingestion endpoint. EU cloud by default; change
|
||||
// to https://us.i.posthog.com for a US project.
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
//go:build !windows
|
||||
|
||||
package main
|
||||
|
||||
// Placing a window at an absolute desktop coordinate is Windows-specific; every
|
||||
// caller falls back to the toolkit's own call when this says no.
|
||||
func setWindowPosAbsolute(x, y int) bool { return false }
|
||||
@@ -0,0 +1,93 @@
|
||||
//go:build windows
|
||||
|
||||
package main
|
||||
|
||||
import (
|
||||
"syscall"
|
||||
"unsafe"
|
||||
|
||||
"hamlog/internal/applog"
|
||||
)
|
||||
|
||||
// Moving the window to an ABSOLUTE virtual-desktop position.
|
||||
//
|
||||
// Wails' own WindowSetPosition cannot do it. Its Windows implementation reads:
|
||||
//
|
||||
// func (cba *ControlBase) SetPos(x, y int) {
|
||||
// info := getMonitorInfo(cba.hwnd)
|
||||
// w32.SetWindowPos(cba.hwnd, HWND_TOP, int(info.RcWork.Left)+x, int(info.RcWork.Top)+y, ...)
|
||||
// }
|
||||
//
|
||||
// — the coordinates are relative to the CURRENT monitor's work area, while
|
||||
// WindowGetPosition returns GetWindowRect, which is absolute. Saving one and
|
||||
// restoring the other is only harmless on the primary monitor, where the work
|
||||
// area starts at 0.
|
||||
//
|
||||
// On a second monitor to the LEFT it compounds at every launch. Reported from a
|
||||
// two-screen station with the left monitor at x = -3840: OpsLog saved -3844,
|
||||
// reopened on that monitor, added the monitor's own origin, and stored -7684 —
|
||||
// then -11524, each launch one screen further into nowhere.
|
||||
//
|
||||
// So we place the window ourselves. Same call the toolkit makes, without the
|
||||
// offset.
|
||||
const (
|
||||
swpNoSize = 0x0001
|
||||
swpNoZOrder = 0x0004
|
||||
swpNoActivate = 0x0010
|
||||
)
|
||||
|
||||
var (
|
||||
procSetWindowPos = user32Dll.NewProc("SetWindowPos")
|
||||
procEnumWindows = user32Dll.NewProc("EnumWindows")
|
||||
procGetWindowThreadProcessID = user32Dll.NewProc("GetWindowThreadProcessId")
|
||||
procGetWindowTextLengthW = user32Dll.NewProc("GetWindowTextLengthW")
|
||||
procGetWindow = user32Dll.NewProc("GetWindow")
|
||||
kernel32Dll = syscall.NewLazyDLL("kernel32.dll")
|
||||
procGetCurrentProcessIDWinPos = kernel32Dll.NewProc("GetCurrentProcessId")
|
||||
)
|
||||
|
||||
// mainWindowHandle finds this process's own top-level window.
|
||||
//
|
||||
// Wails does not expose the handle, so it is looked up: the first top-level
|
||||
// window belonging to this process id that has no owner and a title. The window
|
||||
// is created hidden (StartHidden), and EnumWindows lists hidden windows too,
|
||||
// which is what makes this usable before the window is shown.
|
||||
func mainWindowHandle() uintptr {
|
||||
self, _, _ := procGetCurrentProcessIDWinPos.Call()
|
||||
var found uintptr
|
||||
cb := syscall.NewCallback(func(hwnd uintptr, _ uintptr) uintptr {
|
||||
var pid uint32
|
||||
procGetWindowThreadProcessID.Call(hwnd, uintptr(unsafe.Pointer(&pid)))
|
||||
if uintptr(pid) != self {
|
||||
return 1 // keep going
|
||||
}
|
||||
// GW_OWNER = 4: skip tool windows and dialogs owned by the main one.
|
||||
if owner, _, _ := procGetWindow.Call(hwnd, 4); owner != 0 {
|
||||
return 1
|
||||
}
|
||||
if n, _, _ := procGetWindowTextLengthW.Call(hwnd); n == 0 {
|
||||
return 1
|
||||
}
|
||||
found = hwnd
|
||||
return 0 // stop
|
||||
})
|
||||
procEnumWindows.Call(cb, 0)
|
||||
return found
|
||||
}
|
||||
|
||||
// setWindowPosAbsolute moves the window to a virtual-desktop coordinate.
|
||||
// Reports whether it could; the caller falls back to the toolkit's own call.
|
||||
func setWindowPosAbsolute(x, y int) bool {
|
||||
hwnd := mainWindowHandle()
|
||||
if hwnd == 0 {
|
||||
applog.Printf("window: could not find our own window handle — falling back to the toolkit's placement")
|
||||
return false
|
||||
}
|
||||
r, _, err := procSetWindowPos.Call(hwnd, 0, uintptr(int32(x)), uintptr(int32(y)), 0, 0,
|
||||
swpNoSize|swpNoZOrder|swpNoActivate)
|
||||
if r == 0 {
|
||||
applog.Printf("window: SetWindowPos(%d,%d) failed: %v", x, y, err)
|
||||
return false
|
||||
}
|
||||
return true
|
||||
}
|
||||
Reference in New Issue
Block a user