Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
707f0bc848 | ||
|
|
b2e93e9164 | ||
|
|
eb06cc29b0 | ||
|
|
d25edd114c | ||
|
|
f090e845ff | ||
|
|
d2e62debe8 | ||
|
|
8359caab16 | ||
|
|
f998023a28 | ||
|
|
3b6269978c | ||
|
|
052fc4cb80 | ||
|
|
2615365684 | ||
|
|
580e5782f8 | ||
|
|
3ce74ef8d7 | ||
|
|
3af6299f32 | ||
|
|
136c5d5b6b | ||
|
|
d8c9f05d10 | ||
|
|
a88e871640 |
@@ -56,6 +56,7 @@ import (
|
|||||||
"hamlog/internal/powergenius"
|
"hamlog/internal/powergenius"
|
||||||
"hamlog/internal/profile"
|
"hamlog/internal/profile"
|
||||||
"hamlog/internal/pskr"
|
"hamlog/internal/pskr"
|
||||||
|
"hamlog/internal/pskrme"
|
||||||
"hamlog/internal/pskrtgt"
|
"hamlog/internal/pskrtgt"
|
||||||
"hamlog/internal/psu"
|
"hamlog/internal/psu"
|
||||||
"hamlog/internal/qslcard"
|
"hamlog/internal/qslcard"
|
||||||
@@ -773,6 +774,11 @@ type App struct {
|
|||||||
// The Chase new panel's OWN band filter, as the set switched off. Read per
|
// The Chase new panel's OWN band filter, as the set switched off. Read per
|
||||||
// message like the list above, so an atomic rather than a settings lookup.
|
// message like the list above, so an atomic rather than a settings lookup.
|
||||||
chaseNewBandsOff atomic.Value // map[string]bool
|
chaseNewBandsOff atomic.Value // map[string]bool
|
||||||
|
// hearMe is the THIRD PSK Reporter connection: who is reporting our own
|
||||||
|
// transmissions, for the reverse layer on the FT map. Its own connection
|
||||||
|
// for the same reason as pskTgt — a different slice of the feed, and one
|
||||||
|
// that must keep working with the opening watch switched off.
|
||||||
|
hearMe *pskrme.Watcher
|
||||||
// pskr is the PSK Reporter MQTT feed, up only while the opening watch is on.
|
// pskr is the PSK Reporter MQTT feed, up only while the opening watch is on.
|
||||||
// It is the source that makes VHF detection work at all: the cluster and RBN
|
// It is the source that makes VHF detection work at all: the cluster and RBN
|
||||||
// carry a handful of 6 m spots where PSK Reporter carries hundreds.
|
// carry a handful of 6 m spots where PSK Reporter carries hundreds.
|
||||||
@@ -1732,6 +1738,9 @@ func (a *App) startup(ctx context.Context) {
|
|||||||
// PSK Reporter. After the operator's grid is known: without it there is no
|
// PSK Reporter. After the operator's grid is known: without it there is no
|
||||||
// distance to measure and no receiver squares to filter on, so it stays down.
|
// distance to measure and no receiver squares to filter on, so it stays down.
|
||||||
a.startBandOpenFeed()
|
a.startBandOpenFeed()
|
||||||
|
// The reverse layer. Needs the CALLSIGN rather than the grid, so it goes
|
||||||
|
// after the profile is scoped, which it already is by here.
|
||||||
|
a.startHearMe()
|
||||||
// Auto-call. After the watch list and the logbook: the ladder is meaningless
|
// Auto-call. After the watch list and the logbook: the ladder is meaningless
|
||||||
// without either, and it must never call anybody on a log it cannot read.
|
// without either, and it must never call anybody on a log it cannot read.
|
||||||
a.startAutoCall()
|
a.startAutoCall()
|
||||||
@@ -5372,6 +5381,21 @@ var awardBandPlan = []struct {
|
|||||||
{"2mm", 134000000000, 149000000000}, {"1mm", 241000000000, 250000000000},
|
{"2mm", 134000000000, 149000000000}, {"1mm", 241000000000, 250000000000},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// bandOrder ranks a band name by frequency, for sorting a list of them.
|
||||||
|
//
|
||||||
|
// The band plan is already written low to high, so its index IS the order —
|
||||||
|
// which beats sorting the names, where 10m lands between 1.25m and 12m.
|
||||||
|
// Anything not in the plan sorts last rather than first: an unrecognised band
|
||||||
|
// is almost always a typo in an imported file, and it belongs at the bottom.
|
||||||
|
func bandOrder(name string) int {
|
||||||
|
name = strings.ToLower(strings.TrimSpace(name))
|
||||||
|
for i, b := range awardBandPlan {
|
||||||
|
if b.name == name {
|
||||||
|
return i
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return len(awardBandPlan)
|
||||||
|
}
|
||||||
func bandForHz(hz int64) string {
|
func bandForHz(hz int64) string {
|
||||||
for _, b := range awardBandPlan {
|
for _, b := range awardBandPlan {
|
||||||
if hz >= b.lo && hz <= b.hi {
|
if hz >= b.lo && hz <= b.hi {
|
||||||
@@ -7556,34 +7580,88 @@ func (a *App) SendDecodeFreeText(instance, text string, send bool) error {
|
|||||||
// GridSquares returns the 4-character Maidenhead squares in the log, with
|
// GridSquares returns the 4-character Maidenhead squares in the log, with
|
||||||
// whether each is confirmed.
|
// whether each is confirmed.
|
||||||
//
|
//
|
||||||
// modeClass scopes it the way the rest of the app does: "DIGI", "CW", "PHONE",
|
// mode scopes it the way the rest of the app does — "DIGI", "CW", "PHONE", or
|
||||||
// or "" for every mode. "DIGI" is the one this was built for — a map of the
|
// "" for every mode — but it also takes ONE mode's own name, which is what an
|
||||||
// squares worked on FT8/FT4 answers "where have I actually been heard" in a way
|
// operator actually wants here: "digital" put a contest RTTY square beside an
|
||||||
// no list of callsigns does.
|
// FT8 one and called them the same answer, when the question behind this map is
|
||||||
|
// where a particular mode has been heard.
|
||||||
|
//
|
||||||
|
// band and satName narrow it further, both empty meaning no restriction. The
|
||||||
|
// satellite is the reason this map is worth filtering at all for anyone chasing
|
||||||
|
// grids through a bird: a VHF square worked terrestrially and one worked through
|
||||||
|
// AO-91 are not the same achievement, and nothing else told them apart.
|
||||||
//
|
//
|
||||||
// Confirmed means LoTW, a card or eQSL — the same three the award engine counts,
|
// Confirmed means LoTW, a card or eQSL — the same three the award engine counts,
|
||||||
// so a square cannot be green here and unconfirmed in the Awards panel.
|
// so a square cannot be green here and unconfirmed in the Awards panel.
|
||||||
func (a *App) GridSquares(modeClass string) ([]qso.GridSquare, error) {
|
func (a *App) GridSquares(mode, band, satName string) ([]qso.GridSquare, error) {
|
||||||
if a.qso == nil {
|
if a.qso == nil {
|
||||||
return nil, fmt.Errorf("db not initialized")
|
return nil, fmt.Errorf("db not initialized")
|
||||||
}
|
}
|
||||||
want := strings.ToUpper(strings.TrimSpace(modeClass))
|
want := strings.ToUpper(strings.TrimSpace(mode))
|
||||||
keep := func(mode string) bool {
|
wantBand := strings.ToLower(strings.TrimSpace(band))
|
||||||
|
wantSat := strings.ToUpper(strings.TrimSpace(satName))
|
||||||
|
keepMode := func(r qso.GridSquareRow) bool {
|
||||||
switch want {
|
switch want {
|
||||||
case "", "ALL":
|
case "", "ALL":
|
||||||
return true
|
return true
|
||||||
case "FTX":
|
case "FTX":
|
||||||
// The FT family alone, which is narrower than digital and usually the
|
// Retired from the UI, kept because a stored preference may still say
|
||||||
// honest answer beside an FTx panel: a square worked on RTTY in a
|
// it: the FT family alone, narrower than digital.
|
||||||
// contest is not a square worked on FT8.
|
return ftxModes[r.Mode] || ftxModes[r.Submode]
|
||||||
return ftxModes[strings.ToUpper(strings.TrimSpace(mode))]
|
case "PHONE", "CW", "DIGI":
|
||||||
|
return award.ModeClass(r.Mode) == want
|
||||||
default:
|
default:
|
||||||
return award.ModeClass(mode) == want
|
// One named mode. Matched against the SUBMODE as well, because ADIF
|
||||||
|
// files PSK63 under PSK: a log carrying the pair would answer nothing
|
||||||
|
// at all to the only name the operator recognises.
|
||||||
|
return r.Mode == want || r.Submode == want
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
keep := func(r qso.GridSquareRow) bool {
|
||||||
|
if !keepMode(r) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
if wantBand != "" && wantBand != "all" && r.Band != wantBand {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
if wantSat != "" && wantSat != "ALL" && r.SatName != wantSat {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
return a.qso.GridSquares(a.ctx, keep)
|
return a.qso.GridSquares(a.ctx, keep)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GridSquareChoices is what the grid map's three filters can offer: the modes,
|
||||||
|
// bands and satellites the squares in the log were actually worked on.
|
||||||
|
//
|
||||||
|
// Read from the log, not from a list here, so a filter never offers a choice
|
||||||
|
// with nothing behind it and never omits one with something. FT2 is the case
|
||||||
|
// that settled it: it is not a registered ADIF mode yet, and hardcoding the
|
||||||
|
// list meant either leaving out operators already using it or shipping a mode
|
||||||
|
// that is not official — a query does neither.
|
||||||
|
type GridSquareChoices struct {
|
||||||
|
Modes []string `json:"modes"`
|
||||||
|
Bands []string `json:"bands"`
|
||||||
|
Satellites []string `json:"satellites"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *App) GridSquareChoices() (GridSquareChoices, error) {
|
||||||
|
if a.qso == nil {
|
||||||
|
return GridSquareChoices{}, fmt.Errorf("db not initialized")
|
||||||
|
}
|
||||||
|
modes, bands, sats, err := a.qso.GridSquareChoices(a.ctx)
|
||||||
|
if err != nil {
|
||||||
|
return GridSquareChoices{}, err
|
||||||
|
}
|
||||||
|
// Bands in frequency order, the way every other band list in the app reads;
|
||||||
|
// modes and satellites alphabetically, there being no other order for them.
|
||||||
|
sort.Slice(bands, func(i, j int) bool { return bandOrder(bands[i]) < bandOrder(bands[j]) })
|
||||||
|
sort.Strings(modes)
|
||||||
|
sort.Strings(sats)
|
||||||
|
return GridSquareChoices{Modes: modes, Bands: bands, Satellites: sats}, nil
|
||||||
|
}
|
||||||
|
|
||||||
// SetCompactMode toggles a tiny always-on-top window that exposes just the
|
// SetCompactMode toggles a tiny always-on-top window that exposes just the
|
||||||
// QSO entry — useful when running on a single screen alongside WSJT-X,
|
// QSO entry — useful when running on a single screen alongside WSJT-X,
|
||||||
// JT-Alert or the cluster.
|
// JT-Alert or the cluster.
|
||||||
@@ -17007,6 +17085,10 @@ func (a *App) reloadAfterProfileSwitch() {
|
|||||||
// Same reasoning for the satellite tracker: it transmits, and the new profile
|
// Same reasoning for the satellite tracker: it transmits, and the new profile
|
||||||
// may be a different station on a different antenna.
|
// may be a different station on a different antenna.
|
||||||
a.StopSatelliteTracking()
|
a.StopSatelliteTracking()
|
||||||
|
// A new profile is usually a new callsign, and the callsign IS this
|
||||||
|
// subscription — left alone it would go on reporting who hears the previous
|
||||||
|
// station.
|
||||||
|
a.startHearMe()
|
||||||
}
|
}
|
||||||
|
|
||||||
// DuplicateProfile clones an existing profile under newName. Useful when
|
// DuplicateProfile clones an existing profile under newName. Useful when
|
||||||
@@ -18212,6 +18294,10 @@ type motorAntenna interface {
|
|||||||
SetFrequency(khz, dir int) error
|
SetFrequency(khz, dir int) error
|
||||||
SetDirection(dir int) error
|
SetDirection(dir int) error
|
||||||
Retract() error
|
Retract() error
|
||||||
|
// Calibrate re-learns where the elements are by driving them to their end
|
||||||
|
// stops. SteppIR only: an Ultrabeam has no such command, and says so rather
|
||||||
|
// than pretending.
|
||||||
|
Calibrate() error
|
||||||
LastSetKHz() int
|
LastSetKHz() int
|
||||||
Status() motorStatus
|
Status() motorStatus
|
||||||
// Elements returns the per-element lengths (mm) when the antenna exposes them
|
// Elements returns the per-element lengths (mm) when the antenna exposes them
|
||||||
@@ -18239,11 +18325,14 @@ type ubAdapter struct {
|
|||||||
freqMin, freqMax int
|
freqMin, freqMax int
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a ubAdapter) Start() error { return a.c.Start() }
|
func (a ubAdapter) Start() error { return a.c.Start() }
|
||||||
func (a ubAdapter) Stop() { a.c.Stop() }
|
func (a ubAdapter) Stop() { a.c.Stop() }
|
||||||
func (a ubAdapter) SetFrequency(k, d int) error { return a.c.SetFrequency(k, d) }
|
func (a ubAdapter) SetFrequency(k, d int) error { return a.c.SetFrequency(k, d) }
|
||||||
func (a ubAdapter) SetDirection(d int) error { return a.c.SetDirection(d) }
|
func (a ubAdapter) SetDirection(d int) error { return a.c.SetDirection(d) }
|
||||||
func (a ubAdapter) Retract() error { return a.c.Retract() }
|
func (a ubAdapter) Retract() error { return a.c.Retract() }
|
||||||
|
func (a ubAdapter) Calibrate() error {
|
||||||
|
return fmt.Errorf("calibration is a SteppIR command — an Ultrabeam controller has none")
|
||||||
|
}
|
||||||
func (a ubAdapter) LastSetKHz() int { return a.c.LastSetKHz() }
|
func (a ubAdapter) LastSetKHz() int { return a.c.LastSetKHz() }
|
||||||
func (a ubAdapter) SetElement(n, mm int) error { return a.c.ModifyElement(n, mm) }
|
func (a ubAdapter) SetElement(n, mm int) error { return a.c.ModifyElement(n, mm) }
|
||||||
func (a ubAdapter) ReadElements() ([]int, error) { return a.c.ReadElements() }
|
func (a ubAdapter) ReadElements() ([]int, error) { return a.c.ReadElements() }
|
||||||
@@ -18282,6 +18371,7 @@ func (a steppirAdapter) Stop() { a.c.Stop() }
|
|||||||
func (a steppirAdapter) SetFrequency(k, d int) error { return a.c.SetFrequency(k, d) }
|
func (a steppirAdapter) SetFrequency(k, d int) error { return a.c.SetFrequency(k, d) }
|
||||||
func (a steppirAdapter) SetDirection(d int) error { return a.c.SetDirection(d) }
|
func (a steppirAdapter) SetDirection(d int) error { return a.c.SetDirection(d) }
|
||||||
func (a steppirAdapter) Retract() error { return a.c.Retract() }
|
func (a steppirAdapter) Retract() error { return a.c.Retract() }
|
||||||
|
func (a steppirAdapter) Calibrate() error { return a.c.Calibrate() }
|
||||||
func (a steppirAdapter) LastSetKHz() int { return a.c.LastSetKHz() }
|
func (a steppirAdapter) LastSetKHz() int { return a.c.LastSetKHz() }
|
||||||
func (a steppirAdapter) Elements() []int { return nil } // SteppIR: no per-element control
|
func (a steppirAdapter) Elements() []int { return nil } // SteppIR: no per-element control
|
||||||
func (a steppirAdapter) SetElement(_, _ int) error {
|
func (a steppirAdapter) SetElement(_, _ int) error {
|
||||||
@@ -19198,6 +19288,24 @@ func (a *App) restartMotorFollow(s UltrabeamSettings) {
|
|||||||
go a.ultrabeamFollowLoop(a.motorAnt, s.TrackMode, s.StepKHz, s.Bands, stop)
|
go a.ultrabeamFollowLoop(a.motorAnt, s.TrackMode, s.StepKHz, s.Bands, stop)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// MotorCalibrate runs a SteppIR calibration: the elements go to their end stops
|
||||||
|
// so the controller re-learns where zero is.
|
||||||
|
//
|
||||||
|
// The cure for an antenna that tunes to the wrong length — after a power cut
|
||||||
|
// mid-move, after the elements were pushed by hand, after a motor slipped. The
|
||||||
|
// controller counts steps from a remembered position, and once that memory is
|
||||||
|
// wrong, every frequency after it is wrong by the same amount.
|
||||||
|
//
|
||||||
|
// Minutes, and every element travels its full length. Not a contest-time button,
|
||||||
|
// which is why the interface asks first.
|
||||||
|
func (a *App) MotorCalibrate() error {
|
||||||
|
if a.motorAnt == nil {
|
||||||
|
return fmt.Errorf("antenna not connected")
|
||||||
|
}
|
||||||
|
applog.Printf("antenna: calibration started — the elements go to their end stops, this takes minutes")
|
||||||
|
return a.motorAnt.Calibrate()
|
||||||
|
}
|
||||||
|
|
||||||
// UltrabeamRetract retracts all elements (storage / safe position).
|
// UltrabeamRetract retracts all elements (storage / safe position).
|
||||||
func (a *App) UltrabeamRetract() error {
|
func (a *App) UltrabeamRetract() error {
|
||||||
if a.motorAnt == nil {
|
if a.motorAnt == nil {
|
||||||
|
|||||||
@@ -0,0 +1,94 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
// ── Who hears me (PSK Reporter) ────────────────────────────────────────────
|
||||||
|
//
|
||||||
|
// The FT map draws what this station decodes. This is the other direction:
|
||||||
|
// which stations are reporting our own transmissions, which is the half an
|
||||||
|
// operator cannot see from their own receiver and the half that decides whether
|
||||||
|
// calling is worth the cycle.
|
||||||
|
//
|
||||||
|
// See internal/pskrme for why it costs almost nothing — the operator's callsign
|
||||||
|
// goes in the topic's TRANSMIT level, so the broker sends nothing else.
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"hamlog/internal/applog"
|
||||||
|
"hamlog/internal/pskrme"
|
||||||
|
)
|
||||||
|
|
||||||
|
// keyHearMeOn is per-profile, not global: a second profile is usually a second
|
||||||
|
// callsign, and the answer to "who hears me" is not the same one.
|
||||||
|
const keyHearMeOn = "hearme.on"
|
||||||
|
|
||||||
|
// GetHearMe reports whether the feed is wanted.
|
||||||
|
func (a *App) GetHearMe() bool {
|
||||||
|
if a.settings == nil || !a.settingsScoped.Load() {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
v, _ := a.settings.Get(a.ctx, keyHearMeOn)
|
||||||
|
return v == "1"
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetHearMe turns the feed on or off and brings the subscription with it.
|
||||||
|
func (a *App) SetHearMe(on bool) error {
|
||||||
|
if a.settings == nil {
|
||||||
|
return fmt.Errorf("db not initialized")
|
||||||
|
}
|
||||||
|
if err := a.settings.Set(a.ctx, keyHearMeOn, boolStr(on)); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
a.startHearMe()
|
||||||
|
if on {
|
||||||
|
// Not an error: the feed is wanted and will come up as soon as there is
|
||||||
|
// a callsign to watch for, and saying so beats a silent switch.
|
||||||
|
if strings.TrimSpace(a.opCall) == "" {
|
||||||
|
return fmt.Errorf("set the station callsign first — the feed watches for it")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// startHearMe rebuilds the watcher from the setting. Called at startup, when
|
||||||
|
// the setting changes, and on a profile switch — the callsign is what it
|
||||||
|
// subscribes to, so a new profile needs a new subscription.
|
||||||
|
func (a *App) startHearMe() {
|
||||||
|
if a.hearMe != nil {
|
||||||
|
a.hearMe.Stop()
|
||||||
|
a.hearMe = nil
|
||||||
|
}
|
||||||
|
if !a.GetHearMe() {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
call := strings.ToUpper(strings.TrimSpace(a.opCall))
|
||||||
|
if call == "" {
|
||||||
|
applog.Printf("pskrme: no station callsign — nothing to watch for")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
w := pskrme.New(pskrme.Config{MyCall: call, Logf: applog.Printf})
|
||||||
|
if err := w.Start(); err != nil {
|
||||||
|
applog.Printf("pskrme: feed did not start: %v", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
a.hearMe = w
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetWhoHearsMe is the map layer: one entry per station that has reported us
|
||||||
|
// inside the window, carrying its own square so the arc is arithmetic.
|
||||||
|
func (a *App) GetWhoHearsMe() []pskrme.Report {
|
||||||
|
if a.hearMe == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return a.hearMe.Reports()
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetHearMeStatus tells a working feed from a silent one: a connection that is
|
||||||
|
// up and reporting nothing looks exactly like a broken one until you can see a
|
||||||
|
// number moving.
|
||||||
|
func (a *App) GetHearMeStatus() pskrme.Status {
|
||||||
|
if a.hearMe == nil {
|
||||||
|
return pskrme.Status{Watching: strings.ToUpper(strings.TrimSpace(a.opCall))}
|
||||||
|
}
|
||||||
|
return a.hearMe.Status()
|
||||||
|
}
|
||||||
+52
-6
@@ -314,7 +314,12 @@ func (a *App) GetSatSettings() (SatSettings, error) {
|
|||||||
if a.settings == nil {
|
if a.settings == nil {
|
||||||
return SatSettings{}, fmt.Errorf("db not initialized")
|
return SatSettings{}, fmt.Errorf("db not initialized")
|
||||||
}
|
}
|
||||||
return a.satSettings(), nil
|
out := a.satSettings()
|
||||||
|
// Resolved HERE and not in satSettings, which is read during startup before
|
||||||
|
// the frequency plan is loaded. Saving the panel writes the resolved list
|
||||||
|
// back, so the rename settles itself the first time anything is changed.
|
||||||
|
out.Favorites = a.satFavorites()
|
||||||
|
return out, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// SaveSatSettings stores them.
|
// SaveSatSettings stores them.
|
||||||
@@ -359,6 +364,15 @@ func (a *App) SaveSatSettings(s SatSettings) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// The Satellites tab is usually open BEHIND the settings window, and it
|
||||||
|
// read the followed list once when it was mounted: dropping QO-100 left it
|
||||||
|
// in the pass table and in the dropdown until the tab was reopened, which
|
||||||
|
// looks exactly like a setting that did not save. Every key written here
|
||||||
|
// changes what the tab should show — the followed list, the horizon, the
|
||||||
|
// window, the locator — so one event covers them all.
|
||||||
|
if a.ctx != nil {
|
||||||
|
wruntime.EventsEmit(a.ctx, "sat:settings")
|
||||||
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -535,9 +549,8 @@ func (a *App) AddSatelliteElements(text string) (int, error) {
|
|||||||
// configuration problem into a satellite that "does not exist".
|
// configuration problem into a satellite that "does not exist".
|
||||||
func (a *App) GetSatelliteBirds() []SatBird {
|
func (a *App) GetSatelliteBirds() []SatBird {
|
||||||
store, birds, _ := a.satParts()
|
store, birds, _ := a.satParts()
|
||||||
set := a.satSettings()
|
|
||||||
fav := map[string]bool{}
|
fav := map[string]bool{}
|
||||||
for _, n := range set.Favorites {
|
for _, n := range a.satFavorites() {
|
||||||
fav[strings.ToUpper(n)] = true
|
fav[strings.ToUpper(n)] = true
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -665,15 +678,48 @@ func satElement(store *sat.Store, b sat.Bird) (sat.Element, bool) {
|
|||||||
|
|
||||||
// ── Tracking ────────────────────────────────────────────────────────────────
|
// ── Tracking ────────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
// satFavorites is the followed list, with every name resolved to the one the
|
||||||
|
// frequency plan uses now.
|
||||||
|
//
|
||||||
|
// A satellite is renamed when it is granted an OSCAR number — LILACSAT-2
|
||||||
|
// became LO-90 — and the plan carries the old name as an alias. The followed
|
||||||
|
// list, though, is stored as the plain text the operator picked: after such a
|
||||||
|
// rename his own choice was listed as having no elements while the same bird
|
||||||
|
// sat under its new name in the available column, so the satellite he had
|
||||||
|
// chosen had quietly become a stranger.
|
||||||
|
//
|
||||||
|
// Deduplicated on the way out, because an operator who followed both spellings
|
||||||
|
// must not now see the same bird twice.
|
||||||
|
func (a *App) satFavorites() []string {
|
||||||
|
names := a.satSettings().Favorites
|
||||||
|
_, birds, _ := a.satParts()
|
||||||
|
if birds == nil {
|
||||||
|
return names
|
||||||
|
}
|
||||||
|
out := make([]string, 0, len(names))
|
||||||
|
seen := map[string]bool{}
|
||||||
|
for _, n := range names {
|
||||||
|
if b, ok := birds.Find(n); ok {
|
||||||
|
n = b.Name
|
||||||
|
}
|
||||||
|
k := strings.ToUpper(n)
|
||||||
|
if seen[k] {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
seen[k] = true
|
||||||
|
out = append(out, n)
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
// satNames resolves the names the UI asked for, falling back to the favourites
|
// satNames resolves the names the UI asked for, falling back to the favourites
|
||||||
// and then to every planned bird we hold elements for.
|
// and then to every planned bird we hold elements for.
|
||||||
func (a *App) satNames(names []string) []string {
|
func (a *App) satNames(names []string) []string {
|
||||||
if len(names) > 0 {
|
if len(names) > 0 {
|
||||||
return names
|
return names
|
||||||
}
|
}
|
||||||
set := a.satSettings()
|
if favs := a.satFavorites(); len(favs) > 0 {
|
||||||
if len(set.Favorites) > 0 {
|
return favs
|
||||||
return set.Favorites
|
|
||||||
}
|
}
|
||||||
var out []string
|
var out []string
|
||||||
for _, b := range a.GetSatelliteBirds() {
|
for _, b := range a.GetSatelliteBirds() {
|
||||||
|
|||||||
+30
-6
@@ -96,8 +96,13 @@ type SatTrackStatus struct {
|
|||||||
Az float64 `json:"az"`
|
Az float64 `json:"az"`
|
||||||
El float64 `json:"el"`
|
El float64 `json:"el"`
|
||||||
Visible bool `json:"visible"`
|
Visible bool `json:"visible"`
|
||||||
Radio string `json:"radio"` // what the rig is doing: "sat", "downlink-only", ""
|
// Where the satellite is, as opposed to where to point: an operator reads
|
||||||
Error string `json:"error"`
|
// the distance to know whether a pass is worth calling on, and the altitude
|
||||||
|
// to know how long it will last.
|
||||||
|
RangeKm float64 `json:"range_km"`
|
||||||
|
AltKm float64 `json:"alt_km"`
|
||||||
|
Radio string `json:"radio"` // what the rig is doing: "sat", "downlink-only", ""
|
||||||
|
Error string `json:"error"`
|
||||||
|
|
||||||
// Where the antenna is. RotLive distinguishes a reading from the controller
|
// Where the antenna is. RotLive distinguishes a reading from the controller
|
||||||
// from the last position it was TOLD to go to — a stuck rotator must not be
|
// from the last position it was TOLD to go to — a stuck rotator must not be
|
||||||
@@ -350,6 +355,7 @@ func (a *App) satTrackStep(t *satTracker) {
|
|||||||
st.NominalDown, st.NominalUp = nominal, nomUp
|
st.NominalDown, st.NominalUp = nominal, nomUp
|
||||||
st.DownHz, st.UpHz = down, up
|
st.DownHz, st.UpHz = down, up
|
||||||
st.Az, st.El, st.Visible = pos.Az, pos.El, visible
|
st.Az, st.El, st.Visible = pos.Az, pos.El, visible
|
||||||
|
st.RangeKm, st.AltKm = pos.RangeKm, pos.AltKm
|
||||||
t.status = st
|
t.status = st
|
||||||
t.mu.Unlock()
|
t.mu.Unlock()
|
||||||
|
|
||||||
@@ -649,8 +655,20 @@ func satBandLetter(hz int64) string {
|
|||||||
return "K" // 24 GHz and above
|
return "K" // 24 GHz and above
|
||||||
}
|
}
|
||||||
|
|
||||||
// applySatAntennas puts each satellite slice on the antenna configured for ITS
|
// flexBandAntKey is the key a frequency has in the per-band antenna and power
|
||||||
// band.
|
// maps.
|
||||||
|
//
|
||||||
|
// Those maps are keyed by the band name UPPERCASED ("70CM"), because that is
|
||||||
|
// how the settings panel writes them; bandForHz returns the band plan's own
|
||||||
|
// spelling ("70cm"). Every other caller happened to uppercase on the way in,
|
||||||
|
// the satellite tracker did not, and so it read an empty antenna out of a map
|
||||||
|
// the operator had filled in — which is not a mistake worth making twice.
|
||||||
|
func flexBandAntKey(hz int64) string {
|
||||||
|
return strings.ToUpper(bandForHz(hz))
|
||||||
|
}
|
||||||
|
|
||||||
|
// applySatRadio puts each satellite slice on the antenna configured for ITS
|
||||||
|
// band, and sets the uplink tone.
|
||||||
//
|
//
|
||||||
// Settings ▸ FlexRadio already holds a per-band RX/TX antenna map, and it was
|
// Settings ▸ FlexRadio already holds a per-band RX/TX antenna map, and it was
|
||||||
// only ever applied by the entry form on a band change — to the active slice.
|
// only ever applied by the entry form on a band change — to the active slice.
|
||||||
@@ -681,11 +699,17 @@ func (a *App) applySatRadio(tp sat.Transponder) {
|
|||||||
}
|
}
|
||||||
// The downlink is received, so it takes that band's RX antenna; the uplink
|
// The downlink is received, so it takes that band's RX antenna; the uplink
|
||||||
// is transmitted, so it takes that band's TX antenna.
|
// is transmitted, so it takes that band's TX antenna.
|
||||||
rxAnt := m[bandForHz(tp.DownLo)].RX
|
downBand, upBand := flexBandAntKey(tp.DownLo), flexBandAntKey(tp.UpLo)
|
||||||
txAnt := m[bandForHz(tp.UpLo)].TX
|
rxAnt := m[downBand].RX
|
||||||
|
txAnt := m[upBand].TX
|
||||||
if strings.TrimSpace(rxAnt) == "" && strings.TrimSpace(txAnt) == "" {
|
if strings.TrimSpace(rxAnt) == "" && strings.TrimSpace(txAnt) == "" {
|
||||||
|
// Worth a line: an operator who HAS configured the pair and still sees
|
||||||
|
// the wrong antenna has no other way to tell a setting he never made
|
||||||
|
// from a lookup that missed.
|
||||||
|
applog.Printf("sat: no antenna configured for this pass (down %s, up %s)", downBand, upBand)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
applog.Printf("sat: antennas rx=%q (%s) tx=%q (%s)", rxAnt, downBand, txAnt, upBand)
|
||||||
if err := a.cat.FlexDo(func(fc cat.FlexController) error {
|
if err := a.cat.FlexDo(func(fc cat.FlexController) error {
|
||||||
return fc.SatAntennas(rxAnt, txAnt)
|
return fc.SatAntennas(rxAnt, txAnt)
|
||||||
}); err != nil {
|
}); err != nil {
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"sort"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"hamlog/internal/sat"
|
"hamlog/internal/sat"
|
||||||
@@ -135,3 +136,39 @@ func TestSatSidebands(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// The per-band antenna map is keyed by the UPPERCASED band name, because that
|
||||||
|
// is what the settings panel writes. The satellite tracker looked its two bands
|
||||||
|
// up with the band plan's own spelling, matched nothing, and ran the pass on
|
||||||
|
// whichever antenna the radio was last left on — a 70 cm downlink through a 2 m
|
||||||
|
// transverter, with no error anywhere. This pins the contract in the direction
|
||||||
|
// that broke.
|
||||||
|
func TestFlexBandAntKeyIsUppercased(t *testing.T) {
|
||||||
|
for _, c := range []struct {
|
||||||
|
hz int64
|
||||||
|
want string
|
||||||
|
}{
|
||||||
|
{435_400_000, "70CM"}, // an FM bird's downlink
|
||||||
|
{145_950_000, "2M"}, // its uplink
|
||||||
|
{1_269_000_000, "23CM"}, // AO-92's L band
|
||||||
|
{29_450_000, "10M"}, // AO-7 mode A
|
||||||
|
{9_000_000_000, ""}, // nothing in the plan: no key, and no antenna
|
||||||
|
} {
|
||||||
|
if got := flexBandAntKey(c.hz); got != c.want {
|
||||||
|
t.Errorf("flexBandAntKey(%d) = %q, want %q", c.hz, got, c.want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A band list sorted as strings puts 10m between 1.25m and 12m, which is why
|
||||||
|
// the plan's own index is the order.
|
||||||
|
func TestBandOrderIsByFrequency(t *testing.T) {
|
||||||
|
got := []string{"70cm", "10m", "160m", "2m", "20m", "banana"}
|
||||||
|
sort.Slice(got, func(i, j int) bool { return bandOrder(got[i]) < bandOrder(got[j]) })
|
||||||
|
want := []string{"160m", "20m", "10m", "2m", "70cm", "banana"}
|
||||||
|
for i := range want {
|
||||||
|
if got[i] != want[i] {
|
||||||
|
t.Fatalf("sorted %v, want %v", got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,4 +1,48 @@
|
|||||||
[
|
[
|
||||||
|
{
|
||||||
|
"version": "0.27.23",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"SteppIR: a Calibrate button, beside Retract. It drives every element to its end stop so the controller re-learns where zero is — the cure for an antenna that tunes to the wrong length after a power cut mid-move, after the elements were pushed by hand, or after a motor slipped. It takes minutes and the antenna is unusable until it finishes, so it asks first. Ultrabeam controllers have no such command and say so rather than pretending. Retracting the elements was already there and now explains itself: it is the storage position, and the next tune brings them back out on its own.",
|
||||||
|
"On the rotor dial, the beam no longer whips a full turn round the compass when the antenna crosses north. A rotator at 020° turned anticlockwise reports 020, 010, 000, 359, 358 … and the animation travelled from 20° to 359° the long way — a complete revolution on screen while the mast moved forty degrees the other way. The beam now follows an accumulated angle, so what is drawn is the way the antenna is actually turning. Both lobes of a bidirectional antenna are handled separately, since they cross north at different moments.",
|
||||||
|
"The rotor widget stops claiming the antenna is turning every time the wind moves it. A threshold alone could not tell the difference — a gust pushes a beam well past four degrees and back, and each excursion counted, so Stop lit and went out all evening on an antenna that had not turned. What separates a rotation from the weather is not how far the reading moves but which way: a rotor under power advances, gust after gust reverses. A step now counts only when the previous one went the same way, so movement is announced one poll later on a mast that takes half a minute to cross a pass, and never at all on a windy afternoon.",
|
||||||
|
"LilacSat-2 gets its FM transponder — 144.350 up, 437.200 down — and its proper name, LO-90. It was shipped with nothing but an APRS digipeater, because the transponder database marks that transponder inactive: it runs to an announced schedule rather than continuously, which from a database looks exactly like a dead one. The label says \"(scheduled)\" so nobody wonders why it is quiet. The generator now also lists the satellites it refused on that ground and kept nothing else for, so the next regeneration is not silent about them.",
|
||||||
|
"A frequency OpsLog got wrong can now be corrected on a station that already has the satellite file. Until now the file was copied out on the first run and was the operator's from then on, so a mistake we shipped — LilacSat-2 with no FM transponder — had become their data and could never be mended. The plan now adds what is missing, brings up to date what was never edited, and leaves alone what was: an entry you corrected by hand outranks anything shipped, and the log names the ones it stood down on. The first run after this cannot tell the two apart, so it takes the shipped plan and copies your file to satellites.json.bak first — after that your edits are recognised precisely and survive every release.",
|
||||||
|
"The per-band antennas are applied to the satellite slices at last. The map is keyed by the band name in capitals, the tracker looked its two bands up in lower case, and so it read no antenna at all out of a table the operator had filled in — a 70 cm downlink stayed on the 2 m transverter. The log now names the band and the antenna it resolved, so a setting never made can be told apart from a lookup that missed.",
|
||||||
|
"Tracking now shows where the satellite is beside where the antenna points: azimuth, elevation, distance and altitude, in the same strip as the two frequencies. The elevation goes dim below the horizon, so a bird still being followed on its way up cannot be read as workable.",
|
||||||
|
"The two satellite lists in the settings are sorted by name, numerically — AO-27, AO-91, AO-123. The left one came in the order the frequency file happens to be written and the right one in the order they were clicked, so finding one bird among sixteen meant reading all sixteen. A satellite renamed on getting its OSCAR number, as LILACSAT-2 became LO-90, is also recognised in a followed list that still holds the old name instead of being listed as having no elements.",
|
||||||
|
"The grid-square map filters by one mode, by band and by satellite. The FTx button is gone: it grouped FT8, FT4 and FT2 together, while the question the map answers is where a single mode has been heard. The named modes are read from the log itself, so each one is offered only if there is something behind it — and FT2 appears for whoever is already using it, with nothing to change here the day it becomes a registered mode. The band list is the station's own plus anything worked outside it, and the satellite list only appears once a square has been worked through a bird.",
|
||||||
|
"Saving the satellite settings now refreshes the Satellites tab. It read the followed list once when it was opened, so un-following a satellite left it in the pass table and in the dropdown until the tab was reopened — which looks exactly like a setting that failed to save. The lowest pass, the window and the locator are picked up the same way, and a satellite that is no longer followed hands the selection to the first one that is.",
|
||||||
|
"The FT map takes one colour for every decode, next to the basemap buttons. The band palette is calibrated against a plain map — 60m navy and 70cm olive all but vanish over the satellite imagery — and it is only useful to somebody watching several bands at once, which most operators are not. Leave it empty for the colour per band, as before. The legend then keeps the band names and drops the swatches, since which bands are up is still worth knowing.",
|
||||||
|
"\"Later\" on an update notice now asks for how long: 1, 4, 12 or 24 hours. It only hid the card before, and the check behind it runs every five minutes, so the same notice came back four times an hour all evening for a version already declined. The delay is recorded against that version, so a newer release is different news and appears at once — a deferral can never bury an update. The cross hides it for an hour, and opening About still answers whatever was deferred, because asking is asking.",
|
||||||
|
"Stop stays lit for the whole rotation instead of blinking. Keeping the wind out took a four-degree step, but four degrees is four seconds of travel on a real rotor, so between two of them nothing confirmed the mast was still turning and the button went dark and came back the whole way round. Getting in stays strict — two steps the same way, which weather never gives — while staying in now needs only continued progress in that direction: one degree the same way is not a gust when the rotor is already under power.",
|
||||||
|
"The frequency plan is checked against AMSAT's live FM and image lists. AO-123 gets the 67.0 Hz tone its uplink needs, SO-50 says in its label that 74.4 Hz arms the timer before 67.0 can key it, and eight SSTV satellites are added — HC1PX, RS18S, RS27S, RS38S, RS40S, RS57S, RS58S and RS83S — as receive-only entries, with SSTV downlinks added to SONATE-2 and QMR-KWT-2. Every FM bird's uplink, downlink and tone now agrees with the published table.",
|
||||||
|
"The FT map can now show who hears YOU. \"Who hears me\" draws, in dashed cyan, every station reporting your own transmissions to PSK Reporter, alongside the solid arcs of what you decode — the direction you cannot see from your own receiver, and on FT8 the one that says whether calling is worth the cycle. It costs almost nothing: your callsign goes in the topic's transmit level, so the broker sends nothing else, and it works with the band-opening watch switched off. Off until asked for, and each station appears once with its freshest report inside a fifteen-minute window.",
|
||||||
|
"\"Who hears me\" is marks alone, no arcs. With a few dozen receivers reporting, a line to each made a fan out of one square that buried the decode arcs beside it — and the lines said nothing, since every one of these paths starts in the same place. The mark is a hollow diamond, fading with age: shape rather than colour carries the difference, the decode dots being filled circles and the arcs having used fourteen colours already.",
|
||||||
|
"The FT map's controls stop covering it. The basemap buttons had crept over Leaflet's zoom control, so the minus button took clicks meant for Street, and the row had grown with the colour picker and the reverse layer until it reached the middle of a world map — covering the Atlantic to save a top-right corner that was empty the whole time. Basemaps stay on the left, clear of the zoom; the colour and \"Who hears me\" move to the right.",
|
||||||
|
"The who-hears-me diamonds are filled and take a colour of their own, chosen beside the switch that turns them on. Filled with a hairline white edge, the trick the home marker already uses: a ring is an outline drawn over whatever is beneath it, and eight pixels of it over the satellite imagery was barely there. The colour is separate from the decode one because a single control would have forced both layers into one colour — the very distinction it took a shape to make."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"SteppIR : un bouton Calibrer, à côté de Rétracter. Il amène chaque élément en butée pour que le contrôleur retrouve son zéro — le remède à une antenne qui s’accorde à la mauvaise longueur après une coupure en pleine course, après avoir poussé les éléments à la main, ou après un moteur qui a glissé. Cela prend plusieurs minutes et l’antenne est inutilisable jusqu’à la fin : une confirmation est donc demandée. Les contrôleurs Ultrabeam n’ont pas cette commande et le disent, au lieu de faire semblant. Rétracter les éléments existait déjà et s’explique maintenant : c’est la position de rangement, et le prochain accord les fait ressortir tout seuls.",
|
||||||
|
"Sur le cadran du rotor, le faisceau ne fait plus un tour complet de la boussole quand l’antenne franchit le nord. Un rotor à 020° tourné dans le sens antihoraire annonce 020, 010, 000, 359, 358… et l’animation allait de 20° à 359° par le chemin long — une révolution complète à l’écran pendant que le pylône bougeait de quarante degrés dans l’autre sens. Le faisceau suit désormais un angle cumulé : ce qui est dessiné est le mouvement réel de l’antenne. Les deux lobes d’une antenne bidirectionnelle sont traités séparément, puisqu’ils ne franchissent pas le nord au même moment.",
|
||||||
|
"Le widget rotor n’annonce plus une antenne en rotation chaque fois que le vent la bouge. Un simple seuil ne pouvait pas faire la différence — une rafale pousse une beam bien au-delà de quatre degrés puis la ramène, et chaque écart comptait : Stop s’allumait et s’éteignait toute la soirée sur une antenne qui n’avait pas tourné. Ce qui distingue une rotation de la météo n’est pas l’amplitude mais le sens : un rotor sous tension avance, une rafale revient. Un écart ne compte donc que si le précédent allait dans le même sens — la rotation est annoncée un relevé plus tard sur un pylône qui met trente secondes à traverser, et plus du tout par vent fort.",
|
||||||
|
"LilacSat-2 récupère son transpondeur FM — 144,350 en montée, 437,200 en descente — et son vrai nom, LO-90. Il était livré avec un simple digipeater APRS, parce que la base de transpondeurs marque ce transpondeur comme inactif : il fonctionne selon un calendrier annoncé plutôt qu’en continu, ce qui, vu d’une base de données, ressemble exactement à un transpondeur mort. Le libellé indique « (scheduled) » pour que personne ne se demande pourquoi il est muet. Le générateur liste désormais aussi les satellites qu’il a écartés pour cette raison sans rien garder d’autre, afin que la prochaine régénération ne les passe plus sous silence.",
|
||||||
|
"Une fréquence qu’OpsLog avait fausse peut désormais être corrigée sur une station qui possède déjà le fichier satellites. Jusqu’ici ce fichier était copié au premier lancement puis appartenait à l’opérateur, si bien qu’une erreur de notre part — LilacSat-2 sans transpondeur FM — devenait sa donnée et ne pouvait plus être réparée. Le plan ajoute maintenant ce qui manque, met à jour ce qui n’a jamais été modifié, et laisse intact ce qui l’a été : une entrée corrigée à la main prime sur tout ce qui est livré, et le journal nomme celles devant lesquelles il s’est effacé. Le premier lancement après ce changement ne peut pas distinguer les deux : il prend donc le plan livré et copie d’abord votre fichier en satellites.json.bak — ensuite vos modifications sont reconnues précisément et survivent à chaque version.",
|
||||||
|
"Les antennes par bande sont enfin appliquées aux slices satellite. La table est indexée par le nom de bande en majuscules, le suivi cherchait ses deux bandes en minuscules, et il ne lisait donc aucune antenne dans un tableau que l’opérateur avait rempli — une descente 70 cm restait sur le transverter 2 m. Le journal indique désormais la bande et l’antenne retenues, pour distinguer un réglage jamais fait d’une recherche qui a échoué.",
|
||||||
|
"Le suivi affiche désormais où est le satellite à côté de là où pointe l’antenne : azimut, élévation, distance et altitude, dans le même bandeau que les deux fréquences. L’élévation s’estompe sous l’horizon, pour qu’un satellite encore suivi avant son lever ne soit pas pris pour un satellite travaillable.",
|
||||||
|
"Les deux listes de satellites des réglages sont triées par nom, en tenant compte des nombres — AO-27, AO-91, AO-123. Celle de gauche suivait l’ordre du fichier de fréquences et celle de droite l’ordre des clics : retrouver un satellite parmi seize obligeait à lire les seize. Un satellite renommé lors de l’attribution de son numéro OSCAR, comme LILACSAT-2 devenu LO-90, est aussi reconnu dans une liste de suivis qui porte encore l’ancien nom, au lieu d’y apparaître sans éléments.",
|
||||||
|
"La carte des carrés locator se filtre par mode précis, par bande et par satellite. Le bouton FTx disparaît : il regroupait FT8, FT4 et FT2, alors que la question à laquelle répond cette carte est de savoir où un seul mode a été entendu. Les modes proposés sont lus dans le journal, donc chacun n’apparaît que s’il y a quelque chose derrière — et FT2 est proposé à qui l’utilise déjà, sans rien à changer ici le jour où il deviendra un mode officiel. La liste des bandes est celle de la station, complétée par ce qui a été travaillé en dehors, et la liste des satellites n’apparaît qu’une fois un carré travaillé par satellite.",
|
||||||
|
"Enregistrer les réglages satellite rafraîchit désormais l’onglet Satellites. Il lisait la liste des suivis une seule fois à son ouverture : retirer un satellite le laissait dans le tableau des passes et dans la liste déroulante jusqu’à la réouverture de l’onglet — ce qui ressemble exactement à un réglage qui ne s’est pas enregistré. L’élévation minimale, la fenêtre de prévision et le locator sont pris en compte de la même façon, et un satellite qui n’est plus suivi passe la sélection au premier qui l’est.",
|
||||||
|
"La carte FT accepte une couleur unique pour tous les décodages, à côté des boutons de fond de carte. La palette par bande est calibrée sur une carte claire — le bleu marine du 60 m et l’olive du 70 cm disparaissent presque sur l’imagerie satellite — et elle ne sert qu’à qui surveille plusieurs bandes à la fois, ce qui n’est pas le cas de la plupart. Laissez-la vide pour retrouver la couleur par bande. La légende conserve alors les noms de bandes et abandonne les pastilles, car savoir quelles bandes sont ouvertes reste utile.",
|
||||||
|
"« Plus tard » sur une notification de mise à jour demande désormais combien de temps : 1, 4, 12 ou 24 heures. Le bouton ne faisait que masquer la fenêtre, et la vérification derrière tourne toutes les cinq minutes : la même notification revenait quatre fois par heure toute la soirée pour une version déjà refusée. Le report est enregistré pour cette version précise, donc une version plus récente est une autre nouvelle et s’affiche immédiatement — un report ne peut jamais enterrer une mise à jour. La croix masque pendant une heure, et ouvrir « À propos » répond toujours, même sur une version reportée : demander, c’est demander.",
|
||||||
|
"Le bouton Stop reste allumé pendant toute la rotation au lieu de clignoter. Écarter le vent demandait un écart de quatre degrés, mais quatre degrés représentent quatre secondes de course sur un vrai rotor : entre deux d’entre eux, plus rien ne confirmait que le pylône tournait encore et le bouton s’éteignait puis se rallumait tout du long. L’entrée reste stricte — deux écarts dans le même sens, ce que la météo ne produit jamais — tandis que le maintien ne demande plus qu’une progression continue dans ce sens : un degré du même côté n’est pas une rafale quand le rotor est déjà sous tension.",
|
||||||
|
"Le plan de fréquences est vérifié contre les listes FM et image d’AMSAT. AO-123 reçoit le ton de 67,0 Hz qu’exige sa montée, SO-50 indique dans son libellé que 74,4 Hz arme le minuteur avant que 67,0 puisse l’ouvrir, et huit satellites SSTV sont ajoutés — HC1PX, RS18S, RS27S, RS38S, RS40S, RS57S, RS58S et RS83S — en réception seule, avec une descente SSTV ajoutée à SONATE-2 et QMR-KWT-2. La montée, la descente et le ton de chaque satellite FM correspondent désormais à la table publiée.",
|
||||||
|
"La carte FT peut désormais montrer qui VOUS entend. « Qui m’entend » trace en pointillés cyan chaque station qui rapporte vos propres émissions à PSK Reporter, à côté des arcs pleins de ce que vous décodez — la direction qu’on ne peut pas voir depuis son propre récepteur, et en FT8 celle qui dit si appeler vaut le cycle. Le coût est quasi nul : votre indicatif est placé dans le niveau émission du topic, donc le broker n’envoie rien d’autre, et cela fonctionne même avec la veille d’ouverture de bande éteinte. Éteint par défaut, et chaque station apparaît une fois avec son rapport le plus récent dans une fenêtre de quinze minutes.",
|
||||||
|
"« Qui m’entend » n’affiche plus que des marques, sans arcs. Avec quelques dizaines de récepteurs, un trait vers chacun formait un éventail depuis un seul carré qui enterrait les arcs de décodage voisins — et ces traits ne disaient rien, puisque tous ces chemins partent du même endroit. La marque est un losange creux qui s’estompe avec l’âge : c’est la forme, et non la couleur, qui porte la différence, les points de décodage étant des cercles pleins et les arcs utilisant déjà quatorze couleurs.",
|
||||||
|
"Les contrôles de la carte FT cessent de la recouvrir. Les boutons de fond de carte avaient débordé sur le zoom de Leaflet — le bouton moins prenait les clics destinés à Street — et la rangée s’était allongée avec le sélecteur de couleur et la couche inverse jusqu’à atteindre le milieu d’une carte du monde, masquant l’Atlantique pour épargner un coin haut-droit resté vide tout ce temps. Les fonds de carte restent à gauche, dégagés du zoom ; la couleur et « Qui m’entend » passent à droite.",
|
||||||
|
"Les losanges de « qui m’entend » sont pleins et prennent leur propre couleur, choisie à côté de l’interrupteur qui les allume. Pleins avec un liseré blanc d’un pixel, le procédé qu’utilise déjà le marqueur de la station : un cercle creux n’est qu’un contour tracé sur ce qui se trouve dessous, et huit pixels de contour sur l’imagerie satellite se voyaient à peine. La couleur est distincte de celle des décodages, car un seul réglage aurait forcé les deux couches dans une même couleur — précisément la distinction qu’il a fallu une forme pour établir."
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"version": "0.27.22",
|
"version": "0.27.22",
|
||||||
"date": "",
|
"date": "",
|
||||||
|
|||||||
@@ -140,6 +140,23 @@ func main() {
|
|||||||
}
|
}
|
||||||
byNORAD[t.NORAD] = append(byNORAD[t.NORAD], t)
|
byNORAD[t.NORAD] = append(byNORAD[t.NORAD], t)
|
||||||
}
|
}
|
||||||
|
// A satellite whose only WORKABLE path is one SatNOGS calls inactive.
|
||||||
|
//
|
||||||
|
// LilacSat-2 is the case that taught this: its FM transponder (144.350 up,
|
||||||
|
// 437.200 down) is marked inactive because it runs on an announced schedule
|
||||||
|
// rather than continuously, so the generator dropped it and shipped the
|
||||||
|
// satellite with nothing but an APRS digipeater. An operator comparing
|
||||||
|
// against any other tracker then finds a frequency plan missing the only
|
||||||
|
// thing anybody works that bird on.
|
||||||
|
//
|
||||||
|
// Not fixed automatically: "inactive" is right far more often than it is
|
||||||
|
// wrong, and reviving every dead transponder would fill the list with
|
||||||
|
// satellites that answer nothing. It is REPORTED, so the next regeneration
|
||||||
|
// is read with this in front of it and the handful worth curating are
|
||||||
|
// curated — a scheduled transponder belongs in the plan with "(scheduled)"
|
||||||
|
// in its label, the way PO-101 and now LO-90 carry it.
|
||||||
|
reportRefused(txs, feed, covered, byNORAD)
|
||||||
|
|
||||||
added := 0
|
added := 0
|
||||||
for n, list := range byNORAD {
|
for n, list := range byNORAD {
|
||||||
b := sat.Bird{Name: displayName(feed[n]), NORAD: n}
|
b := sat.Bird{Name: displayName(feed[n]), NORAD: n}
|
||||||
@@ -442,3 +459,34 @@ func die(err error) {
|
|||||||
fmt.Fprintln(os.Stderr, "satgen:", err)
|
fmt.Fprintln(os.Stderr, "satgen:", err)
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// reportRefused names the satellites whose only two-way path was refused for
|
||||||
|
// being inactive, so the operator running this can decide about each one.
|
||||||
|
//
|
||||||
|
// The output is deliberately a question and not a change: SatNOGS calling a
|
||||||
|
// transponder inactive is usually correct, and the exceptions are the birds
|
||||||
|
// whose transponder is switched on to a schedule rather than left running.
|
||||||
|
func reportRefused(txs []transmitter, feed map[int]string, covered map[int]bool, kept map[int][]transmitter) {
|
||||||
|
var lines []string
|
||||||
|
for _, t := range txs {
|
||||||
|
if t.Status == "active" || t.UplinkLow <= 0 || t.DownlinkLow <= 0 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if feed[t.NORAD] == "" || covered[t.NORAD] || len(kept[t.NORAD]) > 0 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
lines = append(lines, fmt.Sprintf(" ? %5d %-22s %-4s %.3f up / %.3f down %q",
|
||||||
|
t.NORAD, displayName(feed[t.NORAD]), adifMode(t.Mode),
|
||||||
|
float64(t.UplinkLow)/1e6, float64(t.DownlinkLow)/1e6, t.Description))
|
||||||
|
}
|
||||||
|
if len(lines) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
sort.Strings(lines)
|
||||||
|
fmt.Println("\nRefused as inactive, and nothing else was kept for these satellites.")
|
||||||
|
fmt.Println("A transponder that runs to a schedule looks exactly like a dead one here:")
|
||||||
|
for _, l := range lines {
|
||||||
|
fmt.Println(l)
|
||||||
|
}
|
||||||
|
fmt.Println()
|
||||||
|
}
|
||||||
|
|||||||
+47
-4
@@ -2455,6 +2455,33 @@ export default function App() {
|
|||||||
if (wlNoticeTimer.current) window.clearTimeout(wlNoticeTimer.current);
|
if (wlNoticeTimer.current) window.clearTimeout(wlNoticeTimer.current);
|
||||||
wlNoticeTimer.current = window.setTimeout(() => setWlNotice(null), 4000);
|
wlNoticeTimer.current = window.setTimeout(() => setWlNotice(null), 4000);
|
||||||
}), []);
|
}), []);
|
||||||
|
// An update deferred stays deferred.
|
||||||
|
//
|
||||||
|
// "Later" only hid the card, and the check behind it runs every five
|
||||||
|
// minutes — so the same notice came back four times an hour, all evening,
|
||||||
|
// for a version already declined. It now records until WHEN, and for which
|
||||||
|
// version: a release newer than the one put off is a different piece of
|
||||||
|
// news and appears at once, so a snooze can never bury an update for good.
|
||||||
|
//
|
||||||
|
// Deliberately not a portable UI pref — a machine told to wait four hours
|
||||||
|
// has said nothing about the operator's other machines.
|
||||||
|
const SNOOZE_KEY = 'opslog.updateSnooze';
|
||||||
|
const updateSnoozed = (version: string) => {
|
||||||
|
try {
|
||||||
|
const raw = localStorage.getItem(SNOOZE_KEY);
|
||||||
|
if (!raw) return false;
|
||||||
|
const s = JSON.parse(raw) as { v?: string; until?: number };
|
||||||
|
return s?.v === version && Number(s?.until) > Date.now();
|
||||||
|
} catch { return false; } // unreadable is not snoozed
|
||||||
|
};
|
||||||
|
const snoozeUpdate = (hours: number) => {
|
||||||
|
try {
|
||||||
|
if (updateInfo) localStorage.setItem(SNOOZE_KEY, JSON.stringify({ v: updateInfo.latest, until: Date.now() + hours * 3600_000 }));
|
||||||
|
} catch { /* quota: the card just comes back, which is the old behaviour */ }
|
||||||
|
setLaterOpen(false);
|
||||||
|
setUpdateInfo(null);
|
||||||
|
};
|
||||||
|
const [laterOpen, setLaterOpen] = useState(false);
|
||||||
const [checkingUpdate, setCheckingUpdate] = useState(false);
|
const [checkingUpdate, setCheckingUpdate] = useState(false);
|
||||||
// Fresh update check on demand (opening About), so it never shows a stale
|
// Fresh update check on demand (opening About), so it never shows a stale
|
||||||
// "you're up to date". Clears updateInfo when the latest check finds nothing.
|
// "you're up to date". Clears updateInfo when the latest check finds nothing.
|
||||||
@@ -2472,7 +2499,11 @@ export default function App() {
|
|||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (localStorage.getItem('opslog.checkUpdates') === '0') return;
|
if (localStorage.getItem('opslog.checkUpdates') === '0') return;
|
||||||
const check = () => CheckForUpdate().then((u: any) => {
|
const check = () => CheckForUpdate().then((u: any) => {
|
||||||
if (u?.available && u?.latest) setUpdateInfo({ latest: String(u.latest), url: String(u.url ?? ''), downloadUrl: String(u.download_url ?? '') });
|
// The snooze is checked HERE and not in checkUpdateNow: opening About
|
||||||
|
// is a question, and it deserves the answer whatever was deferred.
|
||||||
|
if (u?.available && u?.latest && !updateSnoozed(String(u.latest))) {
|
||||||
|
setUpdateInfo({ latest: String(u.latest), url: String(u.url ?? ''), downloadUrl: String(u.download_url ?? '') });
|
||||||
|
}
|
||||||
}).catch(() => {});
|
}).catch(() => {});
|
||||||
check();
|
check();
|
||||||
const id = window.setInterval(check, 5 * 60 * 1000);
|
const id = window.setInterval(check, 5 * 60 * 1000);
|
||||||
@@ -7422,16 +7453,28 @@ export default function App() {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
) : (
|
) : (
|
||||||
<div className="mt-2 flex items-center gap-2">
|
<div className="mt-2 flex items-center gap-2 flex-wrap">
|
||||||
<button onClick={startUpdate} className="h-7 px-3 rounded-md bg-primary text-primary-foreground text-xs font-medium hover:opacity-90">
|
<button onClick={startUpdate} className="h-7 px-3 rounded-md bg-primary text-primary-foreground text-xs font-medium hover:opacity-90">
|
||||||
{updateInfo.downloadUrl ? t('upd.install') : t('upd.download')}
|
{updateInfo.downloadUrl ? t('upd.install') : t('upd.download')}
|
||||||
</button>
|
</button>
|
||||||
<button onClick={() => setUpdateInfo(null)} className="h-7 px-2 text-xs text-muted-foreground hover:text-foreground">{t('upd.later')}</button>
|
{laterOpen ? (
|
||||||
|
<span className="flex items-center gap-1 text-[11px] text-muted-foreground">
|
||||||
|
{t('upd.remindIn')}
|
||||||
|
{[1, 4, 12, 24].map((h) => (
|
||||||
|
<button key={h} onClick={() => snoozeUpdate(h)}
|
||||||
|
className="h-6 px-1.5 rounded border border-border text-[11px] tabular-nums hover:bg-muted text-foreground">
|
||||||
|
{h}h
|
||||||
|
</button>
|
||||||
|
))}
|
||||||
|
</span>
|
||||||
|
) : (
|
||||||
|
<button onClick={() => setLaterOpen(true)} className="h-7 px-2 text-xs text-muted-foreground hover:text-foreground">{t('upd.later')}</button>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
{!updating && (
|
{!updating && (
|
||||||
<button onClick={() => setUpdateInfo(null)} className="text-muted-foreground hover:text-foreground shrink-0" title="Dismiss">
|
<button onClick={() => snoozeUpdate(1)} className="text-muted-foreground hover:text-foreground shrink-0" title={t('upd.dismissHour')}>
|
||||||
<X className="size-4" />
|
<X className="size-4" />
|
||||||
</button>
|
</button>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { useEffect, useRef, useState } from 'react';
|
import { useCallback, useEffect, useRef, useState } from 'react';
|
||||||
import L from 'leaflet';
|
import L from 'leaflet';
|
||||||
import 'leaflet/dist/leaflet.css';
|
import 'leaflet/dist/leaflet.css';
|
||||||
import { gridToLatLon, greatCirclePoints, splitAtAntimeridian } from '@/lib/maidenhead';
|
import { gridToLatLon, greatCirclePoints, splitAtAntimeridian } from '@/lib/maidenhead';
|
||||||
@@ -7,6 +7,9 @@ import { cn } from '@/lib/utils';
|
|||||||
import { useI18n } from '@/lib/i18n';
|
import { useI18n } from '@/lib/i18n';
|
||||||
import { loadMapView, saveMapView, MAP_VIEW_FT } from '@/lib/mapView';
|
import { loadMapView, saveMapView, MAP_VIEW_FT } from '@/lib/mapView';
|
||||||
import { loadMapBase, saveMapBase, MAP_BASE_FT } from '@/lib/mapBase';
|
import { loadMapBase, saveMapBase, MAP_BASE_FT } from '@/lib/mapBase';
|
||||||
|
import { writeUiPref } from '@/lib/uiPref';
|
||||||
|
import { GetHearMe, SetHearMe, GetWhoHearsMe } from '../../wailsjs/go/main/App';
|
||||||
|
import { Ear } from 'lucide-react';
|
||||||
|
|
||||||
// FT Map — the live decode feed as geography: every station decoded in the
|
// FT Map — the live decode feed as geography: every station decoded in the
|
||||||
// last half hour, an arc from the operator's own square to theirs, coloured by
|
// last half hour, an arc from the operator's own square to theirs, coloured by
|
||||||
@@ -41,6 +44,52 @@ const BAND_COLOURS: Record<string, string> = {
|
|||||||
};
|
};
|
||||||
const bandColour = (b?: string) => BAND_COLOURS[(b ?? '').toLowerCase()] || '#9ca3af';
|
const bandColour = (b?: string) => BAND_COLOURS[(b ?? '').toLowerCase()] || '#9ca3af';
|
||||||
|
|
||||||
|
// One colour for every arc, overriding the palette. Empty means per band,
|
||||||
|
// which stays the default.
|
||||||
|
//
|
||||||
|
// The palette is only useful to somebody watching several bands at once, and
|
||||||
|
// it is calibrated against a plain map: 60m navy and 70cm olive all but
|
||||||
|
// disappear over the satellite imagery, and 20m yellow over the deserts. An
|
||||||
|
// operator on one band has nothing to lose by painting the whole map in a
|
||||||
|
// colour that shows up against the ground he chose.
|
||||||
|
const COL_KEY = 'opslog.ftMapColour';
|
||||||
|
|
||||||
|
// The reverse layer's own colour. Empty means the default below.
|
||||||
|
//
|
||||||
|
// Separate from COL_KEY on purpose: the decode colour exists because the
|
||||||
|
// band palette vanishes over some basemaps, and this one has exactly the
|
||||||
|
// same problem for exactly the same reason — cyan over a pale sea reads no
|
||||||
|
// better than 60m navy does. One control for both would have forced the
|
||||||
|
// two layers into one colour, which is the distinction it took a shape to
|
||||||
|
// make in the first place.
|
||||||
|
const HEARD_COL_KEY = 'opslog.ftMapHeardColour';
|
||||||
|
|
||||||
|
// A colour input only accepts #rrggbb, so anything else stored here is
|
||||||
|
// treated as no choice at all rather than driving the swatch to black.
|
||||||
|
const asHex = (v: string) => (/^#[0-9a-f]{6}$/i.test(v.trim()) ? v.trim() : '');
|
||||||
|
|
||||||
|
// One station reporting our own transmissions, from PSK Reporter.
|
||||||
|
type Heard = { call: string; grid: string; band: string; mode: string; snr: number; at: string };
|
||||||
|
|
||||||
|
// The reverse layer is marks only, in one colour whatever the band, and the
|
||||||
|
// mark is a DIAMOND.
|
||||||
|
//
|
||||||
|
// It started with an arc per station, like the decodes, and that was wrong:
|
||||||
|
// with a few dozen receivers reporting, the map became a fan of lines out of
|
||||||
|
// one square that buried the very arcs it sat beside. Nothing was gained by
|
||||||
|
// them either — an arc's job on the decode layer is to say WHICH of many
|
||||||
|
// stations a path belongs to, and here every path starts at the same place.
|
||||||
|
//
|
||||||
|
// Shape, then, rather than colour, carries the distinction: the decode dots
|
||||||
|
// are small filled circles, and the arcs already use fourteen colours, so a
|
||||||
|
// fifteenth would read as another band. A diamond is unmistakably not one of
|
||||||
|
// them at a glance.
|
||||||
|
//
|
||||||
|
// Filled, with a hairline white edge — the same trick the home marker uses.
|
||||||
|
// It was a ring, and a ring is an outline drawn over whatever is beneath it:
|
||||||
|
// eight pixels of it over the satellite imagery was barely there.
|
||||||
|
const HEARD_COLOUR = '#22d3ee'; // the default, when nothing is chosen
|
||||||
|
|
||||||
const MAX_ARCS = 300;
|
const MAX_ARCS = 300;
|
||||||
const MAX_AGE_MS = 30 * 60_000;
|
const MAX_AGE_MS = 30 * 60_000;
|
||||||
|
|
||||||
@@ -53,6 +102,14 @@ export function FTMapPanel({ decodes, myGrid, onSelect, onCall }: {
|
|||||||
}) {
|
}) {
|
||||||
// Held in refs so the redraw below does not have to list them as dependencies
|
// Held in refs so the redraw below does not have to list them as dependencies
|
||||||
// and rebuild every arc whenever the parent re-renders.
|
// and rebuild every arc whenever the parent re-renders.
|
||||||
|
const [colour, setColour] = useState(() => asHex(localStorage.getItem(COL_KEY) ?? ''));
|
||||||
|
const [heardColour, setHeardColour] = useState(() => asHex(localStorage.getItem(HEARD_COL_KEY) ?? ''));
|
||||||
|
const heardInk = heardColour || HEARD_COLOUR;
|
||||||
|
// Whether the reverse feed is wanted lives in the DB, not here: it is what
|
||||||
|
// starts an MQTT subscription, so the backend has to be the one that knows.
|
||||||
|
const [hearMe, setHearMe] = useState(false);
|
||||||
|
const [heard, setHeard] = useState<Heard[]>([]);
|
||||||
|
const [heardBusy, setHeardBusy] = useState(false);
|
||||||
const selectRef = useRef(onSelect);
|
const selectRef = useRef(onSelect);
|
||||||
const callRef = useRef(onCall);
|
const callRef = useRef(onCall);
|
||||||
useEffect(() => { selectRef.current = onSelect; callRef.current = onCall; }, [onSelect, onCall]);
|
useEffect(() => { selectRef.current = onSelect; callRef.current = onCall; }, [onSelect, onCall]);
|
||||||
@@ -68,6 +125,10 @@ export function FTMapPanel({ decodes, myGrid, onSelect, onCall }: {
|
|||||||
const divRef = useRef<HTMLDivElement>(null);
|
const divRef = useRef<HTMLDivElement>(null);
|
||||||
const mapRef = useRef<L.Map | null>(null);
|
const mapRef = useRef<L.Map | null>(null);
|
||||||
const layerRef = useRef<L.LayerGroup | null>(null);
|
const layerRef = useRef<L.LayerGroup | null>(null);
|
||||||
|
// Its own group: the reverse layer refreshes on its own clock, and clearing
|
||||||
|
// the decode arcs to redraw it would throw away three hundred polylines
|
||||||
|
// every twenty seconds for nothing.
|
||||||
|
const heardLayerRef = useRef<L.LayerGroup | null>(null);
|
||||||
const baseRef = useRef<L.TileLayer | null>(null);
|
const baseRef = useRef<L.TileLayer | null>(null);
|
||||||
const labelsRef = useRef<L.TileLayer | null>(null);
|
const labelsRef = useRef<L.TileLayer | null>(null);
|
||||||
const [basemap, setBasemap] = useState<BasemapKey>(() =>
|
const [basemap, setBasemap] = useState<BasemapKey>(() =>
|
||||||
@@ -95,6 +156,7 @@ export function FTMapPanel({ decodes, myGrid, onSelect, onCall }: {
|
|||||||
});
|
});
|
||||||
mapRef.current = m;
|
mapRef.current = m;
|
||||||
layerRef.current = L.layerGroup().addTo(m);
|
layerRef.current = L.layerGroup().addTo(m);
|
||||||
|
heardLayerRef.current = L.layerGroup().addTo(m);
|
||||||
// Leaflet measures its container ONCE, when the map is created, and then
|
// Leaflet measures its container ONCE, when the map is created, and then
|
||||||
// draws tiles for that size for ever. This panel is mounted the moment its
|
// draws tiles for that size for ever. This panel is mounted the moment its
|
||||||
// tab is selected — before the flex layout has settled — and the window can
|
// tab is selected — before the flex layout has settled — and the window can
|
||||||
@@ -113,6 +175,7 @@ export function FTMapPanel({ decodes, myGrid, onSelect, onCall }: {
|
|||||||
m.remove();
|
m.remove();
|
||||||
mapRef.current = null;
|
mapRef.current = null;
|
||||||
layerRef.current = null;
|
layerRef.current = null;
|
||||||
|
heardLayerRef.current = null;
|
||||||
};
|
};
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
@@ -132,6 +195,34 @@ export function FTMapPanel({ decodes, myGrid, onSelect, onCall }: {
|
|||||||
saveMapBase(MAP_BASE_FT, basemap);
|
saveMapBase(MAP_BASE_FT, basemap);
|
||||||
}, [basemap]);
|
}, [basemap]);
|
||||||
|
|
||||||
|
useEffect(() => { GetHearMe().then((v) => setHearMe(!!v)).catch(() => {}); }, []);
|
||||||
|
|
||||||
|
// Polled rather than pushed: the reports arrive from the broker in batches
|
||||||
|
// whenever an uploader gets round to it, and a fifteen-minute window redrawn
|
||||||
|
// every twenty seconds is as live as the data underneath it actually is.
|
||||||
|
const loadHeard = useCallback(() => {
|
||||||
|
GetWhoHearsMe().then((r: any) => setHeard((Array.isArray(r) ? r : []) as Heard[])).catch(() => {});
|
||||||
|
}, []);
|
||||||
|
useEffect(() => {
|
||||||
|
if (!hearMe) { setHeard([]); return; }
|
||||||
|
loadHeard();
|
||||||
|
const id = window.setInterval(loadHeard, 20_000);
|
||||||
|
return () => window.clearInterval(id);
|
||||||
|
}, [hearMe, loadHeard]);
|
||||||
|
|
||||||
|
const toggleHearMe = async () => {
|
||||||
|
setHeardBusy(true);
|
||||||
|
const next = !hearMe;
|
||||||
|
try {
|
||||||
|
await SetHearMe(next);
|
||||||
|
setHearMe(next);
|
||||||
|
} catch {
|
||||||
|
// The usual cause is no station callsign, which is what it subscribes
|
||||||
|
// to. Read the state back rather than assuming either way.
|
||||||
|
try { setHearMe(!!(await GetHearMe())); } catch { /* leave it */ }
|
||||||
|
} finally { setHeardBusy(false); }
|
||||||
|
};
|
||||||
|
|
||||||
// The arcs, redrawn when the decode list changes. Newest last so they paint
|
// The arcs, redrawn when the decode list changes. Newest last so they paint
|
||||||
// on top; opacity falls with age so the map reads as "now" with a memory.
|
// on top; opacity falls with age so the map reads as "now" with a memory.
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -156,21 +247,21 @@ export function FTMapPanel({ decodes, myGrid, onSelect, onCall }: {
|
|||||||
if (!to) continue;
|
if (!to) continue;
|
||||||
const age = now - Date.parse(d.at);
|
const age = now - Date.parse(d.at);
|
||||||
const fade = Math.max(0.15, 1 - age / MAX_AGE_MS);
|
const fade = Math.max(0.15, 1 - age / MAX_AGE_MS);
|
||||||
const colour = bandColour(d.band);
|
const stroke = colour || bandColour(d.band);
|
||||||
// Cut at the antimeridian: this map shows ONE world, so a path running
|
// Cut at the antimeridian: this map shows ONE world, so a path running
|
||||||
// past ±180 has to leave one edge and come back at the other. Without it
|
// past ±180 has to leave one edge and come back at the other. Without it
|
||||||
// every arc out of VK or ZL was drawn into the blank space off the side
|
// every arc out of VK or ZL was drawn into the blank space off the side
|
||||||
// of the map, its far end sitting alone on the opposite coast.
|
// of the map, its far end sitting alone on the opposite coast.
|
||||||
const pts = splitAtAntimeridian(greatCirclePoints(from.lat, from.lon, to.lat, to.lon, 48));
|
const pts = splitAtAntimeridian(greatCirclePoints(from.lat, from.lon, to.lat, to.lon, 48));
|
||||||
L.polyline(pts as L.LatLngExpression[][], {
|
L.polyline(pts as L.LatLngExpression[][], {
|
||||||
color: colour, weight: 1.3, opacity: 0.65 * fade, smoothFactor: 0,
|
color: stroke, weight: 1.3, opacity: 0.65 * fade, smoothFactor: 0,
|
||||||
}).addTo(layer);
|
}).addTo(layer);
|
||||||
const label = `${d.call} · ${d.grid} · ${d.snr > 0 ? '+' : ''}${d.snr} dB`;
|
const label = `${d.call} · ${d.grid} · ${d.snr > 0 ? '+' : ''}${d.snr} dB`;
|
||||||
const mk = L.circleMarker([to.lat, to.lon], {
|
const mk = L.circleMarker([to.lat, to.lon], {
|
||||||
// A three-pixel dot is a fine mark and a poor target, so the visible
|
// A three-pixel dot is a fine mark and a poor target, so the visible
|
||||||
// radius stays and an invisible one three times the size takes the
|
// radius stays and an invisible one three times the size takes the
|
||||||
// clicks.
|
// clicks.
|
||||||
radius: 3, color: colour, weight: 1, fillColor: colour, fillOpacity: 0.9 * fade,
|
radius: 3, color: stroke, weight: 1, fillColor: stroke, fillOpacity: 0.9 * fade,
|
||||||
}).bindTooltip(label, { direction: 'top' }).addTo(layer);
|
}).bindTooltip(label, { direction: 'top' }).addTo(layer);
|
||||||
// The tooltip goes on the HIT circle too, and it is the one that matters:
|
// The tooltip goes on the HIT circle too, and it is the one that matters:
|
||||||
// being on top, it takes the hover as well as the click, and binding it
|
// being on top, it takes the hover as well as the click, and binding it
|
||||||
@@ -196,7 +287,45 @@ export function FTMapPanel({ decodes, myGrid, onSelect, onCall }: {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}, [decodes, myGrid]);
|
}, [decodes, myGrid, colour]);
|
||||||
|
|
||||||
|
// The reverse layer: one mark where each station that reported us sits, and
|
||||||
|
// no line to it.
|
||||||
|
//
|
||||||
|
// A divIcon rather than a canvas circle, because canvas draws circles and
|
||||||
|
// nothing else, and the whole point is a shape that is not a circle. The
|
||||||
|
// cost is DOM nodes, which is affordable HERE and would not be on the decode
|
||||||
|
// layer: this is a few dozen receivers against three hundred arcs.
|
||||||
|
useEffect(() => {
|
||||||
|
const layer = heardLayerRef.current;
|
||||||
|
if (!layer) return;
|
||||||
|
layer.clearLayers();
|
||||||
|
if (!hearMe) return;
|
||||||
|
const now = Date.now();
|
||||||
|
for (const h of heard) {
|
||||||
|
const to = gridToLatLon(h.grid);
|
||||||
|
if (!to) continue;
|
||||||
|
const ageMs = Math.max(0, now - Date.parse(h.at));
|
||||||
|
const ageMin = Math.round(ageMs / 60_000);
|
||||||
|
// Faded with age over the window, as the decode arcs are: the freshest
|
||||||
|
// report is the one that says a path is open NOW.
|
||||||
|
const fade = Math.max(0.3, 1 - ageMs / (15 * 60_000));
|
||||||
|
const label = `${h.call} · ${h.grid} · ${h.snr > 0 ? '+' : ''}${h.snr} dB · ${h.band}${ageMin > 0 ? ` · ${ageMin}'` : ''}`;
|
||||||
|
// The box is bigger than the diamond so there is something to point at:
|
||||||
|
// a nine-pixel mark is a fine sight and a poor target.
|
||||||
|
const icon = L.divIcon({
|
||||||
|
className: '',
|
||||||
|
iconSize: [16, 16],
|
||||||
|
iconAnchor: [8, 8],
|
||||||
|
html: `<div style="width:16px;height:16px;display:flex;align-items:center;justify-content:center">`
|
||||||
|
+ `<div style="width:9px;height:9px;transform:rotate(45deg);background:${heardInk};`
|
||||||
|
+ `box-shadow:0 0 0 1px rgba(255,255,255,.75);opacity:${fade.toFixed(2)}"></div></div>`,
|
||||||
|
});
|
||||||
|
L.marker([to.lat, to.lon], { icon, interactive: true, keyboard: false })
|
||||||
|
.bindTooltip(label, { direction: 'top' })
|
||||||
|
.addTo(layer);
|
||||||
|
}
|
||||||
|
}, [heard, hearMe, heardInk]);
|
||||||
|
|
||||||
const bands = [...new Set(decodes.map((d) => (d.band ?? '').toLowerCase()).filter(Boolean))];
|
const bands = [...new Set(decodes.map((d) => (d.band ?? '').toLowerCase()).filter(Boolean))];
|
||||||
return (
|
return (
|
||||||
@@ -205,8 +334,11 @@ export function FTMapPanel({ decodes, myGrid, onSelect, onCall }: {
|
|||||||
// keeps all of it inside this panel.
|
// keeps all of it inside this panel.
|
||||||
<div className="relative isolate z-0 h-full w-full min-h-0">
|
<div className="relative isolate z-0 h-full w-full min-h-0">
|
||||||
<div ref={divRef} className="absolute inset-0 rounded-lg overflow-hidden" />
|
<div ref={divRef} className="absolute inset-0 rounded-lg overflow-hidden" />
|
||||||
{/* Basemap picker, MainMap's own vocabulary. */}
|
{/* Basemap picker, MainMap's own vocabulary.
|
||||||
<div className="absolute top-2 left-12 z-[1000] flex gap-1 rounded-md bg-background/85 backdrop-blur px-1 py-1 border border-border">
|
left-16, not left-12: Leaflet's zoom control is 30 px of buttons plus
|
||||||
|
its 10 px margin and a border, and at 48 px this row started on top
|
||||||
|
of it — the − button took the click that was meant for Street. */}
|
||||||
|
<div className="absolute top-2 left-16 z-[1000] flex gap-1 rounded-md bg-background/85 backdrop-blur px-1 py-1 border border-border">
|
||||||
{(Object.keys(BASEMAPS) as BasemapKey[]).map((k) => (
|
{(Object.keys(BASEMAPS) as BasemapKey[]).map((k) => (
|
||||||
<button key={k} type="button" onClick={() => setBasemap(k)}
|
<button key={k} type="button" onClick={() => setBasemap(k)}
|
||||||
className={cn('px-2 py-0.5 rounded text-[11px]',
|
className={cn('px-2 py-0.5 rounded text-[11px]',
|
||||||
@@ -215,12 +347,71 @@ export function FTMapPanel({ decodes, myGrid, onSelect, onCall }: {
|
|||||||
</button>
|
</button>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
{/* Band legend — only the bands actually on screen. */}
|
{/* The two things that are not the basemap, on the OTHER side.
|
||||||
|
|
||||||
|
They sat in the same row, which grew until it reached the middle of
|
||||||
|
the map — and a control bar spanning half the width of a world map is
|
||||||
|
covering the Atlantic to save a corner that was empty the whole time.
|
||||||
|
Leaflet puts nothing top-right but the attribution, which is at the
|
||||||
|
bottom. */}
|
||||||
|
<div className="absolute top-2 right-2 z-[1000] flex gap-1 rounded-md bg-background/85 backdrop-blur px-1 py-1 border border-border">
|
||||||
|
{/* Opens on the crimson the home marker already uses — chosen to hold
|
||||||
|
up on every basemap, which is a better first suggestion than
|
||||||
|
whichever band colour happens to be first in the palette. */}
|
||||||
|
<input type="color" title={t('ftmap.colour')}
|
||||||
|
className="size-5 self-center rounded border border-border bg-transparent p-0 cursor-pointer"
|
||||||
|
value={colour || '#e11d48'}
|
||||||
|
onChange={(e) => { const v = asHex(e.target.value); setColour(v); writeUiPref(COL_KEY, v); }} />
|
||||||
|
{!!colour && (
|
||||||
|
<button type="button" title={t('ftmap.colourPerBand')}
|
||||||
|
onClick={() => { setColour(''); writeUiPref(COL_KEY, ''); }}
|
||||||
|
className="px-1 text-[11px] text-muted-foreground hover:text-foreground">↺</button>
|
||||||
|
)}
|
||||||
|
<span className="mx-0.5 w-px self-stretch bg-border" />
|
||||||
|
{/* The reverse layer. A switch, not a filter: it starts a subscription
|
||||||
|
at the broker, so it is off until asked for. */}
|
||||||
|
<button type="button" onClick={toggleHearMe} disabled={heardBusy}
|
||||||
|
title={t('ftmap.hearMeTip')}
|
||||||
|
className={cn('flex items-center gap-1 px-1.5 h-6 rounded text-[11px] disabled:opacity-50',
|
||||||
|
hearMe ? 'font-semibold' : 'text-muted-foreground hover:bg-muted')}
|
||||||
|
style={hearMe ? { color: heardInk } : undefined}>
|
||||||
|
<Ear className="size-3" />
|
||||||
|
{t('ftmap.hearMe')}
|
||||||
|
{hearMe && <span className="tabular-nums opacity-80">{heard.length}</span>}
|
||||||
|
</button>
|
||||||
|
{hearMe && (
|
||||||
|
<input type="color" title={t('ftmap.heardColour')}
|
||||||
|
className="size-5 self-center rounded border border-border bg-transparent p-0 cursor-pointer"
|
||||||
|
value={heardInk}
|
||||||
|
onChange={(e) => { const v = asHex(e.target.value); setHeardColour(v); writeUiPref(HEARD_COL_KEY, v); }} />
|
||||||
|
)}
|
||||||
|
{hearMe && !!heardColour && (
|
||||||
|
<button type="button" title={t('ftmap.heardColourReset')}
|
||||||
|
onClick={() => { setHeardColour(''); writeUiPref(HEARD_COL_KEY, ''); }}
|
||||||
|
className="px-1 text-[11px] text-muted-foreground hover:text-foreground">↺</button>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
{/* What the diamonds are. In the legend rather than a tooltip because
|
||||||
|
they are the only thing on the map that is not a decode of ours, and
|
||||||
|
an unexplained second mark is worse than none.
|
||||||
|
|
||||||
|
Bottom-right, where the band legend is not: the two would otherwise
|
||||||
|
stack into one block and read as one key. */}
|
||||||
|
{hearMe && heard.length > 0 && (
|
||||||
|
<div className="absolute bottom-2 right-2 z-[1000] flex items-center gap-1.5 rounded-md bg-background/85 backdrop-blur px-2 py-1.5 border border-border text-[11px]">
|
||||||
|
<span className="inline-block size-2 rotate-45" style={{ background: heardInk }} />
|
||||||
|
{t('ftmap.hearMeLegend', { n: heard.length })}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
{/* Band legend — only the bands actually on screen. With one colour
|
||||||
|
forced it keeps the band NAMES and drops the swatches: which bands
|
||||||
|
are up is still worth knowing, a colour key that no longer maps to
|
||||||
|
anything is not. */}
|
||||||
{bands.length > 0 && (
|
{bands.length > 0 && (
|
||||||
<div className="absolute bottom-2 left-2 z-[1000] flex flex-wrap gap-x-2.5 gap-y-1 rounded-md bg-background/85 backdrop-blur px-2 py-1.5 border border-border">
|
<div className="absolute bottom-2 left-2 z-[1000] flex flex-wrap gap-x-2.5 gap-y-1 rounded-md bg-background/85 backdrop-blur px-2 py-1.5 border border-border">
|
||||||
{bands.map((b) => (
|
{bands.map((b) => (
|
||||||
<span key={b} className="flex items-center gap-1 text-[11px] text-foreground">
|
<span key={b} className="flex items-center gap-1 text-[11px] text-foreground">
|
||||||
<span className="inline-block w-3 h-[3px] rounded" style={{ background: bandColour(b) }} />
|
{!colour && <span className="inline-block w-3 h-[3px] rounded" style={{ background: bandColour(b) }} />}
|
||||||
{b.toUpperCase()}
|
{b.toUpperCase()}
|
||||||
</span>
|
</span>
|
||||||
))}
|
))}
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import { useEffect, useMemo, useRef, useState } from 'react';
|
|||||||
import L from 'leaflet';
|
import L from 'leaflet';
|
||||||
import 'leaflet/dist/leaflet.css';
|
import 'leaflet/dist/leaflet.css';
|
||||||
import { Loader2, RefreshCw } from 'lucide-react';
|
import { Loader2, RefreshCw } from 'lucide-react';
|
||||||
import { GridSquares } from '../../wailsjs/go/main/App';
|
import { GridSquares, GridSquareChoices, GetListsSettings } from '../../wailsjs/go/main/App';
|
||||||
import { gridSquareBounds, gridToLatLon } from '@/lib/maidenhead';
|
import { gridSquareBounds, gridToLatLon } from '@/lib/maidenhead';
|
||||||
import { useI18n } from '@/lib/i18n';
|
import { useI18n } from '@/lib/i18n';
|
||||||
import { cn } from '@/lib/utils';
|
import { cn } from '@/lib/utils';
|
||||||
@@ -47,20 +47,27 @@ function cssColour(token: string, fallback: string): string {
|
|||||||
} catch { return fallback; }
|
} catch { return fallback; }
|
||||||
}
|
}
|
||||||
|
|
||||||
// Mode scope. The names come straight from the backend's own classes ("ALL",
|
// Mode scope. The four broad classes the rest of the app uses, as buttons —
|
||||||
// "PHONE", "CW", "DIGI") plus FTX, which is narrower than digital and usually
|
// and then any single mode the log actually holds, from the dropdown beside
|
||||||
// the honest one beside an FTx panel — a square worked on RTTY in a contest is
|
// them.
|
||||||
// not a square worked on FT8.
|
//
|
||||||
|
// There used to be an FTx button here, lumping FT8, FT4 and FT2 together. It
|
||||||
|
// was the wrong grain in both directions: "digital" already put a contest RTTY
|
||||||
|
// square beside an FT8 one, and FTx then put FT8 beside FT4, when the question
|
||||||
|
// this map answers is where ONE mode has been heard. The specific modes are
|
||||||
|
// read from the log rather than listed here, so FT2 is offered to an operator
|
||||||
|
// already using it and needs no change here the day it becomes registered.
|
||||||
const SCOPES = [
|
const SCOPES = [
|
||||||
{ key: 'ALL', label: 'gsm.all' },
|
{ key: 'ALL', label: 'gsm.all' },
|
||||||
{ key: 'PHONE', label: 'gsm.phone' },
|
{ key: 'PHONE', label: 'gsm.phone' },
|
||||||
{ key: 'CW', label: 'gsm.cw' },
|
{ key: 'CW', label: 'gsm.cw' },
|
||||||
{ key: 'DIGI', label: 'gsm.digital' },
|
{ key: 'DIGI', label: 'gsm.digital' },
|
||||||
{ key: 'FTX', label: 'gsm.ftx' },
|
|
||||||
] as const;
|
] as const;
|
||||||
type ScopeKey = typeof SCOPES[number]['key'];
|
type ScopeKey = string;
|
||||||
|
|
||||||
const SCOPE_KEY = 'opslog.gridMapScope';
|
const SCOPE_KEY = 'opslog.gridMapScope';
|
||||||
|
const BAND_KEY = 'opslog.gridMapBand';
|
||||||
|
const SAT_KEY = 'opslog.gridMapSat';
|
||||||
// Chosen fill colours. Empty means "follow the theme", which is the default and
|
// Chosen fill colours. Empty means "follow the theme", which is the default and
|
||||||
// stays the default: the tokens already track the four themes, and freezing a
|
// stays the default: the tokens already track the four themes, and freezing a
|
||||||
// hex at first run would leave a dark-theme map painted in the light palette.
|
// hex at first run would leave a dark-theme map painted in the light palette.
|
||||||
@@ -83,9 +90,22 @@ export function GridSquareMap({ myGrid, className }: { myGrid?: string; classNam
|
|||||||
const [squares, setSquares] = useState<Square[] | null>(null);
|
const [squares, setSquares] = useState<Square[] | null>(null);
|
||||||
const [busy, setBusy] = useState(false);
|
const [busy, setBusy] = useState(false);
|
||||||
const [err, setErr] = useState('');
|
const [err, setErr] = useState('');
|
||||||
const [scope, setScope] = useState<ScopeKey>(
|
// The stored scope is taken as given rather than checked against SCOPES: it
|
||||||
() => (SCOPES.some((s) => s.key === localStorage.getItem(SCOPE_KEY))
|
// may legitimately be a mode name now, and the backend answers a mode nothing
|
||||||
? (localStorage.getItem(SCOPE_KEY) as ScopeKey) : 'DIGI'));
|
// was worked on with no squares rather than an error.
|
||||||
|
const [scope, setScope] = useState<ScopeKey>(() => {
|
||||||
|
const v = localStorage.getItem(SCOPE_KEY) || 'DIGI';
|
||||||
|
// FTX was a button until the named modes replaced it. Left as it was, no
|
||||||
|
// control would show it selected while the map stayed filtered by it.
|
||||||
|
return v === 'FTX' ? 'DIGI' : v;
|
||||||
|
});
|
||||||
|
const [band, setBand] = useState(() => localStorage.getItem(BAND_KEY) ?? '');
|
||||||
|
const [sat, setSat] = useState(() => localStorage.getItem(SAT_KEY) ?? '');
|
||||||
|
// What the three filters can offer. The modes and satellites are the ones the
|
||||||
|
// squares were actually worked on; the bands are the station's own list too,
|
||||||
|
// so a band configured but not yet worked is still there to ask about.
|
||||||
|
const [choices, setChoices] = useState<{ modes: string[]; bands: string[]; satellites: string[] }>(
|
||||||
|
{ modes: [], bands: [], satellites: [] });
|
||||||
|
|
||||||
// This map's own imagery. It shared the world map's key until they were
|
// This map's own imagery. It shared the world map's key until they were
|
||||||
// separated, so a choice made back then is inherited rather than reset.
|
// separated, so a choice made back then is inherited rather than reset.
|
||||||
@@ -102,17 +122,53 @@ export function GridSquareMap({ myGrid, className }: { myGrid?: string; classNam
|
|||||||
return () => obs.disconnect();
|
return () => obs.disconnect();
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
const load = async (sc: ScopeKey = scope) => {
|
const load = async (sc: ScopeKey = scope, bd: string = band, st: string = sat) => {
|
||||||
setBusy(true); setErr('');
|
setBusy(true); setErr('');
|
||||||
try {
|
try {
|
||||||
const r = (await GridSquares(sc)) as any;
|
const r = (await GridSquares(sc, bd, st)) as any;
|
||||||
setSquares((Array.isArray(r) ? r : []) as Square[]);
|
setSquares((Array.isArray(r) ? r : []) as Square[]);
|
||||||
} catch (e: any) {
|
} catch (e: any) {
|
||||||
setErr(String(e?.message ?? e));
|
setErr(String(e?.message ?? e));
|
||||||
setSquares([]);
|
setSquares([]);
|
||||||
} finally { setBusy(false); }
|
} finally { setBusy(false); }
|
||||||
};
|
};
|
||||||
useEffect(() => { void load(scope); /* eslint-disable-next-line react-hooks/exhaustive-deps */ }, [scope]);
|
useEffect(() => { void load(scope, band, sat); /* eslint-disable-next-line react-hooks/exhaustive-deps */ }, [scope, band, sat]);
|
||||||
|
|
||||||
|
// Loaded once: what the filters can offer changes only when the log does, and
|
||||||
|
// the refresh button reloads it alongside the squares.
|
||||||
|
const loadChoices = async () => {
|
||||||
|
try {
|
||||||
|
const c: any = await GridSquareChoices();
|
||||||
|
let bands: string[] = (c?.bands ?? []) as string[];
|
||||||
|
try {
|
||||||
|
const ls: any = await GetListsSettings();
|
||||||
|
const have = new Set(bands.map((b) => b.toLowerCase()));
|
||||||
|
// Union, the station's own list first: a configured band with nothing
|
||||||
|
// worked on it is still a fair question, and a band worked but never
|
||||||
|
// configured must not become unreachable.
|
||||||
|
const extra = ((ls?.bands ?? []) as string[])
|
||||||
|
.map((b) => String(b).toLowerCase())
|
||||||
|
.filter((b) => b && !have.has(b));
|
||||||
|
bands = [...extra, ...bands];
|
||||||
|
} catch { /* the log's own bands are enough */ }
|
||||||
|
setChoices({
|
||||||
|
modes: (c?.modes ?? []) as string[],
|
||||||
|
bands,
|
||||||
|
satellites: (c?.satellites ?? []) as string[],
|
||||||
|
});
|
||||||
|
} catch { /* the class buttons still work without it */ }
|
||||||
|
};
|
||||||
|
useEffect(() => { void loadChoices(); /* eslint-disable-next-line react-hooks/exhaustive-deps */ }, []);
|
||||||
|
|
||||||
|
// Only the modes NOT already a button: listing SSB and CW again would be two
|
||||||
|
// controls giving one answer.
|
||||||
|
const namedModes = useMemo(
|
||||||
|
() => choices.modes.filter((m) => !SCOPES.some((c) => c.key === m.toUpperCase())),
|
||||||
|
[choices.modes]);
|
||||||
|
const pick = (key: string, v: string, set: (v: string) => void) => {
|
||||||
|
set(v);
|
||||||
|
try { localStorage.setItem(key, v); } catch { /* quota */ }
|
||||||
|
};
|
||||||
|
|
||||||
// One-time map creation. preferCanvas: a busy digital log is a few thousand
|
// One-time map creation. preferCanvas: a busy digital log is a few thousand
|
||||||
// rectangles, and as SVG that is a few thousand DOM nodes to lay out on every
|
// rectangles, and as SVG that is a few thousand DOM nodes to lay out on every
|
||||||
@@ -244,13 +300,45 @@ export function GridSquareMap({ myGrid, className }: { myGrid?: string; classNam
|
|||||||
<div className="inline-flex rounded-md border border-border overflow-hidden">
|
<div className="inline-flex rounded-md border border-border overflow-hidden">
|
||||||
{SCOPES.map((s, i) => (
|
{SCOPES.map((s, i) => (
|
||||||
<button key={s.key} type="button"
|
<button key={s.key} type="button"
|
||||||
onClick={() => { setScope(s.key); try { localStorage.setItem(SCOPE_KEY, s.key); } catch { /* quota */ } }}
|
onClick={() => pick(SCOPE_KEY, s.key, setScope)}
|
||||||
className={cn('px-1.5 h-6 text-[11px] whitespace-nowrap', i > 0 && 'border-l border-border',
|
className={cn('px-1.5 h-6 text-[11px] whitespace-nowrap', i > 0 && 'border-l border-border',
|
||||||
scope === s.key ? 'bg-primary text-primary-foreground' : 'hover:bg-muted text-muted-foreground')}>
|
scope === s.key ? 'bg-primary text-primary-foreground' : 'hover:bg-muted text-muted-foreground')}>
|
||||||
{t(s.label)}
|
{t(s.label)}
|
||||||
</button>
|
</button>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
|
{/* One named mode, where the FTx button used to be. It shares the scope
|
||||||
|
with the buttons rather than filtering on top of them: mode is one
|
||||||
|
question, and two controls that both answer it is how a map ends up
|
||||||
|
showing PHONE ∩ FT8, which is empty. Picking a mode here therefore
|
||||||
|
un-picks the buttons, and vice versa. */}
|
||||||
|
{namedModes.length > 0 && (
|
||||||
|
<select
|
||||||
|
value={namedModes.includes(scope) ? scope : ''}
|
||||||
|
onChange={(e) => pick(SCOPE_KEY, e.target.value || 'ALL', setScope)}
|
||||||
|
title={t('gsm.oneMode')}
|
||||||
|
className="h-6 rounded border border-border bg-background px-1 text-[11px]"
|
||||||
|
>
|
||||||
|
<option value="">{t('gsm.oneMode')}</option>
|
||||||
|
{namedModes.map((m) => <option key={m} value={m}>{m}</option>)}
|
||||||
|
</select>
|
||||||
|
)}
|
||||||
|
{choices.bands.length > 0 && (
|
||||||
|
<select value={band} onChange={(e) => pick(BAND_KEY, e.target.value, setBand)}
|
||||||
|
title={t('gsm.band')} className="h-6 rounded border border-border bg-background px-1 text-[11px]">
|
||||||
|
<option value="">{t('gsm.allBands')}</option>
|
||||||
|
{choices.bands.map((b) => <option key={b} value={b}>{b}</option>)}
|
||||||
|
</select>
|
||||||
|
)}
|
||||||
|
{/* Only for a station that has worked one. A satellite dropdown on a
|
||||||
|
purely terrestrial log is a control that can only ever be empty. */}
|
||||||
|
{choices.satellites.length > 0 && (
|
||||||
|
<select value={sat} onChange={(e) => pick(SAT_KEY, e.target.value, setSat)}
|
||||||
|
title={t('gsm.satellite')} className="h-6 rounded border border-border bg-background px-1 text-[11px]">
|
||||||
|
<option value="">{t('gsm.allSats')}</option>
|
||||||
|
{choices.satellites.map((n) => <option key={n} value={n}>{n}</option>)}
|
||||||
|
</select>
|
||||||
|
)}
|
||||||
<span className="text-[11px] text-muted-foreground tabular-nums">
|
<span className="text-[11px] text-muted-foreground tabular-nums">
|
||||||
{t('gsm.count', { n: stats.total, c: stats.confirmed })}
|
{t('gsm.count', { n: stats.total, c: stats.confirmed })}
|
||||||
</span>
|
</span>
|
||||||
@@ -287,7 +375,7 @@ export function GridSquareMap({ myGrid, className }: { myGrid?: string; classNam
|
|||||||
className="text-[11px] text-muted-foreground hover:text-foreground px-1">↺</button>
|
className="text-[11px] text-muted-foreground hover:text-foreground px-1">↺</button>
|
||||||
)}
|
)}
|
||||||
<span className="flex-1" />
|
<span className="flex-1" />
|
||||||
<button type="button" onClick={() => void load()} disabled={busy} title={t('gsm.refresh')}
|
<button type="button" onClick={() => { void load(); void loadChoices(); }} disabled={busy} title={t('gsm.refresh')}
|
||||||
className="inline-flex items-center justify-center size-6 rounded border border-border hover:bg-muted disabled:opacity-50">
|
className="inline-flex items-center justify-center size-6 rounded border border-border hover:bg-muted disabled:opacity-50">
|
||||||
{busy ? <Loader2 className="size-3 animate-spin" /> : <RefreshCw className="size-3" />}
|
{busy ? <Loader2 className="size-3 animate-spin" /> : <RefreshCw className="size-3" />}
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
@@ -5,10 +5,10 @@
|
|||||||
// how one of them quietly stops matching the other — a pattern button that sets
|
// how one of them quietly stops matching the other — a pattern button that sets
|
||||||
// a different direction, a band list that tunes somewhere else.
|
// a different direction, a band list that tunes somewhere else.
|
||||||
import { useCallback, useEffect, useState } from 'react';
|
import { useCallback, useEffect, useState } from 'react';
|
||||||
import { ArrowDownToLine, ChevronDown, ChevronUp, Loader2, Minus, Plus, RefreshCw, Antenna as AntennaIcon, X } from 'lucide-react';
|
import { ArrowDownToLine, ChevronDown, ChevronUp, Loader2, Minus, Plus, RefreshCw, Ruler, Antenna as AntennaIcon, X } from 'lucide-react';
|
||||||
import { cn } from '@/lib/utils';
|
import { cn } from '@/lib/utils';
|
||||||
import {
|
import {
|
||||||
SetUltrabeamDirection, UltrabeamRetract, MotorSetElement, MotorReadElements,
|
SetUltrabeamDirection, UltrabeamRetract, MotorCalibrate, MotorSetElement, MotorReadElements,
|
||||||
MotorTuneKHz, MotorNudgeKHz, SetMotorFollow,
|
MotorTuneKHz, MotorNudgeKHz, SetMotorFollow,
|
||||||
} from '../../wailsjs/go/main/App';
|
} from '../../wailsjs/go/main/App';
|
||||||
|
|
||||||
@@ -235,11 +235,29 @@ export function MotorAntennaWidget({ ant, refetch, t, onClose, essentialsOnly }:
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<button type="button" disabled={!ant.connected}
|
{/* Home, and — on a SteppIR — calibrate beside it. Two buttons on one
|
||||||
onClick={() => run(UltrabeamRetract())}
|
row rather than a second full-width one: the widget is narrow and
|
||||||
className="w-full flex items-center justify-center gap-1.5 rounded-md border border-warning-border bg-warning-muted text-warning-muted-foreground py-1 text-xs font-semibold hover:brightness-95 disabled:opacity-40">
|
already tall, and the pair reads as "the two things that move every
|
||||||
<ArrowDownToLine className="size-3.5" /> {t('station.retract')}
|
element at once", which is what they are. */}
|
||||||
</button>
|
<div className={cn('grid gap-1.5', isUB ? 'grid-cols-1' : 'grid-cols-2')}>
|
||||||
|
<button type="button" disabled={!ant.connected}
|
||||||
|
onClick={() => run(UltrabeamRetract())}
|
||||||
|
title={t('station.retractTip')}
|
||||||
|
className="w-full flex items-center justify-center gap-1.5 rounded-md border border-warning-border bg-warning-muted text-warning-muted-foreground py-1 text-xs font-semibold hover:brightness-95 disabled:opacity-40">
|
||||||
|
<ArrowDownToLine className="size-3.5" /> {t('station.retract')}
|
||||||
|
</button>
|
||||||
|
{/* Asked first, always. Calibration runs every element to its end
|
||||||
|
stop and takes minutes — it is the right answer to an antenna that
|
||||||
|
tunes wrong, and the wrong answer to a stray click mid-contest. */}
|
||||||
|
{!isUB && (
|
||||||
|
<button type="button" disabled={!ant.connected}
|
||||||
|
onClick={() => { if (window.confirm(t('station.calibrateConfirm'))) run(MotorCalibrate()); }}
|
||||||
|
title={t('station.calibrateTip')}
|
||||||
|
className="w-full flex items-center justify-center gap-1.5 rounded-md border border-border bg-muted/40 py-1 text-xs font-semibold hover:brightness-95 disabled:opacity-40">
|
||||||
|
<Ruler className="size-3.5" /> {t('station.calibrate')}
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
{isUB && !essentialsOnly && (
|
{isUB && !essentialsOnly && (
|
||||||
<div>
|
<div>
|
||||||
|
|||||||
@@ -44,16 +44,26 @@ type RotorPreset = { label: string; azimuth: number };
|
|||||||
// A rotor is slow and its readout is coarse, so "is it moving" is inferred
|
// A rotor is slow and its readout is coarse, so "is it moving" is inferred
|
||||||
// rather than reported: a heading that changes by more than a degree means it
|
// rather than reported: a heading that changes by more than a degree means it
|
||||||
// is, and it is considered stopped once the readout has been still for a while.
|
// is, and it is considered stopped once the readout has been still for a while.
|
||||||
const MOVEMENT_SETTLE_MS = 1600;
|
// Long enough to outlast the gap between two readings of a turning rotor.
|
||||||
// Four degrees, not one.
|
|
||||||
//
|
//
|
||||||
// A rotor at rest does not report a constant heading: the potentiometer and the
|
// It was 1600 ms, shorter than the time a rotor takes to move far enough to be
|
||||||
// controller's rounding walk the reading a degree or two either side, and at one
|
// noticed at all: at a degree a second, four-degree steps are four seconds
|
||||||
// degree that jitter WAS movement — Stop lit for a second and a half, went out,
|
// apart, so Stop went dark between every one of them and lit again on the
|
||||||
// and lit again, for an antenna that had not turned all evening. The reference
|
// next — a rotation crossing a pass blinked the whole way round. The window
|
||||||
// is only moved when the threshold is crossed, so a rotor genuinely turning
|
// now only has to outlast ONE degree of progress, which even a slow mast
|
||||||
// accumulates towards it however slowly it goes; noise around a value never
|
// delivers about every two seconds while the poller is running fast.
|
||||||
// gets there.
|
const MOVEMENT_SETTLE_MS = 3000;
|
||||||
|
// Four degrees: the band inside which a reading is not a step at all.
|
||||||
|
//
|
||||||
|
// A rotor at rest does not report a constant heading — the potentiometer and
|
||||||
|
// the controller's rounding walk the reading a degree or two either side. But
|
||||||
|
// the threshold is only half the answer, and on its own it was not enough: WIND
|
||||||
|
// moves a beam further than four degrees and back again, and every one of those
|
||||||
|
// excursions counted, so Stop lit and went out all evening on an antenna that
|
||||||
|
// had not turned. Raising the number only raises the wind speed it takes.
|
||||||
|
//
|
||||||
|
// What actually separates a rotation from the weather is the DIRECTION — see the
|
||||||
|
// movement effect below.
|
||||||
const MOVEMENT_TRIGGER_DEG = 4;
|
const MOVEMENT_TRIGGER_DEG = 4;
|
||||||
// How long an order is given to produce movement before the widget stops
|
// How long an order is given to produce movement before the widget stops
|
||||||
// claiming the antenna is turning — the rotor may already have been there.
|
// claiming the antenna is turning — the rotor may already have been there.
|
||||||
@@ -124,6 +134,35 @@ function unwrapRotation(nextAngle: number, previousRotation: number | null): num
|
|||||||
return previousRotation + delta;
|
return previousRotation + delta;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// useUnwrappedRotation is unwrapRotation kept across renders, for a beam whose
|
||||||
|
// angle comes from the ANTENNA rather than from the mouse.
|
||||||
|
//
|
||||||
|
// This is what was missing, and on a rotator with an overlap it is unmissable:
|
||||||
|
// a G-2800 sitting at 020° turned anticlockwise reports 020, 010, 000, 359,
|
||||||
|
// 358 … 340, and the CSS transition from 20deg to 359deg travels the long way —
|
||||||
|
// the beam whips a full turn round the dial while the antenna moves forty
|
||||||
|
// degrees the other way. Reported from the air.
|
||||||
|
//
|
||||||
|
// The angle is therefore accumulated rather than reset: 020 → 000 → −001 →
|
||||||
|
// −020, which is the way the mast is actually moving. The ref is advanced only
|
||||||
|
// when the input changes, so a re-render for any other reason cannot make the
|
||||||
|
// beam creep.
|
||||||
|
function useUnwrappedRotation(angle: number | null): number | null {
|
||||||
|
const rotation = useRef<number | null>(null);
|
||||||
|
const lastInput = useRef<number | null>(null);
|
||||||
|
if (angle == null) {
|
||||||
|
rotation.current = null;
|
||||||
|
lastInput.current = null;
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
const a = normalizeAzimuth(angle);
|
||||||
|
if (lastInput.current !== a || rotation.current == null) {
|
||||||
|
rotation.current = unwrapRotation(a, rotation.current);
|
||||||
|
lastInput.current = a;
|
||||||
|
}
|
||||||
|
return rotation.current;
|
||||||
|
}
|
||||||
|
|
||||||
// ── The dial ───────────────────────────────────────────────────────────────
|
// ── The dial ───────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
function RotorCompassDial({
|
function RotorCompassDial({
|
||||||
@@ -147,6 +186,12 @@ function RotorCompassDial({
|
|||||||
// is read by moving the eye, and this one is read while aiming.
|
// is read by moving the eye, and this one is read while aiming.
|
||||||
onHoverAzimuth?: (az: number | null) => void;
|
onHoverAzimuth?: (az: number | null) => void;
|
||||||
}) {
|
}) {
|
||||||
|
// The beams animate on an accumulated angle, so crossing north never sends
|
||||||
|
// them the long way round the dial. Both lobes of a bidirectional antenna get
|
||||||
|
// their own, because they cross north at different moments.
|
||||||
|
const antennaRotation = useUnwrappedRotation(azimuth ?? null);
|
||||||
|
const secondaryRotation = useUnwrappedRotation(secondary ?? null);
|
||||||
|
|
||||||
// Gradient and mask ids must be unique per instance: two compasses on one
|
// Gradient and mask ids must be unique per instance: two compasses on one
|
||||||
// screen (docked widget + Station Control) would otherwise share the first
|
// screen (docked widget + Station Control) would otherwise share the first
|
||||||
// one's definitions.
|
// one's definitions.
|
||||||
@@ -428,8 +473,8 @@ function RotorCompassDial({
|
|||||||
|
|
||||||
{/* The second lobe of a bidirectional antenna: the same beam, dimmed —
|
{/* The second lobe of a bidirectional antenna: the same beam, dimmed —
|
||||||
it radiates as much, and it is not where the operator aimed. */}
|
it radiates as much, and it is not where the operator aimed. */}
|
||||||
{secondary != null && renderBeam(normalizeAzimuth(secondary), 'antenna', 0.45, true)}
|
{secondaryRotation != null && renderBeam(secondaryRotation, 'antenna', 0.45, true)}
|
||||||
{azimuth != null && renderBeam(normalizeAzimuth(azimuth), 'antenna', 1, true)}
|
{antennaRotation != null && renderBeam(antennaRotation, 'antenna', 1, true)}
|
||||||
|
|
||||||
<circle cx={CENTER} cy={CENTER} r={CENTER_DOT_RADIUS} fill={COMPASS_ORANGE} pointerEvents="none" />
|
<circle cx={CENTER} cy={CENTER} r={CENTER_DOT_RADIUS} fill={COMPASS_ORANGE} pointerEvents="none" />
|
||||||
</svg>
|
</svg>
|
||||||
@@ -482,6 +527,14 @@ export function RotorCompass({
|
|||||||
const latestAzimuthRef = useRef<number | null>(displayAzimuth);
|
const latestAzimuthRef = useRef<number | null>(displayAzimuth);
|
||||||
const movementReferenceRef = useRef<number | null>(displayAzimuth);
|
const movementReferenceRef = useRef<number | null>(displayAzimuth);
|
||||||
const movementSeenRef = useRef(false);
|
const movementSeenRef = useRef(false);
|
||||||
|
// Which way the last accepted step went (+1 CW, −1 CCW, 0 none), and how many
|
||||||
|
// in a row have gone that way. Two make it a rotation; one is weather.
|
||||||
|
const movementDirRef = useRef(0);
|
||||||
|
const movementRunRef = useRef(0);
|
||||||
|
// The previous reading, whatever it was. movementReferenceRef deliberately
|
||||||
|
// holds still through sub-threshold steps so they can accumulate, which
|
||||||
|
// makes it useless for measuring progress poll to poll.
|
||||||
|
const lastRawRef = useRef<number | null>(null);
|
||||||
|
|
||||||
const rememberTarget = (value: number | null) => {
|
const rememberTarget = (value: number | null) => {
|
||||||
if (value == null) rememberedTargets.delete(rotorKey);
|
if (value == null) rememberedTargets.delete(rotorKey);
|
||||||
@@ -512,6 +565,9 @@ export function RotorCompass({
|
|||||||
setTargetFading(false);
|
setTargetFading(false);
|
||||||
setIsMoving(rememberedTarget != null);
|
setIsMoving(rememberedTarget != null);
|
||||||
movementSeenRef.current = false;
|
movementSeenRef.current = false;
|
||||||
|
movementDirRef.current = 0;
|
||||||
|
movementRunRef.current = 0;
|
||||||
|
lastRawRef.current = nextAzimuth;
|
||||||
window.clearTimeout(movementTimerRef.current);
|
window.clearTimeout(movementTimerRef.current);
|
||||||
window.clearTimeout(commandTimerRef.current);
|
window.clearTimeout(commandTimerRef.current);
|
||||||
window.clearTimeout(targetArrivalTimerRef.current);
|
window.clearTimeout(targetArrivalTimerRef.current);
|
||||||
@@ -527,23 +583,74 @@ export function RotorCompass({
|
|||||||
window.clearTimeout(targetFadeTimerRef.current);
|
window.clearTimeout(targetFadeTimerRef.current);
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
|
// Declare the antenna moving and start the clock on it stopping. Called from
|
||||||
|
// both halves of the test below, and re-arming the timer is the whole point:
|
||||||
|
// the antenna counts as stopped only once nothing has said otherwise for
|
||||||
|
// MOVEMENT_SETTLE_MS.
|
||||||
|
function armMovement() {
|
||||||
|
movementSeenRef.current = true;
|
||||||
|
setIsMoving(true);
|
||||||
|
window.clearTimeout(commandTimerRef.current);
|
||||||
|
window.clearTimeout(movementTimerRef.current);
|
||||||
|
movementTimerRef.current = window.setTimeout(() => {
|
||||||
|
setIsMoving(false);
|
||||||
|
movementSeenRef.current = false;
|
||||||
|
// Forget the direction too: the next real move starts its own run rather
|
||||||
|
// than inheriting one from a rotation that finished minutes ago.
|
||||||
|
movementDirRef.current = 0;
|
||||||
|
movementRunRef.current = 0;
|
||||||
|
}, MOVEMENT_SETTLE_MS);
|
||||||
|
}
|
||||||
|
|
||||||
// Movement is inferred from the readout itself, so a rotor turned by its own
|
// Movement is inferred from the readout itself, so a rotor turned by its own
|
||||||
// controller — or by another program — reads as moving here too.
|
// controller — or by another program — reads as moving here too.
|
||||||
|
//
|
||||||
|
// The test is the DIRECTION, not the size of the step.
|
||||||
|
//
|
||||||
|
// A threshold alone does not work, whatever it is set to. Wind pushes a beam
|
||||||
|
// off its bearing and back — 100°, 105°, 100°, 106° — and every one of those
|
||||||
|
// excursions clears a four-degree threshold, so Stop lit and went out all
|
||||||
|
// evening on an antenna that had not turned. Raising the number only raises
|
||||||
|
// the wind speed it takes.
|
||||||
|
//
|
||||||
|
// What separates the two is not amplitude but sign: a rotor under power
|
||||||
|
// advances, gust after gust reverses. So a step is only movement when the
|
||||||
|
// PREVIOUS step went the same way. Wind gives +5, −5, +5 and never two in a
|
||||||
|
// row; a rotor gives +4, +4, +4 and is announced on the second — one poll,
|
||||||
|
// about a second, on a mast that takes half a minute to cross a pass.
|
||||||
|
//
|
||||||
|
// Getting IN is strict; staying in is not, and must not be. The same four
|
||||||
|
// degrees that keep the wind out are four seconds of travel on a real rotor,
|
||||||
|
// so waiting for the next four-degree step before believing it is still
|
||||||
|
// turning left Stop dark for most of the rotation. Once movement is
|
||||||
|
// established, ANY continued progress the way it was going keeps it alive —
|
||||||
|
// one degree the same way is not weather when the mast is already under
|
||||||
|
// power, and the strict test is what guarantees that it is.
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (rawAzimuth == null) return;
|
if (rawAzimuth == null) return;
|
||||||
|
// Signed and the short way round: crossing north is a small step, not 350°.
|
||||||
|
const short = (from: number, to: number) => ((to - from + 540) % 360) - 180;
|
||||||
|
const previous = lastRawRef.current;
|
||||||
|
lastRawRef.current = rawAzimuth;
|
||||||
|
if (movementSeenRef.current && previous != null && movementDirRef.current !== 0) {
|
||||||
|
const step = short(previous, rawAzimuth);
|
||||||
|
if (step !== 0 && Math.sign(step) === movementDirRef.current) armMovement();
|
||||||
|
}
|
||||||
const reference = movementReferenceRef.current;
|
const reference = movementReferenceRef.current;
|
||||||
if (reference == null) { movementReferenceRef.current = rawAzimuth; return; }
|
if (reference == null) { movementReferenceRef.current = rawAzimuth; return; }
|
||||||
if (angularDistance(rawAzimuth, reference) >= MOVEMENT_TRIGGER_DEG) {
|
const delta = short(reference, rawAzimuth);
|
||||||
movementSeenRef.current = true;
|
if (Math.abs(delta) < MOVEMENT_TRIGGER_DEG) return; // inside the noise band
|
||||||
setIsMoving(true);
|
const sign = delta > 0 ? 1 : -1;
|
||||||
window.clearTimeout(commandTimerRef.current);
|
if (movementDirRef.current === sign) {
|
||||||
window.clearTimeout(movementTimerRef.current);
|
movementRunRef.current += 1;
|
||||||
movementTimerRef.current = window.setTimeout(() => {
|
} else {
|
||||||
setIsMoving(false);
|
movementDirRef.current = sign;
|
||||||
movementSeenRef.current = false;
|
movementRunRef.current = 1;
|
||||||
}, MOVEMENT_SETTLE_MS);
|
|
||||||
movementReferenceRef.current = rawAzimuth;
|
|
||||||
}
|
}
|
||||||
|
movementReferenceRef.current = rawAzimuth;
|
||||||
|
if (movementRunRef.current < 2) return; // one step either way is weather
|
||||||
|
|
||||||
|
armMovement();
|
||||||
}, [rawAzimuth, rotorKey]);
|
}, [rawAzimuth, rotorKey]);
|
||||||
|
|
||||||
// Arrival: confirmed over time, then faded. Every check re-reads the
|
// Arrival: confirmed over time, then faded. Every check re-reads the
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ type Tuning = {
|
|||||||
type Track = {
|
type Track = {
|
||||||
on: boolean; name: string; transponder: string; mode: string;
|
on: boolean; name: string; transponder: string; mode: string;
|
||||||
nominal_down: number; nominal_up: number; down_hz: number; up_hz: number;
|
nominal_down: number; nominal_up: number; down_hz: number; up_hz: number;
|
||||||
az: number; el: number; visible: boolean;
|
az: number; el: number; visible: boolean; range_km: number; alt_km: number;
|
||||||
radio: string; // "sat" | "downlink-only" | ""
|
radio: string; // "sat" | "downlink-only" | ""
|
||||||
error: string;
|
error: string;
|
||||||
rot_on: boolean; rot_az: number; rot_el: number; rot_live: boolean; rot_az_only: boolean;
|
rot_on: boolean; rot_az: number; rot_el: number; rot_live: boolean; rot_az_only: boolean;
|
||||||
@@ -306,6 +306,12 @@ export function SatellitePanel({ myGrid }: { myGrid: string }) {
|
|||||||
|
|
||||||
useEffect(() => { loadBirds(); loadTle(); loadPasses(); }, [loadBirds, loadTle, loadPasses]);
|
useEffect(() => { loadBirds(); loadTle(); loadPasses(); }, [loadBirds, loadTle, loadPasses]);
|
||||||
useEffect(() => EventsOn('sat:tle', () => { loadTle(); loadBirds(); loadPasses(); }), [loadTle, loadBirds, loadPasses]);
|
useEffect(() => EventsOn('sat:tle', () => { loadTle(); loadBirds(); loadPasses(); }), [loadTle, loadBirds, loadPasses]);
|
||||||
|
// Saving the satellite settings. The followed list, the lowest pass and the
|
||||||
|
// locator all change what belongs here, and this tab is normally open behind
|
||||||
|
// the settings window while they are edited. The selection repairs itself:
|
||||||
|
// a satellite that is no longer followed drops out of the dropdown, and the
|
||||||
|
// effect below moves to the first one that is.
|
||||||
|
useEffect(() => EventsOn('sat:settings', () => { loadBirds(); loadPasses(); }), [loadBirds, loadPasses]);
|
||||||
useEffect(() => { if (sel) localStorage.setItem('opslog.satSelected', sel); }, [sel]);
|
useEffect(() => { if (sel) localStorage.setItem('opslog.satSelected', sel); }, [sel]);
|
||||||
useEffect(() => { setTpIdx(0); }, [sel]);
|
useEffect(() => { setTpIdx(0); }, [sel]);
|
||||||
|
|
||||||
@@ -719,7 +725,28 @@ export function SatellitePanel({ myGrid }: { myGrid: string }) {
|
|||||||
first thing they hide to get the map full width. */}
|
first thing they hide to get the map full width. */}
|
||||||
{tracking?.on && (
|
{tracking?.on && (
|
||||||
<div className="flex items-center gap-2.5 rounded-md border border-border bg-card/60 px-2 py-0.5 text-xs tabular-nums">
|
<div className="flex items-center gap-2.5 rounded-md border border-border bg-card/60 px-2 py-0.5 text-xs tabular-nums">
|
||||||
<span className="flex items-center gap-1" title={t('sat.down')}>
|
{/* Where the bird IS, which is not where the antenna is pointing:
|
||||||
|
these three say whether the pass is worth calling on, and the
|
||||||
|
rotator group further along says whether the mast has caught up
|
||||||
|
with them. Elevation goes dim below the horizon, so a satellite
|
||||||
|
still being tracked on its way up cannot be read as workable. */}
|
||||||
|
<span className="flex items-center gap-1.5" title={`${t('sat.tipAz')} / ${t('sat.tipEl')}`}>
|
||||||
|
<Radar className="size-3 text-muted-foreground" />
|
||||||
|
<span className={cn('font-medium', !tracking.visible && 'text-muted-foreground')}>
|
||||||
|
{Math.round(tracking.az)}° / {tracking.el.toFixed(1)}°
|
||||||
|
</span>
|
||||||
|
</span>
|
||||||
|
{tracking.range_km > 0 && (
|
||||||
|
<span className="text-muted-foreground" title={t('sat.range')}>
|
||||||
|
{Math.round(tracking.range_km).toLocaleString()} km
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
{tracking.alt_km > 0 && (
|
||||||
|
<span className="text-muted-foreground" title={t('sat.altitude')}>
|
||||||
|
↑{Math.round(tracking.alt_km).toLocaleString()} km
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
<span className="flex items-center gap-1 border-l border-border pl-2.5" title={t('sat.down')}>
|
||||||
<ArrowDown className="size-3 text-muted-foreground" />
|
<ArrowDown className="size-3 text-muted-foreground" />
|
||||||
<span className="font-medium">{fmtHz(tracking.down_hz)}</span>
|
<span className="font-medium">{fmtHz(tracking.down_hz)}</span>
|
||||||
</span>
|
</span>
|
||||||
|
|||||||
@@ -1468,6 +1468,13 @@ function SatelliteElementsBlock({ autoTle, onAutoTle }: { autoTle: boolean; onAu
|
|||||||
// Following none means following every satellite that has both elements and a
|
// Following none means following every satellite that has both elements and a
|
||||||
// frequency plan, which is the sensible thing for somebody who has not chosen
|
// frequency plan, which is the sensible thing for somebody who has not chosen
|
||||||
// yet and the reason the list does not start out empty-handed.
|
// yet and the reason the list does not start out empty-handed.
|
||||||
|
// byCallsign orders satellite names the way an operator reads them: alphabetical,
|
||||||
|
// but with the number taken as a number. Plain string order files AO-123 between
|
||||||
|
// AO-1 and AO-27, which is not where anybody looks for it.
|
||||||
|
function byCallsign(a: { name?: string }, b: { name?: string }) {
|
||||||
|
return String(a?.name ?? '').localeCompare(String(b?.name ?? ''), undefined, { numeric: true, sensitivity: 'base' });
|
||||||
|
}
|
||||||
|
|
||||||
function SatelliteFollowList({ followed, onChange }: { followed: string[]; onChange: (next: string[]) => void }) {
|
function SatelliteFollowList({ followed, onChange }: { followed: string[]; onChange: (next: string[]) => void }) {
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const [all, setAll] = useState<any[]>([]);
|
const [all, setAll] = useState<any[]>([]);
|
||||||
@@ -1485,8 +1492,13 @@ function SatelliteFollowList({ followed, onChange }: { followed: string[]; onCha
|
|||||||
const needle = q.trim().toLowerCase();
|
const needle = q.trim().toLowerCase();
|
||||||
const available = all.filter((b) => !followedSet.has(String(b.name).toUpperCase())
|
const available = all.filter((b) => !followedSet.has(String(b.name).toUpperCase())
|
||||||
&& (!withPlanOnly || (b.transponders?.length ?? 0) > 0)
|
&& (!withPlanOnly || (b.transponders?.length ?? 0) > 0)
|
||||||
&& (needle === '' || String(b.name).toLowerCase().includes(needle)));
|
&& (needle === '' || String(b.name).toLowerCase().includes(needle))).sort(byCallsign);
|
||||||
const chosen = followed.map((n) => byName.get(n) ?? { name: n, has_elements: false, transponders: [] });
|
// Sorted, both columns: the left one came in the order the frequency file
|
||||||
|
// happens to be written and the right one in the order the operator clicked,
|
||||||
|
// so finding AO-91 among sixteen followed birds meant reading all sixteen.
|
||||||
|
const chosen = followed
|
||||||
|
.map((n) => byName.get(n) ?? { name: n, has_elements: false, transponders: [] })
|
||||||
|
.sort(byCallsign);
|
||||||
|
|
||||||
const label = (b: any) => {
|
const label = (b: any) => {
|
||||||
const bits: string[] = [];
|
const bits: string[] = [];
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ const en: Dict = {
|
|||||||
'live.offlineTip': 'Offline — no QSO logged in the last 5 minutes',
|
'live.offlineTip': 'Offline — no QSO logged in the last 5 minutes',
|
||||||
'live.stationsTitle': 'Stations on air', 'live.stationsEmpty': 'No station reporting yet.', 'live.stationsHide': 'Hide',
|
'live.stationsTitle': 'Stations on air', 'live.stationsEmpty': 'No station reporting yet.', 'live.stationsHide': 'Hide',
|
||||||
'upd.available': 'OpsLog v{v} available', 'upd.current': "You're on v{v}.",
|
'upd.available': 'OpsLog v{v} available', 'upd.current': "You're on v{v}.",
|
||||||
'upd.install': 'Update now', 'upd.download': 'Download', 'upd.later': 'Later',
|
'upd.install': 'Update now', 'upd.download': 'Download', 'upd.later': 'Later', 'upd.remindIn': 'Remind me in', 'upd.dismissHour': 'Hide this for an hour',
|
||||||
'upd.downloading': 'Downloading…', 'upd.installing': 'Installing…',
|
'upd.downloading': 'Downloading…', 'upd.installing': 'Installing…',
|
||||||
'upd.restartNote': 'OpsLog will restart on the new version.',
|
'upd.restartNote': 'OpsLog will restart on the new version.',
|
||||||
'upd.retry': 'Retry', 'upd.browser': 'Open page', 'upd.checking': 'Checking for updates…', 'upd.upToDate': "You're up to date",
|
'upd.retry': 'Retry', 'upd.browser': 'Open page', 'upd.checking': 'Checking for updates…', 'upd.upToDate': "You're up to date",
|
||||||
@@ -199,7 +199,7 @@ const en: Dict = {
|
|||||||
'wlc.title': 'Contest', 'wlc.pattern': 'Auto-add on', 'wlc.patternPh': 'WWA', 'wlc.patternHint': 'any spotted callsign CONTAINING this joins the watchlist as a contest entry (TM29WWA, HB9WWA, F4WWA/P)',
|
'wlc.title': 'Contest', 'wlc.pattern': 'Auto-add on', 'wlc.patternPh': 'WWA', 'wlc.patternHint': 'any spotted callsign CONTAINING this joins the watchlist as a contest entry (TM29WWA, HB9WWA, F4WWA/P)',
|
||||||
'wlc.calls': 'And these callsigns, one per line', 'wlc.callsPh': 'R7W DL0ABC', 'wlc.callsHint': 'For the entries a pattern cannot catch: a station taking part under a callsign that says nothing about the event. Named here, it joins the contest watchlist the moment it is spotted. Commas and spaces work too.',
|
'wlc.calls': 'And these callsigns, one per line', 'wlc.callsPh': 'R7W DL0ABC', 'wlc.callsHint': 'For the entries a pattern cannot catch: a station taking part under a callsign that says nothing about the event. Named here, it joins the contest watchlist the moment it is spotted. Commas and spaces work too.',
|
||||||
// FTx decodes panel (Tools -> FT decodes)
|
// FTx decodes panel (Tools -> FT decodes)
|
||||||
'ftmap.tab': 'FT Map', 'ftmap.noGrid': 'Set your station grid in Preferences to place the map.', 'dec.tab': 'FT decodes', 'dec.title': 'Decodes', 'dec.bandDrift': '{app} says {dec}, the rig is on {rig}', 'dec.bandDriftApp': 'the decoder', 'dec.bandDriftTip': 'The decoding application is announcing a band the radio is not on — it has most likely lost its CAT link and is repeating the last frequency it knew. Every decode below carries that band, so the NEW / NEW BAND verdicts are judged against it.', 'dec.cqOnly': 'CQ only', 'dec.sortTip': 'Sort this slot by this column. Click again to reverse it, once more for the order the decoder heard them in.',
|
'ftmap.tab': 'FT Map', 'ftmap.noGrid': 'Set your station grid in Preferences to place the map.', 'ftmap.colour': 'One colour for every decode, whatever the band', 'ftmap.colourPerBand': 'Back to the colour per band', 'ftmap.hearMe': 'Who hears me', 'ftmap.hearMeTip': 'Draw the stations reporting your own transmissions to PSK Reporter, dashed, alongside what you decode. Watches one topic — your callsign — so it costs almost nothing.', 'ftmap.hearMeLegend': 'reporting you ({n})', 'ftmap.heardColour': 'Colour for the stations reporting you', 'ftmap.heardColourReset': 'Back to the default colour', 'dec.tab': 'FT decodes', 'dec.title': 'Decodes', 'dec.bandDrift': '{app} says {dec}, the rig is on {rig}', 'dec.bandDriftApp': 'the decoder', 'dec.bandDriftTip': 'The decoding application is announcing a band the radio is not on — it has most likely lost its CAT link and is repeating the last frequency it knew. Every decode below carries that band, so the NEW / NEW BAND verdicts are judged against it.', 'dec.cqOnly': 'CQ only', 'dec.sortTip': 'Sort this slot by this column. Click again to reverse it, once more for the order the decoder heard them in.',
|
||||||
'dec.allBands': 'All bands', 'dec.allModes': 'All modes', 'toast.qsoLogged': 'QSO logged', 'dec.contsHint': 'Continents: click to keep one or several', 'dec.allConts': 'All continents',
|
'dec.allBands': 'All bands', 'dec.allModes': 'All modes', 'toast.qsoLogged': 'QSO logged', 'dec.contsHint': 'Continents: click to keep one or several', 'dec.allConts': 'All continents',
|
||||||
'dec.minSnrTitle': 'Hide anything weaker than this SNR', 'dec.searchPh': 'Call, grid or message',
|
'dec.minSnrTitle': 'Hide anything weaker than this SNR', 'dec.searchPh': 'Call, grid or message',
|
||||||
'dec.clearFilters': 'Clear', 'dec.live': 'live', 'dec.tx': 'TX',
|
'dec.clearFilters': 'Clear', 'dec.live': 'live', 'dec.tx': 'TX',
|
||||||
@@ -271,6 +271,10 @@ const en: Dict = {
|
|||||||
'station.rigOff': 'CAT is switched off', 'station.noPort': 'no port configured',
|
'station.rigOff': 'CAT is switched off', 'station.noPort': 'no port configured',
|
||||||
'station.connect': 'Connect', 'station.noVoiceMsg': 'No message recorded — Settings ▸ Audio.',
|
'station.connect': 'Connect', 'station.noVoiceMsg': 'No message recorded — Settings ▸ Audio.',
|
||||||
'station.title': 'Station Control', 'station.rotator': 'Rotator', 'station.rotateTo': 'Rotate to {az}°', 'station.rotatorNoRead': 'No heading read', 'station.bands': 'Bands', 'station.nudgeUp': 'Up {n} kHz', 'station.nudgeDown': 'Down {n} kHz', 'station.trackOn': 'Tracking on', 'station.trackOff': 'Tracking off', 'station.trackStepTip': 'Re-tune only when the rig has moved this far', 'station.trackModeTip': 'When the antenna is allowed to re-tune', 'station.trackAlways': 'Every frequency change', 'station.trackStep': 'Past a step', 'station.trackBand': 'Band change only', 'station.trackAlwaysTip': 'Follow every frequency change. Best resonance, but the motors run constantly — and on a SteppIR every move blocks transmit while the elements travel.', 'station.trackStepTipMode': 'Re-tune only once the rig has moved further than the step. Follows a QSY, ignores tuning around.', 'station.trackBandTip': 'Re-tune only when the band changes. The motors move a few times a day and are left alone within a band.', 'station.pattern': 'Pattern', 'station.bi': 'Bi', 'station.motorWidgetShow': 'Motorised antenna · click to show', 'station.motorWidgetHide': 'Motorised antenna — shown · click to hide', 'station.hideWidget': 'Hide this widget', 'station.retract': 'Retract elements', 'station.moving': 'MOVING', 'station.elements': 'Elements (mm)', 'station.read': 'Read', 'station.readLengths': 'Read current element lengths from the controller', 'station.noLengths': 'Lengths unknown — click Read to fetch them from the controller.', 'station.element': 'Element', 'station.reflector': 'Reflector', 'station.driven': 'Driven', 'station.director': 'Dir', 'station.set': 'Set', 'station.elementsHint': 'Each press lengthens/shortens the element by 2 mm (like the physical console). Verify which element responds on your antenna.', 'station.setExactLen': 'Click to type the exact current length (fixes the baseline if the auto-read is off).', 'station.atMax': 'Controller refused — the element is likely at its maximum length for this band, so it can\'t extend further.', 'station.go': 'Go', 'station.stop': 'Stop', 'station.dragHint': 'Drag the grip handle on the left of a panel to move it. Pick a column count to lay them out in a grid.', 'station.dragMove': 'Drag to move this panel', 'station.colsAuto': 'Auto', 'station.addDevice': 'Add device', 'station.editDevice': 'Edit device', 'station.empty': 'No relay boards yet. Add a WebSwitch 1216H or a KMTronic 8-relay board to control your station power and accessories.', 'station.online': 'Online', 'station.offline': 'Offline', 'station.edit': 'Edit', 'station.delete': 'Delete', 'station.relay': 'Relay', 'station.on': 'ON', 'station.off': 'OFF', 'station.type': 'Device type', 'station.name': 'Name', 'station.host': 'Host / IP', 'station.hostHint': 'LAN IP for local use. To reach the board from OUTSIDE, put a full URL here — e.g. https://relay.yourdomain.com — pointing at a reverse proxy (Nginx Proxy Manager…) that fronts the board’s HTTP port.', 'station.user': 'Username', 'station.pass': 'Password', 'station.optional': 'optional', 'station.ftdiSerial': 'FTDI serial number', 'station.detect': 'Detect', 'station.ftdiHint': 'The Denkovi board is driven via FTDI bit-bang (not the COM port). Pick its serial (e.g. DAE0006K). Needs the FTDI D2XX driver installed.', 'station.channels': 'Relays', 'station.comPort': 'COM port', 'station.noPorts': 'No ports found', 'station.usbRelayHint': 'Cheap USB-serial relay boards (CH340/LCUS) using the A0 command protocol. If yours does not switch, tell me its model / command set.', 'station.labels': 'Relay labels', 'station.cancel': 'Cancel', 'station.save': 'Save', 'station.test': 'Test connection', 'station.testOk': 'Connected — {n} relays', 'station.testFail': 'Not connected', 'station.detectNone': 'No FTDI board found — check the cable and that the D2XX driver is installed.', 'station.detectFound': '{n} board(s) detected.',
|
'station.title': 'Station Control', 'station.rotator': 'Rotator', 'station.rotateTo': 'Rotate to {az}°', 'station.rotatorNoRead': 'No heading read', 'station.bands': 'Bands', 'station.nudgeUp': 'Up {n} kHz', 'station.nudgeDown': 'Down {n} kHz', 'station.trackOn': 'Tracking on', 'station.trackOff': 'Tracking off', 'station.trackStepTip': 'Re-tune only when the rig has moved this far', 'station.trackModeTip': 'When the antenna is allowed to re-tune', 'station.trackAlways': 'Every frequency change', 'station.trackStep': 'Past a step', 'station.trackBand': 'Band change only', 'station.trackAlwaysTip': 'Follow every frequency change. Best resonance, but the motors run constantly — and on a SteppIR every move blocks transmit while the elements travel.', 'station.trackStepTipMode': 'Re-tune only once the rig has moved further than the step. Follows a QSY, ignores tuning around.', 'station.trackBandTip': 'Re-tune only when the band changes. The motors move a few times a day and are left alone within a band.', 'station.pattern': 'Pattern', 'station.bi': 'Bi', 'station.motorWidgetShow': 'Motorised antenna · click to show', 'station.motorWidgetHide': 'Motorised antenna — shown · click to hide', 'station.hideWidget': 'Hide this widget', 'station.retract': 'Retract elements', 'station.moving': 'MOVING', 'station.elements': 'Elements (mm)', 'station.read': 'Read', 'station.readLengths': 'Read current element lengths from the controller', 'station.noLengths': 'Lengths unknown — click Read to fetch them from the controller.', 'station.element': 'Element', 'station.reflector': 'Reflector', 'station.driven': 'Driven', 'station.director': 'Dir', 'station.set': 'Set', 'station.elementsHint': 'Each press lengthens/shortens the element by 2 mm (like the physical console). Verify which element responds on your antenna.', 'station.setExactLen': 'Click to type the exact current length (fixes the baseline if the auto-read is off).', 'station.atMax': 'Controller refused — the element is likely at its maximum length for this band, so it can\'t extend further.', 'station.go': 'Go', 'station.stop': 'Stop', 'station.dragHint': 'Drag the grip handle on the left of a panel to move it. Pick a column count to lay them out in a grid.', 'station.dragMove': 'Drag to move this panel', 'station.colsAuto': 'Auto', 'station.addDevice': 'Add device', 'station.editDevice': 'Edit device', 'station.empty': 'No relay boards yet. Add a WebSwitch 1216H or a KMTronic 8-relay board to control your station power and accessories.', 'station.online': 'Online', 'station.offline': 'Offline', 'station.edit': 'Edit', 'station.delete': 'Delete', 'station.relay': 'Relay', 'station.on': 'ON', 'station.off': 'OFF', 'station.type': 'Device type', 'station.name': 'Name', 'station.host': 'Host / IP', 'station.hostHint': 'LAN IP for local use. To reach the board from OUTSIDE, put a full URL here — e.g. https://relay.yourdomain.com — pointing at a reverse proxy (Nginx Proxy Manager…) that fronts the board’s HTTP port.', 'station.user': 'Username', 'station.pass': 'Password', 'station.optional': 'optional', 'station.ftdiSerial': 'FTDI serial number', 'station.detect': 'Detect', 'station.ftdiHint': 'The Denkovi board is driven via FTDI bit-bang (not the COM port). Pick its serial (e.g. DAE0006K). Needs the FTDI D2XX driver installed.', 'station.channels': 'Relays', 'station.comPort': 'COM port', 'station.noPorts': 'No ports found', 'station.usbRelayHint': 'Cheap USB-serial relay boards (CH340/LCUS) using the A0 command protocol. If yours does not switch, tell me its model / command set.', 'station.labels': 'Relay labels', 'station.cancel': 'Cancel', 'station.save': 'Save', 'station.test': 'Test connection', 'station.testOk': 'Connected — {n} relays', 'station.testFail': 'Not connected', 'station.detectNone': 'No FTDI board found — check the cable and that the D2XX driver is installed.', 'station.detectFound': '{n} board(s) detected.',
|
||||||
|
'station.retractTip': 'Home the elements into the hubs — the storage position, for a gale or a winter. The next time the antenna is tuned it comes back out on its own.',
|
||||||
|
'station.calibrate': 'Calibrate',
|
||||||
|
'station.calibrateTip': 'SteppIR: drive every element to its end stop so the controller re-learns where zero is. The cure for an antenna that tunes to the wrong length — after a power cut mid-move, after the elements were pushed by hand, after a motor slipped.',
|
||||||
|
'station.calibrateConfirm': 'Calibrate the antenna?\n\nEvery element travels its full length and this takes several minutes. Do not start it during a contest — the antenna is unusable until it finishes.',
|
||||||
'awards.followHint': 'Awards shown in the Awards tab. Leave the right side empty to show them all.', 'awards.available': 'All awards', 'awards.followed': 'Followed', 'awards.search': 'Filter…', 'awards.addAll': 'Add all', 'awards.clear': 'Clear', 'awards.allTracked': 'All awards are followed.', 'awards.noneFollowed': 'Nothing followed yet — the Awards tab shows all.',
|
'awards.followHint': 'Awards shown in the Awards tab. Leave the right side empty to show them all.', 'awards.available': 'All awards', 'awards.followed': 'Followed', 'awards.search': 'Filter…', 'awards.addAll': 'Add all', 'awards.clear': 'Clear', 'awards.allTracked': 'All awards are followed.', 'awards.noneFollowed': 'Nothing followed yet — the Awards tab shows all.',
|
||||||
'sec.awards': 'Awards', 'sec.cat': 'CAT interface', 'sec.rotator': 'Rotator', 'sec.winkeyer': 'CW Keyer',
|
'sec.awards': 'Awards', 'sec.cat': 'CAT interface', 'sec.rotator': 'Rotator', 'sec.winkeyer': 'CW Keyer',
|
||||||
'sec.antenna': 'Ultrabeam / Steppir', 'sec.antgenius': 'Antenna Genius', 'sec.tunergenius': 'Tuner Genius', 'sec.pgxl': 'Amplifier', 'sec.psu': 'Power supply',
|
'sec.antenna': 'Ultrabeam / Steppir', 'sec.antgenius': 'Antenna Genius', 'sec.tunergenius': 'Tuner Genius', 'sec.pgxl': 'Amplifier', 'sec.psu': 'Power supply',
|
||||||
@@ -388,7 +392,7 @@ const en: Dict = {
|
|||||||
'clu.slotHighlightHint': '(by callsign, whatever the entity status says)',
|
'clu.slotHighlightHint': '(by callsign, whatever the entity status says)',
|
||||||
'rq.searchPh': 'Search callsign… 4S · *4S · *4S*', 'rq.searchTip': 'A plain word matches the START of a callsign: 4S finds 4S7AB. * is any run of characters and ? is exactly one, so *4S ends with 4S, *4S* contains it anywhere, and F?BPO matches F4BPO.',
|
'rq.searchPh': 'Search callsign… 4S · *4S · *4S*', 'rq.searchTip': 'A plain word matches the START of a callsign: 4S finds 4S7AB. * is any run of characters and ? is exactly one, so *4S ends with 4S, *4S* contains it anywhere, and F?BPO matches F4BPO.',
|
||||||
'chg.mode': 'Chase', 'chg.sources': 'Confirmed by', 'chg.card': 'QSL card', 'dec.unconfTip': 'Worked but not confirmed — a QSL to chase', 'gsc.scope': 'Match a square by', 'gsc.hunt': 'Chase', 'gsc.huntNew': 'New — never worked', 'gsc.huntUnconf': 'New and unconfirmed', 'gsc.scope_band_digi': 'This band + any digital mode', 'gsc.scope_band_mode': 'This band + this exact mode', 'gsc.scope_band_ftx': 'This band + any FT mode (FT8/FT4/FT2)', 'gsc.scope_mix_digi': 'Any band + any digital mode', 'gsc.scope_mix_mode': 'Any band + this exact mode', 'gsc.scope_mix_ftx': 'Any band + any FT mode (FT8/FT4/FT2)', 'gsc.hint': 'Decides when a square stops being NEW. Narrower means more squares to chase: per band and per exact mode is the most demanding, any band and any digital mode the least. Chasing unconfirmed as well keeps a square wanted until a QSL, LoTW or eQSL confirmation arrives — it is still missing from the award until then.',
|
'chg.mode': 'Chase', 'chg.sources': 'Confirmed by', 'chg.card': 'QSL card', 'dec.unconfTip': 'Worked but not confirmed — a QSL to chase', 'gsc.scope': 'Match a square by', 'gsc.hunt': 'Chase', 'gsc.huntNew': 'New — never worked', 'gsc.huntUnconf': 'New and unconfirmed', 'gsc.scope_band_digi': 'This band + any digital mode', 'gsc.scope_band_mode': 'This band + this exact mode', 'gsc.scope_band_ftx': 'This band + any FT mode (FT8/FT4/FT2)', 'gsc.scope_mix_digi': 'Any band + any digital mode', 'gsc.scope_mix_mode': 'Any band + this exact mode', 'gsc.scope_mix_ftx': 'Any band + any FT mode (FT8/FT4/FT2)', 'gsc.hint': 'Decides when a square stops being NEW. Narrower means more squares to chase: per band and per exact mode is the most demanding, any band and any digital mode the least. Chasing unconfirmed as well keeps a square wanted until a QSL, LoTW or eQSL confirmation arrives — it is still missing from the award until then.',
|
||||||
'gsm.basemap': 'Basemap', 'gsm.title': 'Grid squares', 'gsm.all': 'All', 'gsm.phone': 'Phone', 'gsm.cw': 'CW', 'gsm.digital': 'Digital', 'gsm.ftx': 'FTx', 'gsm.confirmed': 'confirmed', 'gsm.worked': 'worked', 'gsm.colConfirmed': 'Colour for confirmed squares', 'gsm.colWorked': 'Colour for worked (unconfirmed) squares', 'gsm.colReset': 'Back to the theme colours', 'gsm.refresh': 'Recount from the log', 'gsm.count': '{n} squares · {c} confirmed',
|
'gsm.basemap': 'Basemap', 'gsm.title': 'Grid squares', 'gsm.all': 'All', 'gsm.phone': 'Phone', 'gsm.cw': 'CW', 'gsm.digital': 'Digital', 'gsm.ftx': 'FTx', 'gsm.confirmed': 'confirmed', 'gsm.worked': 'worked', 'gsm.colConfirmed': 'Colour for confirmed squares', 'gsm.colWorked': 'Colour for worked (unconfirmed) squares', 'gsm.colReset': 'Back to the theme colours', 'gsm.refresh': 'Recount from the log', 'gsm.count': '{n} squares · {c} confirmed', 'gsm.oneMode': 'One mode', 'gsm.band': 'Band', 'gsm.allBands': 'All bands', 'gsm.satellite': 'Satellite', 'gsm.allSats': 'All satellites',
|
||||||
'bo.nearKm': 'Count receivers within', 'bo.nearKmHint': 'A report proves YOUR path only if it was collected near you. Smaller is more local but leaves fewer receivers listening — too small and the watch has nothing to look at. 300 km borrows a whole region and 100 km suits 2 m, where a duct is narrow; where stations are far apart — VK, ZL, much of North America — 1000 to 2000 km may be what it takes to find any receivers at all.',
|
'bo.nearKm': 'Count receivers within', 'bo.nearKmHint': 'A report proves YOUR path only if it was collected near you. Smaller is more local but leaves fewer receivers listening — too small and the watch has nothing to look at. 300 km borrows a whole region and 100 km suits 2 m, where a duct is narrow; where stations are far apart — VK, ZL, much of North America — 1000 to 2000 km may be what it takes to find any receivers at all.',
|
||||||
'bo.open': 'open', 'bo.liveTip': '{band} is open — {n} stations, ~{km} km, {sector}{season}. Click for the band map.', 'bo.enable': 'Watch for band openings', 'bo.enableHint': '(10, 12, 6, 4 and 2 m. Switching this on adds the two RBN nodes and subscribes to the PSK Reporter feed — the detection needs far more ears than a cluster can give it.)', 'bo.feedUp': 'PSK Reporter feed up — {n} decodes seen', 'bo.feedDown': 'PSK Reporter feed down — needs your station grid, and a moment to connect', 'clu.spotTtl': 'Spot lifetime', 'clu.spotTtlNever': 'Keep', 'clu.spotMax': 'Spots kept', 'clu.spotMaxHint': '', 'clu.spotTtlHint': 'minutes — 0 keeps them.', 'clu.pillConnect': 'Click to connect', 'clu.pillDisconnect': 'Click to disconnect', 'clu.chasePota': 'Chase POTA', 'clu.chasePotaHint': 'Off: no NEW POTA badge or filter, and the POTA column stays empty — a new-band + new-POTA spot reads NEW BAND alone.', 'clu.chaseSota': 'Chase SOTA', 'clu.chaseSotaHint': 'Off: the SOTA column stays empty.', 'clu.chaseCounty': 'Chase US counties', 'clu.chaseCountyHint': 'Off: no NEW COUNTY badge or filter in the cluster.', 'clu.chaseState': 'Chase US states', 'clu.chaseStateHint': 'Off: no NEW STATE badge or filter.', 'clu.chasePfx': 'Chase new prefixes', 'clu.chasePfxHint': 'Off: no NEW PFX badge or filter in the cluster.', 'clu.chaseGrids': 'Chase new grids', 'clu.chaseGridsHint': '(learns locators from your own WSJT-X decodes AND from PSK Reporter, and keeps them in their own database so the cluster shows them from the first second)', 'clu.chaseGridsStat': '{n} locators known — {p} waiting to be written', 'clu.workedSameSlot': 'Already worked only on the same slot',
|
'bo.open': 'open', 'bo.liveTip': '{band} is open — {n} stations, ~{km} km, {sector}{season}. Click for the band map.', 'bo.enable': 'Watch for band openings', 'bo.enableHint': '(10, 12, 6, 4 and 2 m. Switching this on adds the two RBN nodes and subscribes to the PSK Reporter feed — the detection needs far more ears than a cluster can give it.)', 'bo.feedUp': 'PSK Reporter feed up — {n} decodes seen', 'bo.feedDown': 'PSK Reporter feed down — needs your station grid, and a moment to connect', 'clu.spotTtl': 'Spot lifetime', 'clu.spotTtlNever': 'Keep', 'clu.spotMax': 'Spots kept', 'clu.spotMaxHint': '', 'clu.spotTtlHint': 'minutes — 0 keeps them.', 'clu.pillConnect': 'Click to connect', 'clu.pillDisconnect': 'Click to disconnect', 'clu.chasePota': 'Chase POTA', 'clu.chasePotaHint': 'Off: no NEW POTA badge or filter, and the POTA column stays empty — a new-band + new-POTA spot reads NEW BAND alone.', 'clu.chaseSota': 'Chase SOTA', 'clu.chaseSotaHint': 'Off: the SOTA column stays empty.', 'clu.chaseCounty': 'Chase US counties', 'clu.chaseCountyHint': 'Off: no NEW COUNTY badge or filter in the cluster.', 'clu.chaseState': 'Chase US states', 'clu.chaseStateHint': 'Off: no NEW STATE badge or filter.', 'clu.chasePfx': 'Chase new prefixes', 'clu.chasePfxHint': 'Off: no NEW PFX badge or filter in the cluster.', 'clu.chaseGrids': 'Chase new grids', 'clu.chaseGridsHint': '(learns locators from your own WSJT-X decodes AND from PSK Reporter, and keeps them in their own database so the cluster shows them from the first second)', 'clu.chaseGridsStat': '{n} locators known — {p} waiting to be written', 'clu.workedSameSlot': 'Already worked only on the same slot',
|
||||||
'clu.macros': 'Command buttons', 'clu.macrosHint': 'A named button beside the cluster command box. Leave the command empty and the button is not shown.',
|
'clu.macros': 'Command buttons', 'clu.macrosHint': 'A named button beside the cluster command box. Leave the command empty and the button is not shown.',
|
||||||
@@ -836,7 +840,7 @@ const fr: Dict = {
|
|||||||
'wlc.title': 'Contest', 'wlc.pattern': 'Ajout auto sur', 'wlc.patternPh': 'WWA', 'wlc.patternHint': 'tout indicatif spotté CONTENANT ceci rejoint la watchlist comme entrée contest (TM29WWA, HB9WWA, F4WWA/P)',
|
'wlc.title': 'Contest', 'wlc.pattern': 'Ajout auto sur', 'wlc.patternPh': 'WWA', 'wlc.patternHint': 'tout indicatif spotté CONTENANT ceci rejoint la watchlist comme entrée contest (TM29WWA, HB9WWA, F4WWA/P)',
|
||||||
'wlc.calls': 'Et ces indicatifs, un par ligne', 'wlc.callsPh': 'R7W DL0ABC', 'wlc.callsHint': 'Pour les participants qu’aucun motif ne peut attraper : une station engagée sous un indicatif qui ne dit rien de l’événement. Nommée ici, elle rejoint la watchlist contest dès qu’elle est spottée. Les virgules et les espaces marchent aussi.',
|
'wlc.calls': 'Et ces indicatifs, un par ligne', 'wlc.callsPh': 'R7W DL0ABC', 'wlc.callsHint': 'Pour les participants qu’aucun motif ne peut attraper : une station engagée sous un indicatif qui ne dit rien de l’événement. Nommée ici, elle rejoint la watchlist contest dès qu’elle est spottée. Les virgules et les espaces marchent aussi.',
|
||||||
// Panneau des decodes FTx (Outils -> Decodes FT)
|
// Panneau des decodes FTx (Outils -> Decodes FT)
|
||||||
'ftmap.tab': 'FT Map', 'ftmap.noGrid': 'Renseigne ton locator dans les Préférences pour placer la carte.', 'dec.tab': 'Decodes FT', 'dec.title': 'Decodes', 'dec.bandDrift': '{app} annonce {dec}, le poste est sur {rig}', 'dec.bandDriftApp': 'le décodeur', 'dec.bandDriftTip': 'Le logiciel de décodage annonce une bande sur laquelle la radio n’est pas — il a très probablement perdu sa liaison CAT et répète la dernière fréquence connue. Tous les décodages ci-dessous portent cette bande, et les verdicts NOUVEAU / NOUVELLE BANDE sont jugés dessus.', 'dec.cqOnly': 'CQ seulement', 'dec.sortTip': 'Trier ce créneau sur cette colonne. Un second clic inverse, un troisième rend l’ordre dans lequel le décodeur les a entendus.',
|
'ftmap.tab': 'FT Map', 'ftmap.noGrid': 'Renseigne ton locator dans les Préférences pour placer la carte.', 'ftmap.colour': 'Une seule couleur pour tous les décodages, quelle que soit la bande', 'ftmap.colourPerBand': 'Revenir à la couleur par bande', 'ftmap.hearMe': 'Qui m’entend', 'ftmap.hearMeTip': 'Trace en pointillés les stations qui rapportent vos émissions à PSK Reporter, à côté de ce que vous décodez. Un seul topic surveillé — votre indicatif — donc un coût quasi nul.', 'ftmap.hearMeLegend': 'vous rapportent ({n})', 'ftmap.heardColour': 'Couleur des stations qui vous rapportent', 'ftmap.heardColourReset': 'Revenir à la couleur par défaut', 'dec.tab': 'Decodes FT', 'dec.title': 'Decodes', 'dec.bandDrift': '{app} annonce {dec}, le poste est sur {rig}', 'dec.bandDriftApp': 'le décodeur', 'dec.bandDriftTip': 'Le logiciel de décodage annonce une bande sur laquelle la radio n’est pas — il a très probablement perdu sa liaison CAT et répète la dernière fréquence connue. Tous les décodages ci-dessous portent cette bande, et les verdicts NOUVEAU / NOUVELLE BANDE sont jugés dessus.', 'dec.cqOnly': 'CQ seulement', 'dec.sortTip': 'Trier ce créneau sur cette colonne. Un second clic inverse, un troisième rend l’ordre dans lequel le décodeur les a entendus.',
|
||||||
'dec.allBands': 'Toutes bandes', 'dec.allModes': 'Tous modes', 'toast.qsoLogged': 'QSO enregistré', 'dec.contsHint': 'Continents : clique pour en garder un ou plusieurs', 'dec.allConts': 'Tous continents',
|
'dec.allBands': 'Toutes bandes', 'dec.allModes': 'Tous modes', 'toast.qsoLogged': 'QSO enregistré', 'dec.contsHint': 'Continents : clique pour en garder un ou plusieurs', 'dec.allConts': 'Tous continents',
|
||||||
'dec.minSnrTitle': 'Masquer tout ce qui est plus faible que ce rapport', 'dec.searchPh': 'Indicatif, locator ou message',
|
'dec.minSnrTitle': 'Masquer tout ce qui est plus faible que ce rapport', 'dec.searchPh': 'Indicatif, locator ou message',
|
||||||
'dec.clearFilters': 'Effacer', 'dec.live': 'en direct', 'dec.tx': 'TX',
|
'dec.clearFilters': 'Effacer', 'dec.live': 'en direct', 'dec.tx': 'TX',
|
||||||
@@ -908,10 +912,14 @@ const fr: Dict = {
|
|||||||
'station.rigOff': 'le CAT est désactivé', 'station.noPort': 'aucun port configuré',
|
'station.rigOff': 'le CAT est désactivé', 'station.noPort': 'aucun port configuré',
|
||||||
'station.connect': 'Connecter', 'station.noVoiceMsg': 'Aucun message enregistré — Réglages ▸ Audio.',
|
'station.connect': 'Connecter', 'station.noVoiceMsg': 'Aucun message enregistré — Réglages ▸ Audio.',
|
||||||
'station.title': 'Contrôle station', 'station.rotator': 'Rotator', 'station.rotateTo': 'Tourner vers {az}°', 'station.rotatorNoRead': 'Azimut non lu', 'station.bands': 'Bandes', 'station.nudgeUp': 'Monter de {n} kHz', 'station.nudgeDown': 'Descendre de {n} kHz', 'station.trackOn': 'Suivi actif', 'station.trackOff': 'Suivi inactif', 'station.trackStepTip': 'Ne réaccorder que si le rig a bougé d au moins ça', 'station.trackModeTip': "Quand l'antenne a le droit de se réaccorder", 'station.trackAlways': 'À chaque changement', 'station.trackStep': 'Au-delà d un pas', 'station.trackBand': 'Changement de bande', 'station.trackAlwaysTip': "Suivre chaque changement de fréquence. Résonance idéale, mais les moteurs tournent en permanence — et sur une SteppIR chaque déplacement bloque l'émission le temps du mouvement.", 'station.trackStepTipMode': "Ne réaccorder qu'une fois le rig sorti du pas. Suit un QSY, ignore la recherche autour.", 'station.trackBandTip': "Ne réaccorder qu'au changement de bande. Les moteurs bougent quelques fois par jour et restent tranquilles dans une bande.", 'station.pattern': 'Diagramme', 'station.bi': 'Bi', 'station.motorWidgetShow': 'Antenne motorisée · cliquer pour afficher', 'station.motorWidgetHide': 'Antenne motorisée — affichée · cliquer pour masquer', 'station.hideWidget': 'Masquer ce widget', 'station.retract': 'Rétracter les éléments', 'station.moving': 'EN MOUVEMENT', 'station.elements': 'Éléments (mm)', 'station.read': 'Lire', 'station.readLengths': 'Lire les longueurs actuelles depuis le contrôleur', 'station.noLengths': 'Longueurs inconnues — clique sur Lire pour les récupérer depuis le contrôleur.', 'station.element': 'Élément', 'station.reflector': 'Réflecteur', 'station.driven': 'Radiateur', 'station.director': 'Dir', 'station.set': 'Régler', 'station.elementsHint': "Chaque appui allonge/raccourcit l'élément de 2 mm (comme le pupitre). Vérifie quel élément répond sur ton antenne.", 'station.setExactLen': "Clique pour taper la longueur actuelle exacte (recale la base si la lecture auto est fausse).", 'station.atMax': "Refusé par le contrôleur — l'élément est probablement en butée (longueur max pour cette bande), il ne peut plus s'allonger.", 'station.go': 'Aller', 'station.stop': 'Stop', 'station.dragHint': 'Glisse la poignée à gauche d un panneau pour le déplacer. Choisis un nombre de colonnes pour la disposition.', 'station.dragMove': 'Glisser pour déplacer ce panneau', 'station.colsAuto': 'Auto', 'station.addDevice': 'Ajouter un appareil', 'station.editDevice': "Modifier l'appareil", 'station.empty': "Aucune carte relais. Ajoute un WebSwitch 1216H ou une carte KMTronic 8 relais pour piloter l'alimentation et les accessoires de ta station.", 'station.online': 'En ligne', 'station.offline': 'Hors ligne', 'station.edit': 'Modifier', 'station.delete': 'Supprimer', 'station.relay': 'Relais', 'station.on': 'ON', 'station.off': 'OFF', 'station.type': "Type d'appareil", 'station.name': 'Nom', 'station.host': 'Hôte / IP', 'station.hostHint': "IP du LAN en local. Pour joindre la carte depuis L'EXTÉRIEUR, saisis une URL complète ici — ex. https://relais.tondomaine.com — pointant vers un reverse proxy (Nginx Proxy Manager…) qui expose le port HTTP de la carte.", 'station.user': "Nom d'utilisateur", 'station.pass': 'Mot de passe', 'station.optional': 'optionnel', 'station.ftdiSerial': 'Numéro de série FTDI', 'station.detect': 'Détecter', 'station.ftdiHint': "La carte Denkovi se pilote en FTDI bit-bang (pas via le port COM). Choisis son numéro de série (ex. DAE0006K). Nécessite le driver FTDI D2XX installé.", 'station.channels': 'Relais', 'station.comPort': 'Port COM', 'station.noPorts': 'Aucun port', 'station.usbRelayHint': "Cartes USB-série bon marché (CH340/LCUS) protocole A0. Si la tienne ne commute pas, donne-moi le modèle / jeu de commandes.", 'station.labels': 'Libellés des relais', 'station.cancel': 'Annuler', 'station.save': 'Enregistrer', 'station.test': 'Tester la connexion', 'station.testOk': 'Connecté — {n} relais', 'station.testFail': 'Non connecté', 'station.detectNone': 'Aucune carte FTDI trouvée — vérifie le câble et que le driver D2XX est installé.', 'station.detectFound': '{n} carte(s) détectée(s).',
|
'station.title': 'Contrôle station', 'station.rotator': 'Rotator', 'station.rotateTo': 'Tourner vers {az}°', 'station.rotatorNoRead': 'Azimut non lu', 'station.bands': 'Bandes', 'station.nudgeUp': 'Monter de {n} kHz', 'station.nudgeDown': 'Descendre de {n} kHz', 'station.trackOn': 'Suivi actif', 'station.trackOff': 'Suivi inactif', 'station.trackStepTip': 'Ne réaccorder que si le rig a bougé d au moins ça', 'station.trackModeTip': "Quand l'antenne a le droit de se réaccorder", 'station.trackAlways': 'À chaque changement', 'station.trackStep': 'Au-delà d un pas', 'station.trackBand': 'Changement de bande', 'station.trackAlwaysTip': "Suivre chaque changement de fréquence. Résonance idéale, mais les moteurs tournent en permanence — et sur une SteppIR chaque déplacement bloque l'émission le temps du mouvement.", 'station.trackStepTipMode': "Ne réaccorder qu'une fois le rig sorti du pas. Suit un QSY, ignore la recherche autour.", 'station.trackBandTip': "Ne réaccorder qu'au changement de bande. Les moteurs bougent quelques fois par jour et restent tranquilles dans une bande.", 'station.pattern': 'Diagramme', 'station.bi': 'Bi', 'station.motorWidgetShow': 'Antenne motorisée · cliquer pour afficher', 'station.motorWidgetHide': 'Antenne motorisée — affichée · cliquer pour masquer', 'station.hideWidget': 'Masquer ce widget', 'station.retract': 'Rétracter les éléments', 'station.moving': 'EN MOUVEMENT', 'station.elements': 'Éléments (mm)', 'station.read': 'Lire', 'station.readLengths': 'Lire les longueurs actuelles depuis le contrôleur', 'station.noLengths': 'Longueurs inconnues — clique sur Lire pour les récupérer depuis le contrôleur.', 'station.element': 'Élément', 'station.reflector': 'Réflecteur', 'station.driven': 'Radiateur', 'station.director': 'Dir', 'station.set': 'Régler', 'station.elementsHint': "Chaque appui allonge/raccourcit l'élément de 2 mm (comme le pupitre). Vérifie quel élément répond sur ton antenne.", 'station.setExactLen': "Clique pour taper la longueur actuelle exacte (recale la base si la lecture auto est fausse).", 'station.atMax': "Refusé par le contrôleur — l'élément est probablement en butée (longueur max pour cette bande), il ne peut plus s'allonger.", 'station.go': 'Aller', 'station.stop': 'Stop', 'station.dragHint': 'Glisse la poignée à gauche d un panneau pour le déplacer. Choisis un nombre de colonnes pour la disposition.', 'station.dragMove': 'Glisser pour déplacer ce panneau', 'station.colsAuto': 'Auto', 'station.addDevice': 'Ajouter un appareil', 'station.editDevice': "Modifier l'appareil", 'station.empty': "Aucune carte relais. Ajoute un WebSwitch 1216H ou une carte KMTronic 8 relais pour piloter l'alimentation et les accessoires de ta station.", 'station.online': 'En ligne', 'station.offline': 'Hors ligne', 'station.edit': 'Modifier', 'station.delete': 'Supprimer', 'station.relay': 'Relais', 'station.on': 'ON', 'station.off': 'OFF', 'station.type': "Type d'appareil", 'station.name': 'Nom', 'station.host': 'Hôte / IP', 'station.hostHint': "IP du LAN en local. Pour joindre la carte depuis L'EXTÉRIEUR, saisis une URL complète ici — ex. https://relais.tondomaine.com — pointant vers un reverse proxy (Nginx Proxy Manager…) qui expose le port HTTP de la carte.", 'station.user': "Nom d'utilisateur", 'station.pass': 'Mot de passe', 'station.optional': 'optionnel', 'station.ftdiSerial': 'Numéro de série FTDI', 'station.detect': 'Détecter', 'station.ftdiHint': "La carte Denkovi se pilote en FTDI bit-bang (pas via le port COM). Choisis son numéro de série (ex. DAE0006K). Nécessite le driver FTDI D2XX installé.", 'station.channels': 'Relais', 'station.comPort': 'Port COM', 'station.noPorts': 'Aucun port', 'station.usbRelayHint': "Cartes USB-série bon marché (CH340/LCUS) protocole A0. Si la tienne ne commute pas, donne-moi le modèle / jeu de commandes.", 'station.labels': 'Libellés des relais', 'station.cancel': 'Annuler', 'station.save': 'Enregistrer', 'station.test': 'Tester la connexion', 'station.testOk': 'Connecté — {n} relais', 'station.testFail': 'Non connecté', 'station.detectNone': 'Aucune carte FTDI trouvée — vérifie le câble et que le driver D2XX est installé.', 'station.detectFound': '{n} carte(s) détectée(s).',
|
||||||
|
'station.retractTip': 'Rentrer les éléments dans les moyeux — la position de rangement, pour un coup de vent ou pour l’hiver. Au prochain accord, l’antenne ressort d’elle-même.',
|
||||||
|
'station.calibrate': 'Calibrer',
|
||||||
|
'station.calibrateTip': 'SteppIR : amener chaque élément en butée pour que le contrôleur retrouve son zéro. Le remède à une antenne qui s’accorde à la mauvaise longueur — après une coupure en pleine course, après avoir poussé les éléments à la main, après un moteur qui a glissé.',
|
||||||
|
'station.calibrateConfirm': 'Calibrer l’antenne ?\n\nChaque élément parcourt toute sa course et cela prend plusieurs minutes. À ne pas lancer pendant un concours — l’antenne est inutilisable jusqu’à la fin.',
|
||||||
'awards.followHint': 'Diplômes affichés dans l’onglet Awards. Laisse la colonne de droite vide pour tous les afficher.', 'awards.available': 'Tous les diplômes', 'awards.followed': 'Suivis', 'awards.search': 'Filtrer…', 'awards.addAll': 'Tout ajouter', 'awards.clear': 'Vider', 'awards.allTracked': 'Tous les diplômes sont suivis.', 'awards.noneFollowed': 'Aucun pour l’instant — l’onglet Awards les montre tous.',
|
'awards.followHint': 'Diplômes affichés dans l’onglet Awards. Laisse la colonne de droite vide pour tous les afficher.', 'awards.available': 'Tous les diplômes', 'awards.followed': 'Suivis', 'awards.search': 'Filtrer…', 'awards.addAll': 'Tout ajouter', 'awards.clear': 'Vider', 'awards.allTracked': 'Tous les diplômes sont suivis.', 'awards.noneFollowed': 'Aucun pour l’instant — l’onglet Awards les montre tous.',
|
||||||
'sec.awards': 'Diplômes', 'sec.cat': 'Interface CAT', 'sec.rotator': 'Rotator', 'sec.winkeyer': 'Manipulateur CW',
|
'sec.awards': 'Diplômes', 'sec.cat': 'Interface CAT', 'sec.rotator': 'Rotator', 'sec.winkeyer': 'Manipulateur CW',
|
||||||
'sec.antenna': 'Antenne motorisée', 'sec.antgenius': 'Antenna Genius', 'sec.tunergenius': 'Tuner Genius', 'sec.pgxl': 'Amplificateur', 'sec.psu': 'Alimentation',
|
'sec.antenna': 'Antenne motorisée', 'sec.antgenius': 'Antenna Genius', 'sec.tunergenius': 'Tuner Genius', 'sec.pgxl': 'Amplificateur', 'sec.psu': 'Alimentation',
|
||||||
'upd.available': 'OpsLog v{v} disponible', 'upd.current': 'Tu es en v{v}.', 'upd.install': 'Mettre à jour maintenant', 'upd.download': 'Télécharger', 'upd.later': 'Plus tard', 'upd.downloading': 'Téléchargement…', 'upd.installing': 'Installation…', 'upd.restartNote': 'OpsLog redémarrera sur la nouvelle version.', 'upd.retry': 'Réessayer', 'upd.browser': 'Ouvrir la page',
|
'upd.available': 'OpsLog v{v} disponible', 'upd.current': 'Tu es en v{v}.', 'upd.install': 'Mettre à jour maintenant', 'upd.download': 'Télécharger', 'upd.later': 'Plus tard', 'upd.remindIn': 'Me rappeler dans', 'upd.dismissHour': 'Masquer pendant une heure', 'upd.downloading': 'Téléchargement…', 'upd.installing': 'Installation…', 'upd.restartNote': 'OpsLog redémarrera sur la nouvelle version.', 'upd.retry': 'Réessayer', 'upd.browser': 'Ouvrir la page',
|
||||||
'psu.title': 'Alimentation de laboratoire (Modbus RTU)', 'psu.hint': 'Une alimentation programmable sur port série — BSIDE, Wanptek et les autres alimentations Modbus RTU utilisant les codes fonction 03 et 06. OpsLog affiche ce qu’elle débite et commute sa sortie.', 'psu.enable': 'Piloter cette alimentation', 'psu.port': 'Port COM', 'psu.baud': 'Vitesse', 'psu.address': 'Adresse Modbus', 'psu.wireHint': '9600 bauds, 8 bits de données, sans parité, 1 bit de stop, adresse 1 — les réglages d’usine. Ne les changez ici que si vous les avez changés sur l’alimentation.', 'psu.writeScope': 'OpsLog n’écrit jamais que la marche/arrêt de la sortie. La tension, le courant et les protections sont lus et affichés, jamais modifiés — ils restent sur la face avant de l’alimentation.', 'psu.output': 'Sortie', 'psu.setTo': 'réglée sur', 'psu.tripped': 'PROTECTION DÉCLENCHÉE', 'psu.offline': 'Ne répond pas',
|
'psu.title': 'Alimentation de laboratoire (Modbus RTU)', 'psu.hint': 'Une alimentation programmable sur port série — BSIDE, Wanptek et les autres alimentations Modbus RTU utilisant les codes fonction 03 et 06. OpsLog affiche ce qu’elle débite et commute sa sortie.', 'psu.enable': 'Piloter cette alimentation', 'psu.port': 'Port COM', 'psu.baud': 'Vitesse', 'psu.address': 'Adresse Modbus', 'psu.wireHint': '9600 bauds, 8 bits de données, sans parité, 1 bit de stop, adresse 1 — les réglages d’usine. Ne les changez ici que si vous les avez changés sur l’alimentation.', 'psu.writeScope': 'OpsLog n’écrit jamais que la marche/arrêt de la sortie. La tension, le courant et les protections sont lus et affichés, jamais modifiés — ils restent sur la face avant de l’alimentation.', 'psu.output': 'Sortie', 'psu.setTo': 'réglée sur', 'psu.tripped': 'PROTECTION DÉCLENCHÉE', 'psu.offline': 'Ne répond pas',
|
||||||
'sec.flex': 'FlexRadio', 'sec.audio': 'Périphériques audio',
|
'sec.flex': 'FlexRadio', 'sec.audio': 'Périphériques audio',
|
||||||
// Panneau Manipulateur CW
|
// Panneau Manipulateur CW
|
||||||
@@ -1019,7 +1027,7 @@ const fr: Dict = {
|
|||||||
'clu.slotHighlightHint': "(par indicatif, quel que soit le statut de l'entité)",
|
'clu.slotHighlightHint': "(par indicatif, quel que soit le statut de l'entité)",
|
||||||
'rq.searchPh': 'Chercher un indicatif… 4S · *4S · *4S*', 'rq.searchTip': 'Un mot simple correspond au DÉBUT de l’indicatif : 4S trouve 4S7AB. * remplace n’importe quelle suite de caractères et ? exactement un, donc *4S se termine par 4S, *4S* le contient n’importe où, et F?BPO correspond à F4BPO.',
|
'rq.searchPh': 'Chercher un indicatif… 4S · *4S · *4S*', 'rq.searchTip': 'Un mot simple correspond au DÉBUT de l’indicatif : 4S trouve 4S7AB. * remplace n’importe quelle suite de caractères et ? exactement un, donc *4S se termine par 4S, *4S* le contient n’importe où, et F?BPO correspond à F4BPO.',
|
||||||
'chg.mode': 'Chasse', 'chg.sources': 'Confirmé par', 'chg.card': 'Carte QSL', 'dec.unconfTip': 'Contacté mais non confirmé — une QSL à chasser', 'gsc.scope': 'Carré déjà fait selon', 'gsc.hunt': 'Chasser', 'gsc.huntNew': 'Nouveau — jamais contacté', 'gsc.huntUnconf': 'Nouveau et non confirmé', 'gsc.scope_band_digi': 'Cette bande + tout mode numérique', 'gsc.scope_band_mode': 'Cette bande + ce mode exact', 'gsc.scope_band_ftx': 'Cette bande + tout mode FT (FT8/FT4/FT2)', 'gsc.scope_mix_digi': 'Toutes bandes + tout mode numérique', 'gsc.scope_mix_mode': 'Toutes bandes + ce mode exact', 'gsc.scope_mix_ftx': 'Toutes bandes + tout mode FT (FT8/FT4/FT2)', 'gsc.hint': 'Détermine quand un carré cesse d’être NEW. Plus c’est étroit, plus il y a de carrés à chasser : par bande et par mode exact est le plus exigeant, toutes bandes et tout numérique le moins. Chasser aussi les non confirmés garde un carré recherché jusqu’à une confirmation QSL, LoTW ou eQSL — il manque toujours au diplôme d’ici là.',
|
'chg.mode': 'Chasse', 'chg.sources': 'Confirmé par', 'chg.card': 'Carte QSL', 'dec.unconfTip': 'Contacté mais non confirmé — une QSL à chasser', 'gsc.scope': 'Carré déjà fait selon', 'gsc.hunt': 'Chasser', 'gsc.huntNew': 'Nouveau — jamais contacté', 'gsc.huntUnconf': 'Nouveau et non confirmé', 'gsc.scope_band_digi': 'Cette bande + tout mode numérique', 'gsc.scope_band_mode': 'Cette bande + ce mode exact', 'gsc.scope_band_ftx': 'Cette bande + tout mode FT (FT8/FT4/FT2)', 'gsc.scope_mix_digi': 'Toutes bandes + tout mode numérique', 'gsc.scope_mix_mode': 'Toutes bandes + ce mode exact', 'gsc.scope_mix_ftx': 'Toutes bandes + tout mode FT (FT8/FT4/FT2)', 'gsc.hint': 'Détermine quand un carré cesse d’être NEW. Plus c’est étroit, plus il y a de carrés à chasser : par bande et par mode exact est le plus exigeant, toutes bandes et tout numérique le moins. Chasser aussi les non confirmés garde un carré recherché jusqu’à une confirmation QSL, LoTW ou eQSL — il manque toujours au diplôme d’ici là.',
|
||||||
'gsm.basemap': 'Fond de carte', 'gsm.title': 'Carrés locator', 'gsm.all': 'Tout', 'gsm.phone': 'Phonie', 'gsm.cw': 'CW', 'gsm.digital': 'Numérique', 'gsm.ftx': 'FTx', 'gsm.confirmed': 'confirmés', 'gsm.worked': 'contactés', 'gsm.colConfirmed': 'Couleur des carrés confirmés', 'gsm.colWorked': 'Couleur des carrés contactés (non confirmés)', 'gsm.colReset': 'Revenir aux couleurs du thème', 'gsm.refresh': 'Recompter depuis le journal', 'gsm.count': '{n} carrés · {c} confirmés',
|
'gsm.basemap': 'Fond de carte', 'gsm.title': 'Carrés locator', 'gsm.all': 'Tout', 'gsm.phone': 'Phonie', 'gsm.cw': 'CW', 'gsm.digital': 'Numérique', 'gsm.ftx': 'FTx', 'gsm.confirmed': 'confirmés', 'gsm.worked': 'contactés', 'gsm.colConfirmed': 'Couleur des carrés confirmés', 'gsm.colWorked': 'Couleur des carrés contactés (non confirmés)', 'gsm.colReset': 'Revenir aux couleurs du thème', 'gsm.refresh': 'Recompter depuis le journal', 'gsm.count': '{n} carrés · {c} confirmés', 'gsm.oneMode': 'Un mode', 'gsm.band': 'Bande', 'gsm.allBands': 'Toutes les bandes', 'gsm.satellite': 'Satellite', 'gsm.allSats': 'Tous les satellites',
|
||||||
'bo.nearKm': 'Compter les récepteurs à moins de', 'bo.nearKmHint': 'Un report ne prouve TON chemin que s’il a été collecté près de chez toi. Plus petit est plus local, mais laisse moins de récepteurs à l’écoute — trop petit, la veille n’a plus rien à observer. 300 km emprunte les oreilles de toute une région et 100 km convient au 2 m, où un conduit est étroit ; là où les stations sont très dispersées — VK, ZL, une bonne partie de l’Amérique du Nord — 1000 à 2000 km sont parfois nécessaires pour trouver le moindre récepteur.',
|
'bo.nearKm': 'Compter les récepteurs à moins de', 'bo.nearKmHint': 'Un report ne prouve TON chemin que s’il a été collecté près de chez toi. Plus petit est plus local, mais laisse moins de récepteurs à l’écoute — trop petit, la veille n’a plus rien à observer. 300 km emprunte les oreilles de toute une région et 100 km convient au 2 m, où un conduit est étroit ; là où les stations sont très dispersées — VK, ZL, une bonne partie de l’Amérique du Nord — 1000 à 2000 km sont parfois nécessaires pour trouver le moindre récepteur.',
|
||||||
'bo.open': 'ouvert', 'bo.liveTip': '{band} est ouvert — {n} stations, ~{km} km, {sector}{season}. Cliquer pour le bandmap.', 'bo.enable': 'Surveiller les ouvertures de bande', 'bo.enableHint': "(10, 12, 6, 4 et 2 m. Activer ajoute les deux nœuds RBN et souscrit au flux PSK Reporter — la détection a besoin de bien plus d oreilles qu un cluster ne peut en fournir.)", 'bo.feedUp': 'Flux PSK Reporter actif — {n} décodages vus', 'bo.feedDown': 'Flux PSK Reporter inactif — il faut ton locator, et un instant pour se connecter', 'clu.workedSameSlot': 'Déjà contacté seulement sur le même slot',
|
'bo.open': 'ouvert', 'bo.liveTip': '{band} est ouvert — {n} stations, ~{km} km, {sector}{season}. Cliquer pour le bandmap.', 'bo.enable': 'Surveiller les ouvertures de bande', 'bo.enableHint': "(10, 12, 6, 4 et 2 m. Activer ajoute les deux nœuds RBN et souscrit au flux PSK Reporter — la détection a besoin de bien plus d oreilles qu un cluster ne peut en fournir.)", 'bo.feedUp': 'Flux PSK Reporter actif — {n} décodages vus', 'bo.feedDown': 'Flux PSK Reporter inactif — il faut ton locator, et un instant pour se connecter', 'clu.workedSameSlot': 'Déjà contacté seulement sur le même slot',
|
||||||
'clu.macros': 'Boutons de commande', 'clu.macrosHint': 'Un bouton nommé à côté du champ de commande du cluster. Laisse la commande vide et le bouton n’est pas affiché.',
|
'clu.macros': 'Boutons de commande', 'clu.macrosHint': 'Un bouton nommé à côté du champ de commande du cluster. Laisse la commande vide et le bouton n’est pas affiché.',
|
||||||
|
|||||||
@@ -69,6 +69,8 @@ const PORTABLE_KEYS = [
|
|||||||
'opslog.clusterHideSpots', // cluster console: hide the DX spot flood so replies are readable
|
'opslog.clusterHideSpots', // cluster console: hide the DX spot flood so replies are readable
|
||||||
'opslog.clusterConsoleFollow', // cluster console: keep the view pinned to the newest line
|
'opslog.clusterConsoleFollow', // cluster console: keep the view pinned to the newest line
|
||||||
'opslog.gridMapColorConfirmed', 'opslog.gridMapColorWorked', // grid map: chosen fills (empty = follow the theme)
|
'opslog.gridMapColorConfirmed', 'opslog.gridMapColorWorked', // grid map: chosen fills (empty = follow the theme)
|
||||||
|
'opslog.ftMapColour', // FT map: one colour for every arc (empty = the band palette)
|
||||||
|
'opslog.ftMapHeardColour', // FT map: the who-hears-me diamonds (empty = the default cyan)
|
||||||
// NOTE: 'hamlog.awardColsShown' and the grid column layouts are NOT listed here.
|
// NOTE: 'hamlog.awardColsShown' and the grid column layouts are NOT listed here.
|
||||||
// They are handled by lib/gridPrefs, which scopes the localStorage cache PER
|
// They are handled by lib/gridPrefs, which scopes the localStorage cache PER
|
||||||
// PROFILE and mirrors to the DB (already per-profile) itself — mirroring them
|
// PROFILE and mirrors to the DB (already per-profile) itself — mirroring them
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
// Single source of truth for the app version shown in the UI (header + About).
|
// Single source of truth for the app version shown in the UI (header + About).
|
||||||
// Bump this on a release (the release script updates it alongside telemetry.go).
|
// Bump this on a release (the release script updates it alongside telemetry.go).
|
||||||
export const APP_VERSION = '0.27.22';
|
export const APP_VERSION = '0.27.23';
|
||||||
|
|
||||||
// Author / credits, shown in Help -> About.
|
// Author / credits, shown in Help -> About.
|
||||||
export const APP_AUTHOR = 'F4BPO';
|
export const APP_AUTHOR = 'F4BPO';
|
||||||
|
|||||||
Vendored
+14
-1
@@ -14,6 +14,7 @@ import {bandopen} from '../models';
|
|||||||
import {cluster} from '../models';
|
import {cluster} from '../models';
|
||||||
import {dxped} from '../models';
|
import {dxped} from '../models';
|
||||||
import {extsvc} from '../models';
|
import {extsvc} from '../models';
|
||||||
|
import {pskrme} from '../models';
|
||||||
import {powergenius} from '../models';
|
import {powergenius} from '../models';
|
||||||
import {pskrtgt} from '../models';
|
import {pskrtgt} from '../models';
|
||||||
import {pskr} from '../models';
|
import {pskr} from '../models';
|
||||||
@@ -517,6 +518,10 @@ export function GetGridCacheStatus():Promise<main.GridCacheStatus>;
|
|||||||
|
|
||||||
export function GetGridScopeSettings():Promise<main.GridScopeSettings>;
|
export function GetGridScopeSettings():Promise<main.GridScopeSettings>;
|
||||||
|
|
||||||
|
export function GetHearMe():Promise<boolean>;
|
||||||
|
|
||||||
|
export function GetHearMeStatus():Promise<pskrme.Status>;
|
||||||
|
|
||||||
export function GetIcomState():Promise<cat.IcomTXState>;
|
export function GetIcomState():Promise<cat.IcomTXState>;
|
||||||
|
|
||||||
export function GetKenwoodState():Promise<cat.KenwoodTXState>;
|
export function GetKenwoodState():Promise<cat.KenwoodTXState>;
|
||||||
@@ -667,6 +672,8 @@ export function GetWebPublishStatus():Promise<main.WebPublishStatus>;
|
|||||||
|
|
||||||
export function GetWhatsNew():Promise<Array<main.ChangelogEntry>>;
|
export function GetWhatsNew():Promise<Array<main.ChangelogEntry>>;
|
||||||
|
|
||||||
|
export function GetWhoHearsMe():Promise<Array<pskrme.Report>>;
|
||||||
|
|
||||||
export function GetWinkeyerSettings():Promise<main.WinkeyerSettings>;
|
export function GetWinkeyerSettings():Promise<main.WinkeyerSettings>;
|
||||||
|
|
||||||
export function GetWinkeyerStatus():Promise<winkeyer.Status>;
|
export function GetWinkeyerStatus():Promise<winkeyer.Status>;
|
||||||
@@ -685,7 +692,9 @@ export function GetYaesuBandAntennas():Promise<Record<string, number>>;
|
|||||||
|
|
||||||
export function GetYaesuState():Promise<cat.YaesuTXState>;
|
export function GetYaesuState():Promise<cat.YaesuTXState>;
|
||||||
|
|
||||||
export function GridSquares(arg1:string):Promise<Array<qso.GridSquare>>;
|
export function GridSquareChoices():Promise<main.GridSquareChoices>;
|
||||||
|
|
||||||
|
export function GridSquares(arg1:string,arg2:string,arg3:string):Promise<Array<qso.GridSquare>>;
|
||||||
|
|
||||||
export function HaltAutoCall():Promise<void>;
|
export function HaltAutoCall():Promise<void>;
|
||||||
|
|
||||||
@@ -853,6 +862,8 @@ export function LookupCallsign(arg1:string,arg2:string):Promise<lookup.Result>;
|
|||||||
|
|
||||||
export function LookupCallsignFresh(arg1:string,arg2:string):Promise<lookup.Result>;
|
export function LookupCallsignFresh(arg1:string,arg2:string):Promise<lookup.Result>;
|
||||||
|
|
||||||
|
export function MotorCalibrate():Promise<void>;
|
||||||
|
|
||||||
export function MotorNudgeKHz(arg1:number):Promise<void>;
|
export function MotorNudgeKHz(arg1:number):Promise<void>;
|
||||||
|
|
||||||
export function MotorReadElements():Promise<Array<number>>;
|
export function MotorReadElements():Promise<Array<number>>;
|
||||||
@@ -1231,6 +1242,8 @@ export function SetDVKLabel(arg1:number,arg2:string):Promise<void>;
|
|||||||
|
|
||||||
export function SetFlexRSTChaseEnabled(arg1:boolean):Promise<void>;
|
export function SetFlexRSTChaseEnabled(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function SetHearMe(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
export function SetKenwoodAFGain(arg1:number):Promise<void>;
|
export function SetKenwoodAFGain(arg1:number):Promise<void>;
|
||||||
|
|
||||||
export function SetKenwoodAGC(arg1:string):Promise<void>;
|
export function SetKenwoodAGC(arg1:string):Promise<void>;
|
||||||
|
|||||||
@@ -966,6 +966,14 @@ export function GetGridScopeSettings() {
|
|||||||
return window['go']['main']['App']['GetGridScopeSettings']();
|
return window['go']['main']['App']['GetGridScopeSettings']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function GetHearMe() {
|
||||||
|
return window['go']['main']['App']['GetHearMe']();
|
||||||
|
}
|
||||||
|
|
||||||
|
export function GetHearMeStatus() {
|
||||||
|
return window['go']['main']['App']['GetHearMeStatus']();
|
||||||
|
}
|
||||||
|
|
||||||
export function GetIcomState() {
|
export function GetIcomState() {
|
||||||
return window['go']['main']['App']['GetIcomState']();
|
return window['go']['main']['App']['GetIcomState']();
|
||||||
}
|
}
|
||||||
@@ -1266,6 +1274,10 @@ export function GetWhatsNew() {
|
|||||||
return window['go']['main']['App']['GetWhatsNew']();
|
return window['go']['main']['App']['GetWhatsNew']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function GetWhoHearsMe() {
|
||||||
|
return window['go']['main']['App']['GetWhoHearsMe']();
|
||||||
|
}
|
||||||
|
|
||||||
export function GetWinkeyerSettings() {
|
export function GetWinkeyerSettings() {
|
||||||
return window['go']['main']['App']['GetWinkeyerSettings']();
|
return window['go']['main']['App']['GetWinkeyerSettings']();
|
||||||
}
|
}
|
||||||
@@ -1302,8 +1314,12 @@ export function GetYaesuState() {
|
|||||||
return window['go']['main']['App']['GetYaesuState']();
|
return window['go']['main']['App']['GetYaesuState']();
|
||||||
}
|
}
|
||||||
|
|
||||||
export function GridSquares(arg1) {
|
export function GridSquareChoices() {
|
||||||
return window['go']['main']['App']['GridSquares'](arg1);
|
return window['go']['main']['App']['GridSquareChoices']();
|
||||||
|
}
|
||||||
|
|
||||||
|
export function GridSquares(arg1, arg2, arg3) {
|
||||||
|
return window['go']['main']['App']['GridSquares'](arg1, arg2, arg3);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function HaltAutoCall() {
|
export function HaltAutoCall() {
|
||||||
@@ -1638,6 +1654,10 @@ export function LookupCallsignFresh(arg1, arg2) {
|
|||||||
return window['go']['main']['App']['LookupCallsignFresh'](arg1, arg2);
|
return window['go']['main']['App']['LookupCallsignFresh'](arg1, arg2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function MotorCalibrate() {
|
||||||
|
return window['go']['main']['App']['MotorCalibrate']();
|
||||||
|
}
|
||||||
|
|
||||||
export function MotorNudgeKHz(arg1) {
|
export function MotorNudgeKHz(arg1) {
|
||||||
return window['go']['main']['App']['MotorNudgeKHz'](arg1);
|
return window['go']['main']['App']['MotorNudgeKHz'](arg1);
|
||||||
}
|
}
|
||||||
@@ -2394,6 +2414,10 @@ export function SetFlexRSTChaseEnabled(arg1) {
|
|||||||
return window['go']['main']['App']['SetFlexRSTChaseEnabled'](arg1);
|
return window['go']['main']['App']['SetFlexRSTChaseEnabled'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function SetHearMe(arg1) {
|
||||||
|
return window['go']['main']['App']['SetHearMe'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function SetKenwoodAFGain(arg1) {
|
export function SetKenwoodAFGain(arg1) {
|
||||||
return window['go']['main']['App']['SetKenwoodAFGain'](arg1);
|
return window['go']['main']['App']['SetKenwoodAFGain'](arg1);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3075,6 +3075,22 @@ export namespace main {
|
|||||||
return a;
|
return a;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
export class GridSquareChoices {
|
||||||
|
modes: string[];
|
||||||
|
bands: string[];
|
||||||
|
satellites: string[];
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new GridSquareChoices(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.modes = source["modes"];
|
||||||
|
this.bands = source["bands"];
|
||||||
|
this.satellites = source["satellites"];
|
||||||
|
}
|
||||||
|
}
|
||||||
export class HamlogCfmResult {
|
export class HamlogCfmResult {
|
||||||
total: number;
|
total: number;
|
||||||
confirmed: number;
|
confirmed: number;
|
||||||
@@ -4282,6 +4298,8 @@ export namespace main {
|
|||||||
az: number;
|
az: number;
|
||||||
el: number;
|
el: number;
|
||||||
visible: boolean;
|
visible: boolean;
|
||||||
|
range_km: number;
|
||||||
|
alt_km: number;
|
||||||
radio: string;
|
radio: string;
|
||||||
error: string;
|
error: string;
|
||||||
rot_on: boolean;
|
rot_on: boolean;
|
||||||
@@ -4307,6 +4325,8 @@ export namespace main {
|
|||||||
this.az = source["az"];
|
this.az = source["az"];
|
||||||
this.el = source["el"];
|
this.el = source["el"];
|
||||||
this.visible = source["visible"];
|
this.visible = source["visible"];
|
||||||
|
this.range_km = source["range_km"];
|
||||||
|
this.alt_km = source["alt_km"];
|
||||||
this.radio = source["radio"];
|
this.radio = source["radio"];
|
||||||
this.error = source["error"];
|
this.error = source["error"];
|
||||||
this.rot_on = source["rot_on"];
|
this.rot_on = source["rot_on"];
|
||||||
@@ -5431,6 +5451,74 @@ export namespace pskr {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export namespace pskrme {
|
||||||
|
|
||||||
|
export class Report {
|
||||||
|
call: string;
|
||||||
|
grid: string;
|
||||||
|
band: string;
|
||||||
|
mode: string;
|
||||||
|
snr: number;
|
||||||
|
freq_hz: number;
|
||||||
|
// Go type: time
|
||||||
|
at: any;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new Report(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.call = source["call"];
|
||||||
|
this.grid = source["grid"];
|
||||||
|
this.band = source["band"];
|
||||||
|
this.mode = source["mode"];
|
||||||
|
this.snr = source["snr"];
|
||||||
|
this.freq_hz = source["freq_hz"];
|
||||||
|
this.at = this.convertValues(source["at"], null);
|
||||||
|
}
|
||||||
|
|
||||||
|
convertValues(a: any, classs: any, asMap: boolean = false): any {
|
||||||
|
if (!a) {
|
||||||
|
return a;
|
||||||
|
}
|
||||||
|
if (a.slice && a.map) {
|
||||||
|
return (a as any[]).map(elem => this.convertValues(elem, classs));
|
||||||
|
} else if ("object" === typeof a) {
|
||||||
|
if (asMap) {
|
||||||
|
for (const key of Object.keys(a)) {
|
||||||
|
a[key] = new classs(a[key]);
|
||||||
|
}
|
||||||
|
return a;
|
||||||
|
}
|
||||||
|
return new classs(a);
|
||||||
|
}
|
||||||
|
return a;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
export class Status {
|
||||||
|
enabled: boolean;
|
||||||
|
online: boolean;
|
||||||
|
reports: number;
|
||||||
|
watching: string;
|
||||||
|
error: string;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new Status(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.enabled = source["enabled"];
|
||||||
|
this.online = source["online"];
|
||||||
|
this.reports = source["reports"];
|
||||||
|
this.watching = source["watching"];
|
||||||
|
this.error = source["error"];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
export namespace pskrtgt {
|
export namespace pskrtgt {
|
||||||
|
|
||||||
export class Bin {
|
export class Bin {
|
||||||
|
|||||||
@@ -0,0 +1,271 @@
|
|||||||
|
// Package pskrme answers the other half of the decodes map: who is hearing ME.
|
||||||
|
//
|
||||||
|
// The FT map draws what this station decodes, which is one direction of every
|
||||||
|
// path on it. The reverse — which stations are reporting our own transmissions
|
||||||
|
// — is the half an operator cannot see from their own receiver at all, and on
|
||||||
|
// FT8 it is the half that decides whether calling is worth the cycle.
|
||||||
|
//
|
||||||
|
// It is the narrowest possible slice of the PSK Reporter feed. The v2 topic is
|
||||||
|
//
|
||||||
|
// pskr/filter/v2/<band>/<mode>/<tx call>/<rx call>/<tx grid>/<rx grid>/…
|
||||||
|
//
|
||||||
|
// so putting the operator's callsign in the TX level makes the broker send
|
||||||
|
// nothing else. That is the whole reason this is cheap: internal/pskr measured
|
||||||
|
// 83 messages a second for four bands unfiltered, and 0.2 to 1.2 a second once
|
||||||
|
// filtered on the receiver's square — one callsign in the transmit level is a
|
||||||
|
// handful of messages per FT8 cycle, however open the band is.
|
||||||
|
//
|
||||||
|
// Its own connection, like internal/pskrtgt has its own: the three want
|
||||||
|
// different slices of the feed, and none of them can be filtered out of
|
||||||
|
// another's. It also means this works with the band-opening watch switched off,
|
||||||
|
// which matters — tying it to that feed's lifecycle would have made it fail
|
||||||
|
// silently for anyone not chasing openings.
|
||||||
|
//
|
||||||
|
// Nothing is persisted. A report older than the window is dropped on the next
|
||||||
|
// read, and an empty window means nobody has reported us recently, which is the
|
||||||
|
// honest answer rather than a stale map.
|
||||||
|
package pskrme
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
mqtt "github.com/eclipse/paho.mqtt.golang"
|
||||||
|
)
|
||||||
|
|
||||||
|
// DefaultBroker is PSK Reporter's public MQTT endpoint, TLS.
|
||||||
|
const DefaultBroker = "tls://mqtt.pskreporter.info:1884"
|
||||||
|
|
||||||
|
// Window is how long a report keeps counting.
|
||||||
|
//
|
||||||
|
// Fifteen minutes. PSK Reporter's uploaders batch, many of them every five, so
|
||||||
|
// a tighter window shows a fraction of the stations that actually heard the
|
||||||
|
// last few calls — internal/pskrtgt widened its own to ten for exactly that
|
||||||
|
// reason. This one is looser still because it feeds a MAP: a receiver that
|
||||||
|
// heard us twelve minutes ago is a path worth seeing on it, where the same
|
||||||
|
// report as a live "can he hear me" verdict would be stale.
|
||||||
|
const Window = 15 * time.Minute
|
||||||
|
|
||||||
|
// Report is one station's reception of us, reduced to what a map needs.
|
||||||
|
type Report struct {
|
||||||
|
Call string `json:"call"` // who reported us
|
||||||
|
Grid string `json:"grid"` // their square, from the message itself
|
||||||
|
Band string `json:"band"`
|
||||||
|
Mode string `json:"mode"`
|
||||||
|
SNR int `json:"snr"` // how they heard us, their report
|
||||||
|
FreqHz int64 `json:"freq_hz"` // where we were when they did
|
||||||
|
At time.Time `json:"at"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// Status is what the panel needs to tell a working feed from a silent one.
|
||||||
|
type Status struct {
|
||||||
|
Enabled bool `json:"enabled"`
|
||||||
|
Online bool `json:"online"`
|
||||||
|
Reports uint64 `json:"reports"` // accepted since start
|
||||||
|
Watching string `json:"watching"`
|
||||||
|
Error string `json:"error"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// Config is what the watcher needs to run.
|
||||||
|
type Config struct {
|
||||||
|
Broker string
|
||||||
|
// MyCall is the callsign to watch for in the TRANSMIT level. Without one
|
||||||
|
// there is no subscription to make: a wildcard there would be the whole
|
||||||
|
// feed, which is the one thing this package exists not to do.
|
||||||
|
MyCall string
|
||||||
|
Logf func(string, ...any)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Watcher owns the connection, its one subscription, and the sliding window.
|
||||||
|
type Watcher struct {
|
||||||
|
mu sync.Mutex
|
||||||
|
cfg Config
|
||||||
|
client mqtt.Client
|
||||||
|
running bool
|
||||||
|
topic string
|
||||||
|
|
||||||
|
reports []Report
|
||||||
|
received uint64
|
||||||
|
lastErr string
|
||||||
|
}
|
||||||
|
|
||||||
|
func New(cfg Config) *Watcher {
|
||||||
|
if cfg.Broker == "" {
|
||||||
|
cfg.Broker = DefaultBroker
|
||||||
|
}
|
||||||
|
if cfg.Logf == nil {
|
||||||
|
cfg.Logf = func(string, ...any) {}
|
||||||
|
}
|
||||||
|
cfg.MyCall = strings.ToUpper(strings.TrimSpace(cfg.MyCall))
|
||||||
|
return &Watcher{cfg: cfg}
|
||||||
|
}
|
||||||
|
|
||||||
|
// message is the payload, the same shape internal/pskr documents.
|
||||||
|
type message struct {
|
||||||
|
Freq int64 `json:"f"`
|
||||||
|
Mode string `json:"md"`
|
||||||
|
SNR int `json:"rp"`
|
||||||
|
TxCall string `json:"sc"`
|
||||||
|
TxGrid string `json:"sl"`
|
||||||
|
RxCall string `json:"rc"`
|
||||||
|
RxGrid string `json:"rl"`
|
||||||
|
Band string `json:"b"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// Start brings the subscription up. Safe to call on a running watcher.
|
||||||
|
func (w *Watcher) Start() error {
|
||||||
|
w.mu.Lock()
|
||||||
|
if w.running {
|
||||||
|
w.mu.Unlock()
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
call := w.cfg.MyCall
|
||||||
|
w.mu.Unlock()
|
||||||
|
if call == "" {
|
||||||
|
return fmt.Errorf("pskrme: no station callsign")
|
||||||
|
}
|
||||||
|
|
||||||
|
opts := mqtt.NewClientOptions().
|
||||||
|
AddBroker(w.cfg.Broker).
|
||||||
|
SetClientID(fmt.Sprintf("opslog-hearme-%d", time.Now().UnixNano())).
|
||||||
|
SetCleanSession(true).
|
||||||
|
SetAutoReconnect(true).
|
||||||
|
SetConnectRetry(true).
|
||||||
|
SetConnectRetryInterval(30 * time.Second).
|
||||||
|
SetConnectTimeout(15 * time.Second).
|
||||||
|
SetOrderMatters(false)
|
||||||
|
// Subscribed on every connect, reconnects included: the session is clean, so
|
||||||
|
// the broker remembers nothing and a silent reconnect would leave a feed
|
||||||
|
// that looks up and delivers nothing for the rest of the evening.
|
||||||
|
opts.OnConnect = func(c mqtt.Client) {
|
||||||
|
// Both wildcards deliberate: every band and every mode. The filter that
|
||||||
|
// matters is the callsign, and an operator wants to know who hears them
|
||||||
|
// wherever they happen to be.
|
||||||
|
topic := "pskr/filter/v2/+/+/" + call + "/#"
|
||||||
|
if tok := c.Subscribe(topic, 0, w.handle); tok.Wait() && tok.Error() != nil {
|
||||||
|
w.setErr(tok.Error().Error())
|
||||||
|
w.cfg.Logf("pskrme: subscribing to %s failed: %v", topic, tok.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
w.mu.Lock()
|
||||||
|
w.topic = topic
|
||||||
|
w.lastErr = ""
|
||||||
|
w.mu.Unlock()
|
||||||
|
w.cfg.Logf("pskrme: watching who reports %s", call)
|
||||||
|
}
|
||||||
|
opts.OnConnectionLost = func(_ mqtt.Client, err error) {
|
||||||
|
w.setErr(err.Error())
|
||||||
|
w.cfg.Logf("pskrme: connection lost: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
client := mqtt.NewClient(opts)
|
||||||
|
if tok := client.Connect(); tok.Wait() && tok.Error() != nil {
|
||||||
|
return fmt.Errorf("pskrme: connect: %w", tok.Error())
|
||||||
|
}
|
||||||
|
w.mu.Lock()
|
||||||
|
w.client, w.running = client, true
|
||||||
|
w.mu.Unlock()
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Stop drops the connection and everything collected. A feed turned off must
|
||||||
|
// not leave a map showing who heard us before it was.
|
||||||
|
func (w *Watcher) Stop() {
|
||||||
|
w.mu.Lock()
|
||||||
|
client, running := w.client, w.running
|
||||||
|
w.client, w.running = nil, false
|
||||||
|
w.reports = nil
|
||||||
|
w.topic = ""
|
||||||
|
w.mu.Unlock()
|
||||||
|
if running && client != nil {
|
||||||
|
client.Disconnect(250)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (w *Watcher) setErr(msg string) {
|
||||||
|
w.mu.Lock()
|
||||||
|
w.lastErr = msg
|
||||||
|
w.mu.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
// handle runs on the MQTT goroutine, so it does the least possible.
|
||||||
|
func (w *Watcher) handle(_ mqtt.Client, m mqtt.Message) {
|
||||||
|
var msg message
|
||||||
|
if err := json.Unmarshal(m.Payload(), &msg); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// The topic filter already guarantees the transmitter, but a receiver with
|
||||||
|
// no callsign or no square cannot be drawn and is not a report of anything.
|
||||||
|
if strings.TrimSpace(msg.RxCall) == "" || len(strings.TrimSpace(msg.RxGrid)) < 4 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
r := Report{
|
||||||
|
Call: strings.ToUpper(strings.TrimSpace(msg.RxCall)),
|
||||||
|
Grid: strings.ToUpper(strings.TrimSpace(msg.RxGrid)),
|
||||||
|
Band: strings.ToLower(strings.TrimSpace(msg.Band)),
|
||||||
|
Mode: strings.ToUpper(strings.TrimSpace(msg.Mode)),
|
||||||
|
SNR: msg.SNR,
|
||||||
|
FreqHz: msg.Freq,
|
||||||
|
At: time.Now(),
|
||||||
|
}
|
||||||
|
w.mu.Lock()
|
||||||
|
w.reports = append(w.reports, r)
|
||||||
|
w.received++
|
||||||
|
// A cap as well as the window, so a pathological feed cannot grow this
|
||||||
|
// without bound between two reads.
|
||||||
|
if len(w.reports) > 4000 {
|
||||||
|
w.reports = w.reports[len(w.reports)-2000:]
|
||||||
|
}
|
||||||
|
w.mu.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Reports is who has heard us inside the window, freshest report per callsign.
|
||||||
|
//
|
||||||
|
// One entry per STATION, not per message: the same receiver uploading every
|
||||||
|
// five minutes is one pair of ears on the map, and its latest report is the one
|
||||||
|
// that says whether the path is still there.
|
||||||
|
func (w *Watcher) Reports() []Report {
|
||||||
|
cutoff := time.Now().Add(-Window)
|
||||||
|
w.mu.Lock()
|
||||||
|
defer w.mu.Unlock()
|
||||||
|
// Pruned on read rather than on a timer: the only thing that cares about the
|
||||||
|
// window is whoever is looking.
|
||||||
|
kept := w.reports[:0]
|
||||||
|
for _, r := range w.reports {
|
||||||
|
if r.At.After(cutoff) {
|
||||||
|
kept = append(kept, r)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
w.reports = kept
|
||||||
|
|
||||||
|
byCall := map[string]int{}
|
||||||
|
out := make([]Report, 0, len(kept))
|
||||||
|
for _, r := range kept {
|
||||||
|
if i, seen := byCall[r.Call]; seen {
|
||||||
|
if r.At.After(out[i].At) {
|
||||||
|
out[i] = r
|
||||||
|
}
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
byCall[r.Call] = len(out)
|
||||||
|
out = append(out, r)
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
// Status reports the connection, for the panel.
|
||||||
|
func (w *Watcher) Status() Status {
|
||||||
|
w.mu.Lock()
|
||||||
|
defer w.mu.Unlock()
|
||||||
|
online := w.running && w.client != nil && w.client.IsConnected()
|
||||||
|
return Status{
|
||||||
|
Enabled: w.running,
|
||||||
|
Online: online,
|
||||||
|
Reports: w.received,
|
||||||
|
Watching: w.cfg.MyCall,
|
||||||
|
Error: w.lastErr,
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,66 @@
|
|||||||
|
package pskrme
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// One station uploading every five minutes must be ONE pair of ears on the map,
|
||||||
|
// showing its freshest report — not four arcs to the same square, and not the
|
||||||
|
// oldest of them deciding whether the path still looks open.
|
||||||
|
func TestReportsKeepsTheFreshestPerStation(t *testing.T) {
|
||||||
|
w := New(Config{MyCall: "F4BPO"})
|
||||||
|
now := time.Now()
|
||||||
|
w.reports = []Report{
|
||||||
|
{Call: "OH5CX", Grid: "KP30", SNR: -18, At: now.Add(-9 * time.Minute)},
|
||||||
|
{Call: "W1AW", Grid: "FN31", SNR: -5, At: now.Add(-2 * time.Minute)},
|
||||||
|
{Call: "OH5CX", Grid: "KP30", SNR: -11, At: now.Add(-1 * time.Minute)},
|
||||||
|
}
|
||||||
|
got := w.Reports()
|
||||||
|
if len(got) != 2 {
|
||||||
|
t.Fatalf("got %d stations, want 2: %+v", len(got), got)
|
||||||
|
}
|
||||||
|
for _, r := range got {
|
||||||
|
if r.Call == "OH5CX" && r.SNR != -11 {
|
||||||
|
t.Errorf("OH5CX kept the %d dB report, want the freshest (-11)", r.SNR)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A report older than the window is gone, and gone from the slice too: the map
|
||||||
|
// must not show a path that stopped existing a quarter of an hour ago, and the
|
||||||
|
// window is what keeps this from growing all evening.
|
||||||
|
func TestReportsDropsWhatIsPastTheWindow(t *testing.T) {
|
||||||
|
w := New(Config{MyCall: "F4BPO"})
|
||||||
|
now := time.Now()
|
||||||
|
w.reports = []Report{
|
||||||
|
{Call: "OLD", Grid: "JN36", At: now.Add(-Window - time.Minute)},
|
||||||
|
{Call: "NEW", Grid: "JN36", At: now.Add(-time.Minute)},
|
||||||
|
}
|
||||||
|
got := w.Reports()
|
||||||
|
if len(got) != 1 || got[0].Call != "NEW" {
|
||||||
|
t.Fatalf("got %+v, want only NEW", got)
|
||||||
|
}
|
||||||
|
if len(w.reports) != 1 {
|
||||||
|
t.Errorf("the stale report is still held: %d kept", len(w.reports))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Turning the feed off clears what it collected. Left in place, switching it
|
||||||
|
// back on would redraw a map of who heard us before it was on.
|
||||||
|
func TestStopForgetsTheReports(t *testing.T) {
|
||||||
|
w := New(Config{MyCall: "F4BPO"})
|
||||||
|
w.reports = []Report{{Call: "OH5CX", Grid: "KP30", At: time.Now()}}
|
||||||
|
w.Stop()
|
||||||
|
if got := w.Reports(); len(got) != 0 {
|
||||||
|
t.Errorf("got %+v after Stop, want nothing", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// No callsign, no subscription: the transmit level would be a wildcard, which
|
||||||
|
// is the entire feed — the one thing this package exists not to ask for.
|
||||||
|
func TestStartRefusesWithoutACallsign(t *testing.T) {
|
||||||
|
if err := New(Config{}).Start(); err == nil {
|
||||||
|
t.Fatal("started with no callsign")
|
||||||
|
}
|
||||||
|
}
|
||||||
+60
-5
@@ -1860,9 +1860,19 @@ type GridSquare struct {
|
|||||||
// return false to drop a QSO. Aggregation to 4 characters happens HERE rather
|
// return false to drop a QSO. Aggregation to 4 characters happens HERE rather
|
||||||
// than in SQL — the column holds 4, 6 and 8-character grids, and lower(substr)
|
// than in SQL — the column holds 4, 6 and 8-character grids, and lower(substr)
|
||||||
// in SQL would differ between SQLite and MySQL for no gain.
|
// in SQL would differ between SQLite and MySQL for no gain.
|
||||||
func (r *Repo) GridSquares(ctx context.Context, keep func(mode string) bool) ([]GridSquare, error) {
|
// GridSquareRow is one contact as the grid map decides whether to keep it.
|
||||||
|
//
|
||||||
|
// Submode is here beside Mode because the mode an operator filters by is not
|
||||||
|
// always the one in MODE: ADIF puts PSK63 in SUBMODE with PSK above it, so a
|
||||||
|
// filter that read MODE alone offered "PSK" for a log full of PSK63.
|
||||||
|
type GridSquareRow struct {
|
||||||
|
Mode, Submode, Band, SatName string
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *Repo) GridSquares(ctx context.Context, keep func(GridSquareRow) bool) ([]GridSquare, error) {
|
||||||
rows, err := r.db.QueryContext(ctx, `
|
rows, err := r.db.QueryContext(ctx, `
|
||||||
SELECT COALESCE(grid,''), UPPER(COALESCE(mode,'')), LOWER(COALESCE(band,'')),
|
SELECT COALESCE(grid,''), UPPER(COALESCE(mode,'')), UPPER(COALESCE(submode,'')),
|
||||||
|
LOWER(COALESCE(band,'')), UPPER(COALESCE(sat_name,'')),
|
||||||
COALESCE(lotw_rcvd,''), COALESCE(qsl_rcvd,''), COALESCE(eqsl_rcvd,'')
|
COALESCE(lotw_rcvd,''), COALESCE(qsl_rcvd,''), COALESCE(eqsl_rcvd,'')
|
||||||
FROM qso
|
FROM qso
|
||||||
WHERE grid IS NOT NULL AND grid != ''
|
WHERE grid IS NOT NULL AND grid != ''
|
||||||
@@ -1873,11 +1883,11 @@ func (r *Repo) GridSquares(ctx context.Context, keep func(mode string) bool) ([]
|
|||||||
defer rows.Close()
|
defer rows.Close()
|
||||||
out := map[string]*GridSquare{}
|
out := map[string]*GridSquare{}
|
||||||
for rows.Next() {
|
for rows.Next() {
|
||||||
var grid, mode, band, lotw, card, eqsl string
|
var grid, mode, submode, band, satName, lotw, card, eqsl string
|
||||||
if err := rows.Scan(&grid, &mode, &band, &lotw, &card, &eqsl); err != nil {
|
if err := rows.Scan(&grid, &mode, &submode, &band, &satName, &lotw, &card, &eqsl); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
if keep != nil && !keep(mode) {
|
if keep != nil && !keep(GridSquareRow{Mode: mode, Submode: submode, Band: band, SatName: satName}) {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
g := strings.ToUpper(strings.TrimSpace(grid))
|
g := strings.ToUpper(strings.TrimSpace(grid))
|
||||||
@@ -1914,6 +1924,51 @@ func (r *Repo) GridSquares(ctx context.Context, keep func(mode string) bool) ([]
|
|||||||
return list, nil
|
return list, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GridSquareChoices is every mode, band and satellite that the squares on the
|
||||||
|
// map were actually worked on.
|
||||||
|
//
|
||||||
|
// Taken from the log rather than from a list in the code, so a filter can only
|
||||||
|
// ever offer something there is something to see behind — and so a mode that
|
||||||
|
// does not exist yet needs no change here the day an operator starts using it.
|
||||||
|
// The mode is the SUBMODE when there is one: PSK63 is the answer, not PSK.
|
||||||
|
func (r *Repo) GridSquareChoices(ctx context.Context) (modes, bands, sats []string, err error) {
|
||||||
|
rows, err := r.db.QueryContext(ctx, `
|
||||||
|
SELECT DISTINCT UPPER(COALESCE(mode,'')), UPPER(COALESCE(submode,'')),
|
||||||
|
LOWER(COALESCE(band,'')), UPPER(COALESCE(sat_name,''))
|
||||||
|
FROM qso
|
||||||
|
WHERE grid IS NOT NULL AND grid != ''`)
|
||||||
|
if err != nil {
|
||||||
|
return nil, nil, nil, fmt.Errorf("query grid choices: %w", err)
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
seenM, seenB, seenS := map[string]bool{}, map[string]bool{}, map[string]bool{}
|
||||||
|
for rows.Next() {
|
||||||
|
var mode, submode, band, sat string
|
||||||
|
if err := rows.Scan(&mode, &submode, &band, &sat); err != nil {
|
||||||
|
return nil, nil, nil, err
|
||||||
|
}
|
||||||
|
if m := strings.TrimSpace(submode); m != "" {
|
||||||
|
mode = m
|
||||||
|
}
|
||||||
|
if mode = strings.TrimSpace(mode); mode != "" && !seenM[mode] {
|
||||||
|
seenM[mode] = true
|
||||||
|
modes = append(modes, mode)
|
||||||
|
}
|
||||||
|
if band = strings.TrimSpace(band); band != "" && !seenB[band] {
|
||||||
|
seenB[band] = true
|
||||||
|
bands = append(bands, band)
|
||||||
|
}
|
||||||
|
if sat = strings.TrimSpace(sat); sat != "" && !seenS[sat] {
|
||||||
|
seenS[sat] = true
|
||||||
|
sats = append(sats, sat)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if err := rows.Err(); err != nil {
|
||||||
|
return nil, nil, nil, err
|
||||||
|
}
|
||||||
|
return modes, bands, sats, nil
|
||||||
|
}
|
||||||
|
|
||||||
// BandSlotQSOs returns every contact on one band that belongs to a slot of the
|
// BandSlotQSOs returns every contact on one band that belongs to a slot of the
|
||||||
// entry matrix: the exact callsign, or any callsign in the same DXCC entity.
|
// entry matrix: the exact callsign, or any callsign in the same DXCC entity.
|
||||||
// Mode is NOT filtered here — the class (phone / CW / digital) is a derived
|
// Mode is NOT filtered here — the class (phone / CW / digital) is a derived
|
||||||
|
|||||||
+187
-43
@@ -1,12 +1,15 @@
|
|||||||
package sat
|
package sat
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"bytes"
|
||||||
_ "embed"
|
_ "embed"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"log"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"sort"
|
"sort"
|
||||||
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
)
|
)
|
||||||
@@ -195,22 +198,44 @@ func LoadBirds(dir string) (*Birds, error) {
|
|||||||
_ = b.parse(shippedBirds)
|
_ = b.parse(shippedBirds)
|
||||||
return b, fmt.Errorf("sat: %s could not be read (%w) — the shipped list is in use for this session, and your file has been left alone", BirdsName, perr)
|
return b, fmt.Errorf("sat: %s could not be read (%w) — the shipped list is in use for this session, and your file has been left alone", BirdsName, perr)
|
||||||
}
|
}
|
||||||
// New satellites reach an EXISTING station too.
|
// New satellites AND corrections reach an existing station.
|
||||||
//
|
//
|
||||||
// The operator's copy is written once, on the first run, and was then
|
// The operator's copy is written on the first run and was then theirs
|
||||||
// theirs for ever — which meant a release that added nine Tevel-2
|
// for ever, which broke both ways: a release that added nine Tevel-2
|
||||||
// satellites reached nobody who had already opened the tab. Merging on
|
// satellites reached nobody who had opened the tab, and a frequency we
|
||||||
// each load fixes that without taking anything back: a satellite the
|
// had shipped WRONG could never be mended — LilacSat-2 went out with an
|
||||||
// operator already has is left exactly as it is, edits included, and
|
// APRS digipeater and no FM transponder, and the wrong data had become
|
||||||
// only the ones they have never seen are added. Deleting a bird from the
|
// the operator's own file.
|
||||||
// file therefore brings it back, which is the price of the trade — and
|
//
|
||||||
// the cheaper half of it, since an unwanted satellite is one row and a
|
// So the merge adds what is missing, replaces what they never touched,
|
||||||
// missing one is a pass nobody can work.
|
// and leaves alone what they edited. See mergeShipped for how the three
|
||||||
if n := b.addMissing(shippedBirds); n > 0 {
|
// are told apart.
|
||||||
|
added, updated, kept, replaced := b.mergeShipped(dir)
|
||||||
|
if added > 0 || updated > 0 {
|
||||||
|
// A one-time copy before the first run that can overwrite an entry
|
||||||
|
// we have no baseline for. Cheap insurance on a file an operator may
|
||||||
|
// have spent an evening correcting.
|
||||||
|
if len(replaced) > 0 {
|
||||||
|
if err := os.WriteFile(path+".bak", data, 0o644); err == nil {
|
||||||
|
log.Printf("sat: %s copied to %s.bak before the plan was brought up to date", BirdsName, BirdsName)
|
||||||
|
}
|
||||||
|
}
|
||||||
if out, merr := json.MarshalIndent(b.list, "", " "); merr == nil {
|
if out, merr := json.MarshalIndent(b.list, "", " "); merr == nil {
|
||||||
_ = os.WriteFile(path, append(out, '\n'), 0o644)
|
_ = os.WriteFile(path, append(out, '\n'), 0o644)
|
||||||
}
|
}
|
||||||
|
log.Printf("sat: frequency plan — %d satellites added, %d brought up to date", added, updated)
|
||||||
}
|
}
|
||||||
|
if len(replaced) > 0 {
|
||||||
|
log.Printf("sat: %s taken from the shipped plan (no record of what this station was given). "+
|
||||||
|
"If one of those was your own correction, it is in %s.bak", strings.Join(replaced, ", "), BirdsName)
|
||||||
|
}
|
||||||
|
if len(kept) > 0 {
|
||||||
|
// Named, not silent: an operator who corrected a frequency should be
|
||||||
|
// able to see that OpsLog noticed and stood down.
|
||||||
|
log.Printf("sat: your own edits kept for %s — delete them from %s to take the shipped plan instead",
|
||||||
|
strings.Join(kept, ", "), BirdsName)
|
||||||
|
}
|
||||||
|
writeBaseline(dir)
|
||||||
return b, nil
|
return b, nil
|
||||||
case os.IsNotExist(err):
|
case os.IsNotExist(err):
|
||||||
if perr := b.parse(shippedBirds); perr != nil {
|
if perr := b.parse(shippedBirds); perr != nil {
|
||||||
@@ -218,6 +243,7 @@ func LoadBirds(dir string) (*Birds, error) {
|
|||||||
}
|
}
|
||||||
if werr := os.MkdirAll(dir, 0o755); werr == nil {
|
if werr := os.MkdirAll(dir, 0o755); werr == nil {
|
||||||
_ = os.WriteFile(path, shippedBirds, 0o644)
|
_ = os.WriteFile(path, shippedBirds, 0o644)
|
||||||
|
writeBaseline(dir)
|
||||||
}
|
}
|
||||||
return b, nil
|
return b, nil
|
||||||
default:
|
default:
|
||||||
@@ -305,51 +331,169 @@ func (b *Birds) Len() int {
|
|||||||
return len(b.list)
|
return len(b.list)
|
||||||
}
|
}
|
||||||
|
|
||||||
// addMissing appends the satellites in `shipped` that this list does not already
|
// BaselineName records the shipped plan as it was last handed to this station.
|
||||||
// hold, and reports how many were added.
|
|
||||||
//
|
//
|
||||||
// "Already hold" is by catalog number first and by the loose name second, so an
|
// It exists so a CORRECTION can reach an operator who already has the file.
|
||||||
// operator who renamed a bird, or who has it under the feed's spelling, does not
|
// Without it the merge could only add satellites, never mend one: LilacSat-2
|
||||||
// get a second copy of it. Nothing existing is touched: their frequencies, their
|
// shipped with an APRS digipeater and no FM transponder, and every station that
|
||||||
// labels and their corrections all stand.
|
// had already opened the satellite tab was stuck with it for ever — the wrong
|
||||||
func (b *Birds) addMissing(shipped []byte) int {
|
// frequency was the operator's file now, and their file was sacred.
|
||||||
|
const BaselineName = "satellites.shipped.json"
|
||||||
|
|
||||||
|
// mergeShipped brings the shipped plan into the operator's list.
|
||||||
|
//
|
||||||
|
// Three cases, and the middle one is the point:
|
||||||
|
//
|
||||||
|
// - A satellite they do not have is ADDED. That is how new birds arrive.
|
||||||
|
// - A satellite they have, UNCHANGED from the plan they were given, is
|
||||||
|
// REPLACED by the current one. They never edited it, so it is not theirs to
|
||||||
|
// keep — it is our data, and ours was wrong.
|
||||||
|
// - A satellite they have EDITED is left exactly as it is, and said so in the
|
||||||
|
// log. A frequency somebody corrected by hand outranks anything shipped:
|
||||||
|
// they were on the air and we were not.
|
||||||
|
//
|
||||||
|
// "Unchanged" is decided against the baseline, so the comparison is with the
|
||||||
|
// plan THEY were given rather than with whatever ships today. Their edits
|
||||||
|
// therefore survive every future release, not just the next one.
|
||||||
|
func (b *Birds) mergeShipped(dir string) (added, updated int, kept, replaced []string) {
|
||||||
var list []Bird
|
var list []Bird
|
||||||
if err := json.Unmarshal(shipped, &list); err != nil {
|
if err := json.Unmarshal(shippedBirds, &list); err != nil {
|
||||||
return 0
|
return 0, 0, nil, nil
|
||||||
}
|
}
|
||||||
|
baseline := readBaseline(dir)
|
||||||
|
|
||||||
b.mu.Lock()
|
b.mu.Lock()
|
||||||
have := make(map[int]bool, len(b.list))
|
byNORAD := map[int]int{} // catalog number → index in b.list
|
||||||
for _, x := range b.list {
|
byName := map[string]int{}
|
||||||
|
for i, x := range b.list {
|
||||||
if x.NORAD != 0 {
|
if x.NORAD != 0 {
|
||||||
have[x.NORAD] = true
|
byNORAD[x.NORAD] = i
|
||||||
}
|
}
|
||||||
}
|
for _, n := range append([]string{x.Name}, x.Aliases...) {
|
||||||
added := 0
|
if k := loose(n); k != "" {
|
||||||
for _, cand := range list {
|
if _, seen := byName[k]; !seen {
|
||||||
if cand.NORAD != 0 && have[cand.NORAD] {
|
byName[k] = i
|
||||||
continue
|
|
||||||
}
|
|
||||||
known := false
|
|
||||||
for _, name := range append([]string{cand.Name}, cand.Aliases...) {
|
|
||||||
if k := loose(name); k != "" {
|
|
||||||
if _, ok := b.byKey[k]; ok {
|
|
||||||
known = true
|
|
||||||
break
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if known {
|
}
|
||||||
|
find := func(c Bird) int {
|
||||||
|
if c.NORAD != 0 {
|
||||||
|
if i, ok := byNORAD[c.NORAD]; ok {
|
||||||
|
return i
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for _, n := range append([]string{c.Name}, c.Aliases...) {
|
||||||
|
if i, ok := byName[loose(n)]; ok {
|
||||||
|
return i
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return -1
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, cand := range list {
|
||||||
|
i := find(cand)
|
||||||
|
if i < 0 {
|
||||||
|
b.list = append(b.list, cand)
|
||||||
|
added++
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
b.list = append(b.list, cand)
|
if sameBird(b.list[i], cand) {
|
||||||
if cand.NORAD != 0 {
|
continue // already current
|
||||||
have[cand.NORAD] = true
|
|
||||||
}
|
}
|
||||||
if k := loose(cand.Name); k != "" {
|
was, hadBaseline := baseline[birdKey(cand)]
|
||||||
b.byKey[k] = len(b.list) - 1
|
switch {
|
||||||
|
case !hadBaseline:
|
||||||
|
// FIRST run after baselines existed, and there is no record of what
|
||||||
|
// this station was given — so an edit of theirs and a mistake of
|
||||||
|
// ours are indistinguishable here.
|
||||||
|
//
|
||||||
|
// The shipped plan wins, ONCE, and the whole file is backed up
|
||||||
|
// first. Standing down instead would have been the safe-looking
|
||||||
|
// choice and the wrong one: the baseline written at the end of this
|
||||||
|
// run would then record their entry as "edited" and freeze a
|
||||||
|
// frequency we know to be wrong for the life of the install. A
|
||||||
|
// backup and a log line are recoverable; that is not.
|
||||||
|
replaced = append(replaced, b.list[i].Name)
|
||||||
|
b.list[i] = cand
|
||||||
|
updated++
|
||||||
|
case sameBird(b.list[i], was):
|
||||||
|
b.list[i] = cand
|
||||||
|
updated++
|
||||||
|
default:
|
||||||
|
kept = append(kept, b.list[i].Name)
|
||||||
}
|
}
|
||||||
added++
|
|
||||||
}
|
}
|
||||||
|
b.reindexLocked()
|
||||||
b.mu.Unlock()
|
b.mu.Unlock()
|
||||||
return added
|
return added, updated, kept, replaced
|
||||||
|
}
|
||||||
|
|
||||||
|
// birdKey identifies a satellite across versions: the catalog number when there
|
||||||
|
// is one, the loose name otherwise.
|
||||||
|
func birdKey(x Bird) string {
|
||||||
|
if x.NORAD != 0 {
|
||||||
|
return "n:" + strconv.Itoa(x.NORAD)
|
||||||
|
}
|
||||||
|
return "s:" + loose(x.Name)
|
||||||
|
}
|
||||||
|
|
||||||
|
// sameBird compares two plans for one satellite by VALUE — the frequencies, the
|
||||||
|
// modes, the tone, the labels. Field by field through JSON rather than one
|
||||||
|
// comparison per field, so a transponder field added later cannot silently drop
|
||||||
|
// out of the test and start reporting equal plans as different.
|
||||||
|
func sameBird(a, c Bird) bool {
|
||||||
|
ja, ea := json.Marshal(a)
|
||||||
|
jc, ec := json.Marshal(c)
|
||||||
|
if ea != nil || ec != nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
return bytes.Equal(ja, jc)
|
||||||
|
}
|
||||||
|
|
||||||
|
// readBaseline loads the shipped plan this station was last given.
|
||||||
|
func readBaseline(dir string) map[string]Bird {
|
||||||
|
out := map[string]Bird{}
|
||||||
|
raw, err := os.ReadFile(filepath.Join(dir, BaselineName))
|
||||||
|
if err != nil {
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
var list []Bird
|
||||||
|
if json.Unmarshal(raw, &list) != nil {
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
for _, x := range list {
|
||||||
|
out[birdKey(x)] = x
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
// writeBaseline records what was shipped, so the NEXT release can tell an
|
||||||
|
// operator's correction from one of ours.
|
||||||
|
func writeBaseline(dir string) {
|
||||||
|
if err := os.MkdirAll(dir, 0o755); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
_ = os.WriteFile(filepath.Join(dir, BaselineName), shippedBirds, 0o644)
|
||||||
|
}
|
||||||
|
|
||||||
|
// reindexLocked rebuilds the name lookup after the list has changed.
|
||||||
|
func (b *Birds) reindexLocked() {
|
||||||
|
byKey := make(map[string]int, len(b.list)*3)
|
||||||
|
put := func(name string, i int) {
|
||||||
|
if k := loose(name); k != "" {
|
||||||
|
if _, seen := byKey[k]; !seen {
|
||||||
|
byKey[k] = i
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for i, bird := range b.list {
|
||||||
|
put(bird.Name, i)
|
||||||
|
}
|
||||||
|
for i, bird := range b.list {
|
||||||
|
for _, a := range bird.Aliases {
|
||||||
|
put(a, i)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
b.byKey = byKey
|
||||||
}
|
}
|
||||||
|
|||||||
+839
-704
File diff suppressed because it is too large
Load Diff
@@ -268,3 +268,146 @@ func TestGeneratedBirdsAreSane(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// The three cases the merge has to tell apart. Getting the middle one wrong is
|
||||||
|
// how LilacSat-2 shipped with no FM transponder and could never be mended.
|
||||||
|
func TestMergeShippedRespectsEditsAndFixesOurs(t *testing.T) {
|
||||||
|
dir := t.TempDir()
|
||||||
|
// First run: the shipped plan and its baseline are written.
|
||||||
|
if _, err := LoadBirds(dir); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if _, err := os.Stat(filepath.Join(dir, BaselineName)); err != nil {
|
||||||
|
t.Fatalf("no baseline was recorded: %v", err)
|
||||||
|
}
|
||||||
|
path := filepath.Join(dir, BirdsName)
|
||||||
|
|
||||||
|
// The operator corrects SO-50's tone and adds a satellite of their own.
|
||||||
|
var list []Bird
|
||||||
|
raw, err := os.ReadFile(path)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if err := json.Unmarshal(raw, &list); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
var untouched Bird
|
||||||
|
for i := range list {
|
||||||
|
if list[i].Name == "SO-50" {
|
||||||
|
list[i].Transponders[0].CTCSS = 74.4
|
||||||
|
}
|
||||||
|
if list[i].Name == "AO-7" {
|
||||||
|
untouched = list[i] // left exactly as shipped
|
||||||
|
}
|
||||||
|
}
|
||||||
|
list = append(list, Bird{Name: "MY-SAT", Transponders: []Transponder{{Label: "mine", Mode: "FM", DownLo: 145000000, UpLo: 435000000}}})
|
||||||
|
out, _ := json.MarshalIndent(list, "", " ")
|
||||||
|
if err := os.WriteFile(path, out, 0o644); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Load again. Nothing shipped has changed, so nothing should move.
|
||||||
|
b, err := LoadBirds(dir)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
got, ok := b.Find("SO-50")
|
||||||
|
if !ok || got.Transponders[0].CTCSS != 74.4 {
|
||||||
|
t.Errorf("the operator's tone was lost: %+v", got.Transponders)
|
||||||
|
}
|
||||||
|
if _, ok := b.Find("MY-SAT"); !ok {
|
||||||
|
t.Error("the operator's own satellite was dropped")
|
||||||
|
}
|
||||||
|
if a, ok := b.Find("AO-7"); !ok || !sameBird(a, untouched) {
|
||||||
|
t.Error("an untouched satellite was altered for no reason")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// An entry the operator never touched is REPLACED when the shipped plan
|
||||||
|
// changes. That is the whole point: our data, and ours was wrong.
|
||||||
|
func TestMergeShippedUpdatesWhatWasNeverEdited(t *testing.T) {
|
||||||
|
dir := t.TempDir()
|
||||||
|
if _, err := LoadBirds(dir); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
path := filepath.Join(dir, BirdsName)
|
||||||
|
|
||||||
|
// Pretend an older release shipped SO-50 with a wrong downlink, and that the
|
||||||
|
// operator simply took it: their file AND the baseline both hold the wrong
|
||||||
|
// value, which is exactly what "never edited" looks like.
|
||||||
|
rewrite := func(p string, mutate func(*Bird)) {
|
||||||
|
raw, err := os.ReadFile(p)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
var l []Bird
|
||||||
|
if err := json.Unmarshal(raw, &l); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
for i := range l {
|
||||||
|
if l[i].Name == "SO-50" {
|
||||||
|
mutate(&l[i])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
out, _ := json.MarshalIndent(l, "", " ")
|
||||||
|
if err := os.WriteFile(p, out, 0o644); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
wrong := func(x *Bird) { x.Transponders[0].DownLo = 1 }
|
||||||
|
rewrite(path, wrong)
|
||||||
|
rewrite(filepath.Join(dir, BaselineName), wrong)
|
||||||
|
|
||||||
|
b, err := LoadBirds(dir)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
got, ok := b.Find("SO-50")
|
||||||
|
if !ok {
|
||||||
|
t.Fatal("SO-50 vanished")
|
||||||
|
}
|
||||||
|
if got.Transponders[0].DownLo == 1 {
|
||||||
|
t.Error("a value the operator never edited was not brought up to date — a shipped mistake is unfixable")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// With NO baseline — the first run after baselines existed — the shipped plan
|
||||||
|
// wins and the file is backed up. Standing down would freeze a known-wrong
|
||||||
|
// frequency for the life of the install.
|
||||||
|
func TestMergeShippedWithNoBaselineTakesShippedAndBacksUp(t *testing.T) {
|
||||||
|
dir := t.TempDir()
|
||||||
|
if _, err := LoadBirds(dir); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
path := filepath.Join(dir, BirdsName)
|
||||||
|
if err := os.Remove(filepath.Join(dir, BaselineName)); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
// A wrong value, with nothing to say whether it is ours or theirs.
|
||||||
|
raw, _ := os.ReadFile(path)
|
||||||
|
var l []Bird
|
||||||
|
if err := json.Unmarshal(raw, &l); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
for i := range l {
|
||||||
|
if l[i].Name == "SO-50" {
|
||||||
|
l[i].Transponders[0].DownLo = 1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
out, _ := json.MarshalIndent(l, "", " ")
|
||||||
|
if err := os.WriteFile(path, out, 0o644); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
b, err := LoadBirds(dir)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
got, _ := b.Find("SO-50")
|
||||||
|
if got.Transponders[0].DownLo == 1 {
|
||||||
|
t.Error("the shipped plan did not take over, so the wrong value is now frozen for ever")
|
||||||
|
}
|
||||||
|
if _, err := os.Stat(path + ".bak"); err != nil {
|
||||||
|
t.Errorf("no backup was written before overwriting: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -741,3 +741,28 @@ func portBusyHint(mode, com string, err error) string {
|
|||||||
}
|
}
|
||||||
return " — another program already has " + com + " open (the SteppIR control window, PstRotator, a terminal). A COM port has one owner: close the other program, then OpsLog can connect."
|
return " — another program already has " + com + " open (the SteppIR control window, PstRotator, a terminal). A COM port has one owner: close the other program, then OpsLog can connect."
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Calibrate runs the controller's calibration: the elements are driven to their
|
||||||
|
// end stops so the controller re-learns where zero is.
|
||||||
|
//
|
||||||
|
// It is the cure for an antenna that tunes to the wrong length after a power cut
|
||||||
|
// mid-move, after the elements have been retracted by hand, or after a motor has
|
||||||
|
// slipped — the controller counts steps from a remembered position, and once
|
||||||
|
// that memory is wrong every frequency after it is wrong by the same amount.
|
||||||
|
//
|
||||||
|
// It takes MINUTES and moves every element the whole way, so it is not something
|
||||||
|
// to do during a contest. Like Retract it drops the controller out of AUTOTRACK,
|
||||||
|
// which is handled transparently: the next SetFrequency re-issues AUTOTRACK ON.
|
||||||
|
func (c *Client) Calibrate() error {
|
||||||
|
// A valid frequency accompanies every SET frame; the controller ignores it
|
||||||
|
// for this command, but a malformed frame is refused outright.
|
||||||
|
khz := c.LastSetKHz()
|
||||||
|
if khz <= 0 {
|
||||||
|
if st, _ := c.GetStatus(); st != nil && st.Frequency > 0 {
|
||||||
|
khz = st.Frequency
|
||||||
|
} else {
|
||||||
|
khz = 14000
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return c.writeCmd(buildSet(khz*1000, DirNormal, 'V'))
|
||||||
|
}
|
||||||
|
|||||||
+1
-1
@@ -21,7 +21,7 @@ import (
|
|||||||
|
|
||||||
const (
|
const (
|
||||||
// appVersion is stamped on every heartbeat (and could feed the About box).
|
// appVersion is stamped on every heartbeat (and could feed the About box).
|
||||||
appVersion = "0.27.22"
|
appVersion = "0.27.23"
|
||||||
|
|
||||||
// posthogHost is the PostHog ingestion endpoint. EU cloud by default; change
|
// posthogHost is the PostHog ingestion endpoint. EU cloud by default; change
|
||||||
// to https://us.i.posthog.com for a US project.
|
// to https://us.i.posthog.com for a US project.
|
||||||
|
|||||||
Reference in New Issue
Block a user