Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5fd3b5b688 | ||
|
|
f582bbab3a | ||
|
|
b40dc8a597 | ||
|
|
14bb92fac0 | ||
|
|
9887b2aa78 | ||
|
|
2adf252942 | ||
|
|
660653ce14 | ||
|
|
f3b607b15a | ||
|
|
ae5aa7b547 | ||
|
|
e8dfa0eaaf | ||
|
|
b53c56d508 | ||
|
|
67c85be23c | ||
|
|
e41a3a4c1c | ||
|
|
e4276ff66e | ||
|
|
1e87081058 | ||
|
|
12b0a861e0 | ||
|
|
712d83a012 | ||
|
|
bd540ef18b | ||
|
|
2f2fced15c | ||
|
|
97ae05d688 | ||
|
|
df1d2767cd | ||
|
|
ed099a660e | ||
|
|
6536d140ba | ||
|
|
b2b93e2839 | ||
|
|
f9113b6ad3 | ||
|
|
e168ab4148 |
@@ -0,0 +1,129 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
// MY_ANTENNA from the Antenna Genius.
|
||||||
|
//
|
||||||
|
// A station with a switch has a truth the log does not: which antenna is
|
||||||
|
// actually connected right now. The working conditions hold what was PLANNED
|
||||||
|
// for the band — the default antenna ticked for 20 m — and that is right until
|
||||||
|
// the operator throws the switch, at which point the log quietly keeps claiming
|
||||||
|
// the other antenna for the rest of the session.
|
||||||
|
//
|
||||||
|
// So, as an option: when the Antenna Genius knows which antenna is selected,
|
||||||
|
// its name wins. The name is the one configured on the device, because that is
|
||||||
|
// the name the operator gave it and the one they will look for in the log.
|
||||||
|
//
|
||||||
|
// WHICH PORT is the whole difficulty. An Antenna Genius has two, A and B, and a
|
||||||
|
// FlexRadio has two transmit antenna jacks, ANT1 and ANT2. The QSO was made on
|
||||||
|
// exactly one of them, and stamping the wrong port's antenna would be worse
|
||||||
|
// than stamping the band default — a wrong answer that looks authoritative. The
|
||||||
|
// radio's own TX antenna selection is what decides.
|
||||||
|
|
||||||
|
import (
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"hamlog/internal/antgenius"
|
||||||
|
"hamlog/internal/applog"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
keyAntGeniusMyAnt = "antgenius.my_antenna" // use the selected antenna as MY_ANTENNA
|
||||||
|
keyAntGeniusPortForA1 = "antgenius.port_for_ant1" // which AG port ANT1 is wired to (1=A, 2=B)
|
||||||
|
)
|
||||||
|
|
||||||
|
// antGeniusPortFor maps the radio's transmit antenna jack to an Antenna Genius
|
||||||
|
// port.
|
||||||
|
//
|
||||||
|
// The wiring is the station's, not something that can be read from either
|
||||||
|
// device: ANT1 usually goes to port A and ANT2 to port B, which is what the
|
||||||
|
// setting defaults to, but a station wired the other way round would otherwise
|
||||||
|
// log every QSO with the other antenna's name.
|
||||||
|
func (a *App) antGeniusPortFor(txAnt string) int {
|
||||||
|
ant1Port := 1
|
||||||
|
if a.settingOr(keyAntGeniusPortForA1, "1") == "2" {
|
||||||
|
ant1Port = 2
|
||||||
|
}
|
||||||
|
other := 3 - ant1Port
|
||||||
|
switch strings.ToUpper(strings.TrimSpace(txAnt)) {
|
||||||
|
case "ANT1", "ANT 1", "1", "A":
|
||||||
|
return ant1Port
|
||||||
|
case "ANT2", "ANT 2", "2", "B":
|
||||||
|
return other
|
||||||
|
}
|
||||||
|
return 0 // XVTR, a rig with one jack, or nothing reported: no port to name
|
||||||
|
}
|
||||||
|
|
||||||
|
// antGeniusAntennaName returns the name of the antenna currently selected on
|
||||||
|
// the port the radio is transmitting through, or "" when it cannot be told.
|
||||||
|
//
|
||||||
|
// Deliberately silent rather than approximate. Every "" here means the log
|
||||||
|
// keeps the band default it would have had anyway, which is a defensible
|
||||||
|
// answer; a guessed port is not.
|
||||||
|
func (a *App) antGeniusAntennaName() string {
|
||||||
|
if a.antgenius == nil {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
st := a.antgenius.GetStatus()
|
||||||
|
if !st.Connected {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
// The jack in use comes from the FlexRadio's own state — TXAnt lives on the
|
||||||
|
// Flex panel state, not on the backend-agnostic RigState, because only a
|
||||||
|
// Flex has named antenna jacks to report.
|
||||||
|
txAnt := ""
|
||||||
|
if a.cat != nil {
|
||||||
|
if fs, ok := a.cat.FlexState(); ok {
|
||||||
|
txAnt = fs.TXAnt
|
||||||
|
}
|
||||||
|
}
|
||||||
|
port := a.antGeniusPortFor(txAnt)
|
||||||
|
if port == 0 {
|
||||||
|
// One switch port in use and no ambiguity about which: a station whose
|
||||||
|
// radio has a single jack still deserves the name. Two ports carrying
|
||||||
|
// different antennas with nothing to choose between them does not.
|
||||||
|
if st.PortA > 0 && st.PortB == 0 {
|
||||||
|
port = 1
|
||||||
|
} else if st.PortB > 0 && st.PortA == 0 {
|
||||||
|
port = 2
|
||||||
|
} else {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
idx := st.PortA
|
||||||
|
if port == 2 {
|
||||||
|
idx = st.PortB
|
||||||
|
}
|
||||||
|
if idx <= 0 {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
return antGeniusNameOf(st, idx)
|
||||||
|
}
|
||||||
|
|
||||||
|
// antGeniusNameOf looks an antenna index up in the device's own list.
|
||||||
|
func antGeniusNameOf(st antgenius.Status, idx int) string {
|
||||||
|
for _, ant := range st.Antennas {
|
||||||
|
if ant.Index == idx {
|
||||||
|
return strings.TrimSpace(ant.Name)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
// applyAntGeniusAntenna overrides MY_ANTENNA with the switch's selection, when
|
||||||
|
// the option is on.
|
||||||
|
//
|
||||||
|
// Called at log time rather than while the entry form is open: an operator who
|
||||||
|
// changes antenna mid-QSO is telling us what the contact was actually made on,
|
||||||
|
// and the value that matters is the one at the moment it is logged.
|
||||||
|
func (a *App) applyAntGeniusAntenna(myAntenna *string) {
|
||||||
|
if myAntenna == nil || a.settingOr(keyAntGeniusMyAnt, "") != "1" {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
name := a.antGeniusAntennaName()
|
||||||
|
if name == "" {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if *myAntenna != name {
|
||||||
|
applog.Printf("antgenius: MY_ANTENNA %q → %q (the antenna selected on the switch)", *myAntenna, name)
|
||||||
|
}
|
||||||
|
*myAntenna = name
|
||||||
|
}
|
||||||
@@ -0,0 +1,55 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"hamlog/internal/antgenius"
|
||||||
|
)
|
||||||
|
|
||||||
|
// The switch has two ports and the radio two antenna jacks; a QSO was made
|
||||||
|
// through exactly one of them. Naming the wrong port's antenna would be worse
|
||||||
|
// than naming the band default — it is a wrong answer that looks authoritative.
|
||||||
|
func TestAntennaNameComesFromTheDeviceList(t *testing.T) {
|
||||||
|
st := antgenius.Status{
|
||||||
|
Connected: true,
|
||||||
|
PortA: 2,
|
||||||
|
PortB: 5,
|
||||||
|
Antennas: []antgenius.Antenna{
|
||||||
|
{Index: 2, Name: "OB11-5 20/15/10"},
|
||||||
|
{Index: 5, Name: "Vertical 80m"},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
if got := antGeniusNameOf(st, 2); got != "OB11-5 20/15/10" {
|
||||||
|
t.Fatalf("port A antenna = %q", got)
|
||||||
|
}
|
||||||
|
if got := antGeniusNameOf(st, 5); got != "Vertical 80m" {
|
||||||
|
t.Fatalf("port B antenna = %q", got)
|
||||||
|
}
|
||||||
|
// An index the device never described has no name to give, and inventing
|
||||||
|
// one ("Antenna 7") would put a label in the log that exists nowhere else.
|
||||||
|
if got := antGeniusNameOf(st, 7); got != "" {
|
||||||
|
t.Fatalf("unknown index produced %q", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The jack-to-port wiring is the station's own. Defaulting ANT1 to port A is a
|
||||||
|
// convention, not a fact, so it is a setting — and the mapping has to hold both
|
||||||
|
// ways round.
|
||||||
|
func TestJackToPortMapping(t *testing.T) {
|
||||||
|
app := &App{}
|
||||||
|
// No settings store: settingOr falls back, which is ANT1 → port A.
|
||||||
|
if got := app.antGeniusPortFor("ANT1"); got != 1 {
|
||||||
|
t.Fatalf("ANT1 mapped to port %d, want A(1)", got)
|
||||||
|
}
|
||||||
|
if got := app.antGeniusPortFor("ANT2"); got != 2 {
|
||||||
|
t.Fatalf("ANT2 mapped to port %d, want B(2)", got)
|
||||||
|
}
|
||||||
|
// A jack that is neither — a transverter port, or a rig that reports
|
||||||
|
// nothing — has no port to name, and saying so beats guessing.
|
||||||
|
if got := app.antGeniusPortFor("XVTR"); got != 0 {
|
||||||
|
t.Fatalf("XVTR mapped to port %d, want none", got)
|
||||||
|
}
|
||||||
|
if got := app.antGeniusPortFor(""); got != 0 {
|
||||||
|
t.Fatalf("an unreported jack mapped to port %d, want none", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -106,6 +106,7 @@ const (
|
|||||||
keyListsRSTPhone = "lists.rst_phone"
|
keyListsRSTPhone = "lists.rst_phone"
|
||||||
keyListsRSTCW = "lists.rst_cw"
|
keyListsRSTCW = "lists.rst_cw"
|
||||||
keyListsRSTDigital = "lists.rst_digital"
|
keyListsRSTDigital = "lists.rst_digital"
|
||||||
|
keyListsSatellites = "lists.satellites" // the satellites this station works (SAT_NAME dropdown)
|
||||||
|
|
||||||
keyCATEnabled = "cat.enabled"
|
keyCATEnabled = "cat.enabled"
|
||||||
keyCATBackend = "cat.backend" // "omnirig" | "flex"
|
keyCATBackend = "cat.backend" // "omnirig" | "flex"
|
||||||
@@ -132,8 +133,15 @@ const (
|
|||||||
keyCATYaesuPort = "cat.yaesu.port" // Yaesu CAT serial port (e.g. COM4)
|
keyCATYaesuPort = "cat.yaesu.port" // Yaesu CAT serial port (e.g. COM4)
|
||||||
keyCATYaesuBaud = "cat.yaesu.baud" // Yaesu CAT baud (FTDX10/101 default 38400)
|
keyCATYaesuBaud = "cat.yaesu.baud" // Yaesu CAT baud (FTDX10/101 default 38400)
|
||||||
keyCATKenwoodHost = "cat.kenwood.host" // Kenwood CAT over a network serial bridge (ser2net), "host:port"
|
keyCATKenwoodHost = "cat.kenwood.host" // Kenwood CAT over a network serial bridge (ser2net), "host:port"
|
||||||
keyCATKenwoodPort = "cat.kenwood.port" // Kenwood CAT serial port (TS-590/890/2000, Elecraft)
|
// keyCATKenwoodLink says HOW the radio is reached: "usb" (a COM port),
|
||||||
keyCATKenwoodBaud = "cat.kenwood.baud" // Kenwood CAT baud (TS-590 default 9600, TS-890 115200)
|
// "bridge" (the same CAT bytes over TCP — ser2net, an Ethernet-serial
|
||||||
|
// adapter), or "native" (the radio's own network protocol). Kept apart from
|
||||||
|
// the address because the three are different transports, and inferring the
|
||||||
|
// choice from whether a field happened to be filled in is how an operator
|
||||||
|
// ends up with a host typed in and a radio that never answers.
|
||||||
|
keyCATKenwoodLink = "cat.kenwood.link"
|
||||||
|
keyCATKenwoodPort = "cat.kenwood.port" // Kenwood CAT serial port (TS-590/890/2000, Elecraft)
|
||||||
|
keyCATKenwoodBaud = "cat.kenwood.baud" // Kenwood CAT baud (TS-590 default 9600, TS-890 115200)
|
||||||
// One key PER BACKEND, deliberately not shared. A Xiegu fix that reached
|
// One key PER BACKEND, deliberately not shared. A Xiegu fix that reached
|
||||||
// into the Yaesu and Kenwood backends is what broke them in 0.22.7/0.22.8;
|
// into the Yaesu and Kenwood backends is what broke them in 0.22.7/0.22.8;
|
||||||
// the rule since is that nothing a backend does may be steered by another
|
// the rule since is that nothing a backend does may be steered by another
|
||||||
@@ -457,6 +465,9 @@ type CATSettings struct {
|
|||||||
KenwoodHost string `json:"kenwood_host"` // "host:port" of a serial-over-network bridge (ser2net, Ethernet-serial
|
KenwoodHost string `json:"kenwood_host"` // "host:port" of a serial-over-network bridge (ser2net, Ethernet-serial
|
||||||
// adapter). NOT the radio’s own RJ45, which speaks Kenwood’s KNS/ARCP.
|
// adapter). NOT the radio’s own RJ45, which speaks Kenwood’s KNS/ARCP.
|
||||||
KenwoodPort string `json:"kenwood_port"` // Kenwood CAT serial port (TS-590/890/2000, Elecraft)
|
KenwoodPort string `json:"kenwood_port"` // Kenwood CAT serial port (TS-590/890/2000, Elecraft)
|
||||||
|
// KenwoodLink: "usb" | "bridge" | "native". Empty means usb, unless a host
|
||||||
|
// was already configured by an older build — see GetCATSettings.
|
||||||
|
KenwoodLink string `json:"kenwood_link"`
|
||||||
KenwoodBaud int `json:"kenwood_baud"` // Kenwood CAT baud (TS-590 default 9600)
|
KenwoodBaud int `json:"kenwood_baud"` // Kenwood CAT baud (TS-590 default 9600)
|
||||||
// What a DATA/digital mode (FT8, PSK…) sets on the rig: "usb" (default), "data"
|
// What a DATA/digital mode (FT8, PSK…) sets on the rig: "usb" (default), "data"
|
||||||
// (MD6 — Elecraft K3/K4 DATA mode) or "keep" (leave the rig's mode untouched,
|
// (MD6 — Elecraft K3/K4 DATA mode) or "keep" (leave the rig's mode untouched,
|
||||||
@@ -516,6 +527,12 @@ type ListsSettings struct {
|
|||||||
RSTPhone []string `json:"rst_phone"` // RS reports for phone modes
|
RSTPhone []string `json:"rst_phone"` // RS reports for phone modes
|
||||||
RSTCW []string `json:"rst_cw"` // RST reports for CW/RTTY/PSK
|
RSTCW []string `json:"rst_cw"` // RST reports for CW/RTTY/PSK
|
||||||
RSTDigital []string `json:"rst_digital"` // dB reports for FT8/FT4/JT…
|
RSTDigital []string `json:"rst_digital"` // dB reports for FT8/FT4/JT…
|
||||||
|
// Satellites the station works, offered as a dropdown on the satellite
|
||||||
|
// fields. A list rather than free text because SAT_NAME is matched
|
||||||
|
// character for character by the awards and by LoTW: "AO-91" and "AO91"
|
||||||
|
// are two different satellites to everything downstream, and typing it
|
||||||
|
// afresh on every pass is how one of them appears in a log.
|
||||||
|
Satellites []string `json:"satellites"`
|
||||||
}
|
}
|
||||||
|
|
||||||
var defaultBands = []string{
|
var defaultBands = []string{
|
||||||
@@ -781,8 +798,8 @@ type App struct {
|
|||||||
// so closing the QSL Manager — or starting another download — stops the previous
|
// so closing the QSL Manager — or starting another download — stops the previous
|
||||||
// one instead of leaving it running against the app-lifetime context (which made
|
// one instead of leaving it running against the app-lifetime context (which made
|
||||||
// a still-running QRZ sync bleed its log into a freshly started LoTW download).
|
// a still-running QRZ sync bleed its log into a freshly started LoTW download).
|
||||||
confDLMu sync.Mutex
|
confDLMu sync.Mutex
|
||||||
confDLCancel context.CancelFunc
|
confDLCancel context.CancelFunc
|
||||||
|
|
||||||
// hamlogUnmatched holds the confirmations the last HAMLOG.online import
|
// hamlogUnmatched holds the confirmations the last HAMLOG.online import
|
||||||
// could not place onto a QSO, kept so they can be exported and worked
|
// could not place onto a QSO, kept so they can be exported and worked
|
||||||
@@ -790,31 +807,31 @@ type App struct {
|
|||||||
// accumulated: it describes one run, not a history.
|
// accumulated: it describes one run, not a history.
|
||||||
hamlogUnmatchedMu sync.Mutex
|
hamlogUnmatchedMu sync.Mutex
|
||||||
hamlogUnmatched []qso.QSO
|
hamlogUnmatched []qso.QSO
|
||||||
udpLogMu sync.Mutex // serialises UDP auto-log so concurrent packets can't both pass the dedup check
|
udpLogMu sync.Mutex // serialises UDP auto-log so concurrent packets can't both pass the dedup check
|
||||||
adifMonMu sync.Mutex // guards the ADIF-monitor config (file list + per-file read offsets)
|
adifMonMu sync.Mutex // guards the ADIF-monitor config (file list + per-file read offsets)
|
||||||
syncMu sync.Mutex // serialises folder synchronisation: config, the seq counter, and the append to our own file
|
syncMu sync.Mutex // serialises folder synchronisation: config, the seq counter, and the append to our own file
|
||||||
syncSent int64 // changes written to the folder this session
|
syncSent int64 // changes written to the folder this session
|
||||||
syncReceived int64 // changes taken from the other machines this session
|
syncReceived int64 // changes taken from the other machines this session
|
||||||
syncLast time.Time // last completed pass, for the status panel
|
syncLast time.Time // last completed pass, for the status panel
|
||||||
syncErr string // last folder error, shown in settings — a share that dropped is otherwise invisible
|
syncErr string // last folder error, shown in settings — a share that dropped is otherwise invisible
|
||||||
relayAutoMu sync.Mutex // serialises relay auto-control evaluation
|
relayAutoMu sync.Mutex // serialises relay auto-control evaluation
|
||||||
relayAutoLast map[string]bool // deviceID|relay → last applied on/off, so we only switch on a real change
|
relayAutoLast map[string]bool // deviceID|relay → last applied on/off, so we only switch on a real change
|
||||||
relayAutoOn atomic.Bool // cached "auto-control enabled" so the CAT hot path skips work when off
|
relayAutoOn atomic.Bool // cached "auto-control enabled" so the CAT hot path skips work when off
|
||||||
relayDrvMu sync.Mutex // guards the cached relay drivers below
|
relayDrvMu sync.Mutex // guards the cached relay drivers below
|
||||||
relayDrv map[string]cachedRelay // deviceID → live driver (reused across polls; stateful boards can't be reopened per call)
|
relayDrv map[string]cachedRelay // deviceID → live driver (reused across polls; stateful boards can't be reopened per call)
|
||||||
pttPort serial.Port // open serial port while PTT (RTS/DTR) is asserted
|
pttPort serial.Port // open serial port while PTT (RTS/DTR) is asserted
|
||||||
pttKeyedMethod string // "cat" | "rts" | "dtr" while keyed; "" when idle
|
pttKeyedMethod string // "cat" | "rts" | "dtr" while keyed; "" when idle
|
||||||
pttGen int64 // bumped on every key; a delayed unkey only fires if unchanged (guards against a stale release cutting a new transmission)
|
pttGen int64 // bumped on every key; a delayed unkey only fires if unchanged (guards against a stale release cutting a new transmission)
|
||||||
startupErr string // captured for surfacing to the frontend
|
startupErr string // captured for surfacing to the frontend
|
||||||
settingsScoped atomic.Bool // true once a.settings is scoped to the active profile — GetUIPref/SetUIPref (per-profile) must wait for it, else an early call reads the wrong scope and e.g. resets the theme
|
settingsScoped atomic.Bool // true once a.settings is scoped to the active profile — GetUIPref/SetUIPref (per-profile) must wait for it, else an early call reads the wrong scope and e.g. resets the theme
|
||||||
dbPath string // settings/config database file (settings + profiles); may be a user-chosen location
|
dbPath string // settings/config database file (settings + profiles); may be a user-chosen location
|
||||||
logbookPath string // default SQLite logbook file (QSOs), next to the settings db — used when a profile doesn't point elsewhere
|
logbookPath string // default SQLite logbook file (QSOs), next to the settings db — used when a profile doesn't point elsewhere
|
||||||
logDbPath string // resolved SQLite file actually backing logDb ("" on MySQL, or when the settings db serves as the logbook) — the file the backup snapshots
|
logDbPath string // resolved SQLite file actually backing logDb ("" on MySQL, or when the settings db serves as the logbook) — the file the backup snapshots
|
||||||
logDb *sql.DB // QSO logbook connection — MySQL, a per-profile SQLite file, or the default logbook.db (never the settings db, except on fallback)
|
logDb *sql.DB // QSO logbook connection — MySQL, a per-profile SQLite file, or the default logbook.db (never the settings db, except on fallback)
|
||||||
dbBackend string // "sqlite" | "mysql" — the logbook backend actually opened at startup
|
dbBackend string // "sqlite" | "mysql" — the logbook backend actually opened at startup
|
||||||
dbBackendErr string // non-empty when a configured MySQL backend failed and we fell back to SQLite
|
dbBackendErr string // non-empty when a configured MySQL backend failed and we fell back to SQLite
|
||||||
offlineQ *offlineq.Queue // ADIF outbox: QSOs logged while the DB was unreachable
|
offlineQ *offlineq.Queue // ADIF outbox: QSOs logged while the DB was unreachable
|
||||||
offlineMode bool // last write failed because the DB was unreachable
|
offlineMode bool // last write failed because the DB was unreachable
|
||||||
|
|
||||||
catFlexSpots bool // push cluster spots to the FlexRadio panadapter
|
catFlexSpots bool // push cluster spots to the FlexRadio panadapter
|
||||||
catFlexDVKDax bool // raise the Flex transmit DAX button around a voice message
|
catFlexDVKDax bool // raise the Flex transmit DAX button around a voice message
|
||||||
@@ -977,6 +994,11 @@ func NewApp() *App { return &App{} }
|
|||||||
|
|
||||||
func (a *App) startup(ctx context.Context) {
|
func (a *App) startup(ctx context.Context) {
|
||||||
a.ctx = ctx
|
a.ctx = ctx
|
||||||
|
// One line in the startup log too, not only in OpsLog's own: the two
|
||||||
|
// together say whether a launch that produced no window got as far as our
|
||||||
|
// code at all, which is the fork every "it does not start" report turns on.
|
||||||
|
startupReached.Store(true)
|
||||||
|
bootLog("OnStartup reached")
|
||||||
|
|
||||||
dataDir, err := userDataDir()
|
dataDir, err := userDataDir()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -1537,6 +1559,8 @@ func (a *App) startup(ctx context.Context) {
|
|||||||
// it — it appears already sized and positioned, never jumping into place after
|
// it — it appears already sized and positioned, never jumping into place after
|
||||||
// launch. Show is unconditional: whatever happens above, the window must appear.
|
// launch. Show is unconditional: whatever happens above, the window must appear.
|
||||||
func (a *App) domReady(ctx context.Context) {
|
func (a *App) domReady(ctx context.Context) {
|
||||||
|
bootLog("OnDomReady reached — the window has painted")
|
||||||
|
clearLaunchMarker()
|
||||||
a.restoreWindowPosition()
|
a.restoreWindowPosition()
|
||||||
wruntime.WindowShow(ctx)
|
wruntime.WindowShow(ctx)
|
||||||
// The one number that matches what the operator actually experiences: click
|
// The one number that matches what the operator actually experiences: click
|
||||||
@@ -2101,6 +2125,7 @@ func (a *App) restoreWindowPosition() {
|
|||||||
if a.ctx == nil {
|
if a.ctx == nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
logMonitorLayout()
|
||||||
ws, ok := readWindowState(a.dataDir)
|
ws, ok := readWindowState(a.dataDir)
|
||||||
if !ok {
|
if !ok {
|
||||||
applog.Printf("window: no saved geometry — opening where Windows puts it")
|
applog.Printf("window: no saved geometry — opening where Windows puts it")
|
||||||
@@ -2139,8 +2164,19 @@ func (a *App) restoreWindowPosition() {
|
|||||||
// forever — with no way back short of deleting window.json, which nobody
|
// forever — with no way back short of deleting window.json, which nobody
|
||||||
// knows to do. Fall back to the default placement instead.
|
// knows to do. Fall back to the default placement instead.
|
||||||
if !onSomeMonitor(ws.X, ws.Y, ws.Width, ws.Height) {
|
if !onSomeMonitor(ws.X, ws.Y, ws.Width, ws.Height) {
|
||||||
applog.Printf("window: saved position %d,%d (%dx%d) is off every monitor — opening at the default placement",
|
// Moved onto the nearest monitor rather than handed back to Windows.
|
||||||
ws.X, ws.Y, ws.Width, ws.Height)
|
// Giving up lost the size as well as the position and dropped the window
|
||||||
|
// on the primary screen wherever Windows felt like; clamping keeps the
|
||||||
|
// window the operator had, somewhere they can see it.
|
||||||
|
nx, ny, moved := clampToVisible(ws.X, ws.Y, ws.Width, ws.Height)
|
||||||
|
if !moved {
|
||||||
|
applog.Printf("window: saved position %d,%d (%dx%d) is off every monitor and no monitor could be read — opening at the default placement",
|
||||||
|
ws.X, ws.Y, ws.Width, ws.Height)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
applog.Printf("window: saved position %d,%d is off every monitor (%s) — moved to %d,%d",
|
||||||
|
ws.X, ws.Y, describeMonitors(monitorRects()), nx, ny)
|
||||||
|
wruntime.WindowSetPosition(a.ctx, nx, ny)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
wruntime.WindowSetPosition(a.ctx, ws.X, ws.Y)
|
wruntime.WindowSetPosition(a.ctx, ws.X, ws.Y)
|
||||||
@@ -2151,13 +2187,7 @@ func (a *App) restoreWindowPosition() {
|
|||||||
// pixel: a window overlapping the screen edge by 2 px is, in practice, as lost
|
// pixel: a window overlapping the screen edge by 2 px is, in practice, as lost
|
||||||
// as one entirely outside it. When the desktop bounds can't be read, it says yes
|
// as one entirely outside it. When the desktop bounds can't be read, it says yes
|
||||||
// — better to honour the operator's saved position than to second-guess it.
|
// — better to honour the operator's saved position than to second-guess it.
|
||||||
func onSomeMonitor(x, y, w, h int) bool {
|
func onSomeMonitor(x, y, w, h int) bool { return onSomeMonitorImpl(x, y, w, h) }
|
||||||
vx, vy, vw, vh, ok := virtualScreenBounds()
|
|
||||||
if !ok {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
return overlapsEnough(x, y, w, h, vx, vy, vw, vh)
|
|
||||||
}
|
|
||||||
|
|
||||||
// overlapsEnough is the geometry behind onSomeMonitor, split out so it can be
|
// overlapsEnough is the geometry behind onSomeMonitor, split out so it can be
|
||||||
// tested — the virtual desktop origin is NEGATIVE when a monitor sits left of or
|
// tested — the virtual desktop origin is NEGATIVE when a monitor sits left of or
|
||||||
@@ -3324,6 +3354,9 @@ func (a *App) applyStationDefaults(q *qso.QSO, includeIdentity bool) {
|
|||||||
if q.MyAntenna == "" {
|
if q.MyAntenna == "" {
|
||||||
q.MyAntenna = p.MyAntenna
|
q.MyAntenna = p.MyAntenna
|
||||||
}
|
}
|
||||||
|
// The switch has the last word, when asked to: everything above is what was
|
||||||
|
// PLANNED for this band, and the Antenna Genius knows what is connected.
|
||||||
|
a.applyAntGeniusAntenna(&q.MyAntenna)
|
||||||
if q.TXPower == nil && p.TxPower != nil {
|
if q.TXPower == nil && p.TxPower != nil {
|
||||||
v := *p.TxPower
|
v := *p.TxPower
|
||||||
q.TXPower = &v
|
q.TXPower = &v
|
||||||
@@ -8035,27 +8068,30 @@ func (a *App) GetCATSettings() (CATSettings, error) {
|
|||||||
if a.settings == nil {
|
if a.settings == nil {
|
||||||
return CATSettings{Backend: "omnirig", OmniRigNum: 1, PollMs: 250}, fmt.Errorf("db not initialized")
|
return CATSettings{Backend: "omnirig", OmniRigNum: 1, PollMs: 250}, fmt.Errorf("db not initialized")
|
||||||
}
|
}
|
||||||
m, err := a.settings.GetMany(a.ctx, keyCATEnabled, keyCATBackend, keyCATOmniRigNum, keyCATOmniRigVFO, keyCATFlexHost, keyCATFlexPort, keyCATFlexSpots, keyCATFlexDVKDax, keyCATFlexDecodeSpots, keyCATFlexDecodeSecs, keyCATXieguPort, keyCATXieguBaud, keyCATXieguAddr, keyCATXieguPTTLine, keyCATYaesuPort, keyCATYaesuBaud, keyCATKenwoodPort, keyCATKenwoodBaud, keyCATKenwoodHost, keyCATYaesuLowLines, keyCATKenwoodLowLines, keyCATKenwoodDataMode, keyCATIcomPort, keyCATIcomBaud, keyCATIcomAddr, keyCATIcomNetHost, keyCATIcomNetUser, keyCATIcomNetPass, keyCATIcomNetAudio, keyCATTCIHost, keyCATTCIPort, keyCATTCISpots, keyCATPttHotkeyEnabled, keyCATPttHotkey, keyCATPttHotkeyToggle, keyCATPollMs, keyCATDelayMs, keyCATOffsetOn, keyCATOffsetHz, keyCATDigitalDefault, keyCATShareEnabled, keyCATSharePort, keyCATShareProto, keyCATShareTCIPort)
|
m, err := a.settings.GetMany(a.ctx, keyCATEnabled, keyCATBackend, keyCATOmniRigNum, keyCATOmniRigVFO, keyCATFlexHost, keyCATFlexPort, keyCATFlexSpots, keyCATFlexDVKDax, keyCATFlexDecodeSpots, keyCATFlexDecodeSecs, keyCATXieguPort, keyCATXieguBaud, keyCATXieguAddr, keyCATXieguPTTLine, keyCATYaesuPort, keyCATYaesuBaud, keyCATKenwoodPort, keyCATKenwoodBaud, keyCATKenwoodHost, keyCATKenwoodLink, keyCATYaesuLowLines, keyCATKenwoodLowLines, keyCATKenwoodDataMode, keyCATIcomPort, keyCATIcomBaud, keyCATIcomAddr, keyCATIcomNetHost, keyCATIcomNetUser, keyCATIcomNetPass, keyCATIcomNetAudio, keyCATTCIHost, keyCATTCIPort, keyCATTCISpots, keyCATPttHotkeyEnabled, keyCATPttHotkey, keyCATPttHotkeyToggle, keyCATPollMs, keyCATDelayMs, keyCATOffsetOn, keyCATOffsetHz, keyCATDigitalDefault, keyCATShareEnabled, keyCATSharePort, keyCATShareProto, keyCATShareTCIPort)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return CATSettings{}, err
|
return CATSettings{}, err
|
||||||
}
|
}
|
||||||
out := CATSettings{
|
out := CATSettings{
|
||||||
Enabled: m[keyCATEnabled] == "1",
|
Enabled: m[keyCATEnabled] == "1",
|
||||||
Backend: m[keyCATBackend],
|
Backend: m[keyCATBackend],
|
||||||
OmniRigNum: 1,
|
OmniRigNum: 1,
|
||||||
FlexHost: m[keyCATFlexHost],
|
FlexHost: m[keyCATFlexHost],
|
||||||
FlexPort: 4992,
|
FlexPort: 4992,
|
||||||
FlexSpots: m[keyCATFlexSpots] == "1",
|
FlexSpots: m[keyCATFlexSpots] == "1",
|
||||||
FlexDVKDax: m[keyCATFlexDVKDax] == "1",
|
FlexDVKDax: m[keyCATFlexDVKDax] == "1",
|
||||||
FlexDecodeSpots: m[keyCATFlexDecodeSpots] == "1",
|
FlexDecodeSpots: m[keyCATFlexDecodeSpots] == "1",
|
||||||
FlexDecodeSecs: 120,
|
FlexDecodeSecs: 120,
|
||||||
XieguPort: m[keyCATXieguPort],
|
XieguPort: m[keyCATXieguPort],
|
||||||
XieguBaud: 19200,
|
XieguBaud: 19200,
|
||||||
XieguAddr: cat.XieguDefaultAddr,
|
XieguAddr: cat.XieguDefaultAddr,
|
||||||
YaesuPort: m[keyCATYaesuPort],
|
YaesuPort: m[keyCATYaesuPort],
|
||||||
YaesuBaud: 38400,
|
YaesuBaud: 38400,
|
||||||
KenwoodPort: m[keyCATKenwoodPort],
|
KenwoodPort: m[keyCATKenwoodPort],
|
||||||
KenwoodHost: m[keyCATKenwoodHost],
|
KenwoodHost: m[keyCATKenwoodHost],
|
||||||
|
// An install that predates the setting is read from what it has: a host
|
||||||
|
// filled in meant the bridge, since that is what the old code preferred.
|
||||||
|
KenwoodLink: kenwoodLinkOr(m[keyCATKenwoodLink], m[keyCATKenwoodHost]),
|
||||||
KenwoodBaud: 9600,
|
KenwoodBaud: 9600,
|
||||||
YaesuLowLines: m[keyCATYaesuLowLines] == "1",
|
YaesuLowLines: m[keyCATYaesuLowLines] == "1",
|
||||||
KenwoodLowLines: m[keyCATKenwoodLowLines] == "1",
|
KenwoodLowLines: m[keyCATKenwoodLowLines] == "1",
|
||||||
@@ -8255,6 +8291,7 @@ func (a *App) SaveCATSettings(s CATSettings) error {
|
|||||||
keyCATYaesuBaud: strconv.Itoa(s.YaesuBaud),
|
keyCATYaesuBaud: strconv.Itoa(s.YaesuBaud),
|
||||||
keyCATKenwoodPort: strings.TrimSpace(s.KenwoodPort),
|
keyCATKenwoodPort: strings.TrimSpace(s.KenwoodPort),
|
||||||
keyCATKenwoodHost: strings.TrimSpace(s.KenwoodHost),
|
keyCATKenwoodHost: strings.TrimSpace(s.KenwoodHost),
|
||||||
|
keyCATKenwoodLink: kenwoodLinkOr(s.KenwoodLink, s.KenwoodHost),
|
||||||
keyCATKenwoodBaud: strconv.Itoa(s.KenwoodBaud),
|
keyCATKenwoodBaud: strconv.Itoa(s.KenwoodBaud),
|
||||||
keyCATYaesuLowLines: b01(s.YaesuLowLines),
|
keyCATYaesuLowLines: b01(s.YaesuLowLines),
|
||||||
keyCATKenwoodLowLines: b01(s.KenwoodLowLines),
|
keyCATKenwoodLowLines: b01(s.KenwoodLowLines),
|
||||||
@@ -15190,37 +15227,38 @@ func (a *App) reloadCAT() {
|
|||||||
yz := cat.NewYaesu(s.YaesuPort, s.YaesuBaud, s.DigitalDefault)
|
yz := cat.NewYaesu(s.YaesuPort, s.YaesuBaud, s.DigitalDefault)
|
||||||
yz.SetLowerLines(s.YaesuLowLines)
|
yz.SetLowerLines(s.YaesuLowLines)
|
||||||
a.cat.Start(yz)
|
a.cat.Start(yz)
|
||||||
case "kenwood":
|
case "kenwood", "elecraft":
|
||||||
// Native Kenwood CAT — TS-590/890/990/2000 and everything that speaks the
|
// Native Kenwood CAT — TS-590/890/990/2000 and everything that speaks the
|
||||||
// same dialect (Elecraft K3/K4, and the "Kenwood" setting on other rigs).
|
// same dialect, the Elecraft K3/K4 included: the K3 emulates the Kenwood
|
||||||
// One IF; frame carries frequency, mode, VFO and split, so the poll costs a
|
// command set, so one transport serves both and the Elecraft flag only
|
||||||
// single round trip where OmniRig needed a rig file to describe each one.
|
// turns on its specifics (digital modes → DATA A via MD6+DT0).
|
||||||
// A network address wins over the COM port when both are filled: it is the
|
elecraft := s.Backend == "elecraft"
|
||||||
// more deliberate setting, and silently preferring the wire would leave an
|
switch kenwoodLinkOr(s.KenwoodLink, s.KenwoodHost) {
|
||||||
// operator staring at a host they typed and a radio that never answers.
|
case kenwoodLinkNative:
|
||||||
if h := strings.TrimSpace(s.KenwoodHost); h != "" {
|
// The radio's OWN network protocol — a session, its own framing, its
|
||||||
kw := cat.NewKenwoodTCP(h, s.DigitalDefault)
|
// own authentication. Nothing here speaks it: it is not the CAT byte
|
||||||
|
// stream with a socket in front, and pretending otherwise would open a
|
||||||
|
// connection that answers nothing and blame the radio for it.
|
||||||
|
applog.Printf("cat: %s over the radio's own network protocol is not implemented — use USB, or an RS-232-to-Ethernet bridge", s.Backend)
|
||||||
|
a.cat.Stop()
|
||||||
|
// Said on screen as well as in the log: a CAT panel that simply
|
||||||
|
// stays disconnected sends the operator hunting a cable.
|
||||||
|
if a.ctx != nil {
|
||||||
|
wruntime.EventsEmit(a.ctx, "cat:state", cat.RigState{
|
||||||
|
Error: "this radio's own network protocol is not supported yet — use USB, or an RS-232-to-Ethernet bridge",
|
||||||
|
})
|
||||||
|
}
|
||||||
|
return
|
||||||
|
case kenwoodLinkBridge:
|
||||||
|
kw := cat.NewKenwoodTCP(strings.TrimSpace(s.KenwoodHost), s.DigitalDefault)
|
||||||
kw.SetDataMode(s.KenwoodDataMode)
|
kw.SetDataMode(s.KenwoodDataMode)
|
||||||
|
kw.SetElecraft(elecraft)
|
||||||
a.cat.Start(kw)
|
a.cat.Start(kw)
|
||||||
} else {
|
default:
|
||||||
kw := cat.NewKenwood(s.KenwoodPort, s.KenwoodBaud, s.DigitalDefault)
|
kw := cat.NewKenwood(s.KenwoodPort, s.KenwoodBaud, s.DigitalDefault)
|
||||||
kw.SetLowerLines(s.KenwoodLowLines)
|
kw.SetLowerLines(s.KenwoodLowLines)
|
||||||
kw.SetDataMode(s.KenwoodDataMode)
|
kw.SetDataMode(s.KenwoodDataMode)
|
||||||
a.cat.Start(kw)
|
kw.SetElecraft(elecraft)
|
||||||
}
|
|
||||||
case "elecraft":
|
|
||||||
// Elecraft K3/K4: the Kenwood-dialect client with the Elecraft specifics on
|
|
||||||
// (digital modes → DATA A via MD6+DT0). Reuses the Kenwood port/baud/host
|
|
||||||
// settings — the K3 emulates the Kenwood command set, so a separate transport
|
|
||||||
// would be a near-total duplicate.
|
|
||||||
if h := strings.TrimSpace(s.KenwoodHost); h != "" {
|
|
||||||
kw := cat.NewKenwoodTCP(h, s.DigitalDefault)
|
|
||||||
kw.SetElecraft(true)
|
|
||||||
a.cat.Start(kw)
|
|
||||||
} else {
|
|
||||||
kw := cat.NewKenwood(s.KenwoodPort, s.KenwoodBaud, s.DigitalDefault)
|
|
||||||
kw.SetLowerLines(s.KenwoodLowLines)
|
|
||||||
kw.SetElecraft(true)
|
|
||||||
a.cat.Start(kw)
|
a.cat.Start(kw)
|
||||||
}
|
}
|
||||||
case "icom":
|
case "icom":
|
||||||
@@ -15381,6 +15419,9 @@ func (a *App) GetListsSettings() (ListsSettings, error) {
|
|||||||
if raw, _ := a.settings.Get(a.ctx, keyListsRSTDigital); raw != "" {
|
if raw, _ := a.settings.Get(a.ctx, keyListsRSTDigital); raw != "" {
|
||||||
_ = json.Unmarshal([]byte(raw), &out.RSTDigital)
|
_ = json.Unmarshal([]byte(raw), &out.RSTDigital)
|
||||||
}
|
}
|
||||||
|
if raw, _ := a.settings.Get(a.ctx, keyListsSatellites); raw != "" {
|
||||||
|
_ = json.Unmarshal([]byte(raw), &out.Satellites)
|
||||||
|
}
|
||||||
if len(out.Bands) == 0 {
|
if len(out.Bands) == 0 {
|
||||||
out.Bands = append([]string(nil), defaultBands...)
|
out.Bands = append([]string(nil), defaultBands...)
|
||||||
}
|
}
|
||||||
@@ -15396,6 +15437,10 @@ func (a *App) GetListsSettings() (ListsSettings, error) {
|
|||||||
if len(out.RSTDigital) == 0 {
|
if len(out.RSTDigital) == 0 {
|
||||||
out.RSTDigital = append([]string(nil), defaultRSTDigital...)
|
out.RSTDigital = append([]string(nil), defaultRSTDigital...)
|
||||||
}
|
}
|
||||||
|
// Satellites are NOT defaulted to a shipped list. An empty list means the
|
||||||
|
// station does not work satellites, and filling it with two dozen birds
|
||||||
|
// nobody here has heard would make the field harder to use, not easier —
|
||||||
|
// the operator adds the ones they actually work.
|
||||||
return out, nil
|
return out, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -15435,6 +15480,14 @@ func (a *App) SaveListsSettings(l ListsSettings) error {
|
|||||||
// cache, so a band ticked here has to reach that cache now — otherwise it
|
// cache, so a band ticked here has to reach that cache now — otherwise it
|
||||||
// takes effect at the next restart, which looks like the option not working.
|
// takes effect at the next restart, which looks like the option not working.
|
||||||
a.refreshChaseBands()
|
a.refreshChaseBands()
|
||||||
|
sat, err := json.Marshal(l.Satellites)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err := a.settings.Set(a.ctx, keyListsSatellites, string(sat)); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -17647,6 +17700,12 @@ type AntGeniusSettings struct {
|
|||||||
Enabled bool `json:"enabled"`
|
Enabled bool `json:"enabled"`
|
||||||
Host string `json:"host"`
|
Host string `json:"host"`
|
||||||
Password string `json:"password"` // remote-access password; leave blank on LAN (no AUTH)
|
Password string `json:"password"` // remote-access password; leave blank on LAN (no AUTH)
|
||||||
|
// UseForMyAntenna stamps the SELECTED antenna's name into MY_ANTENNA on
|
||||||
|
// every QSO logged, ahead of the band default from Operating conditions.
|
||||||
|
UseForMyAntenna bool `json:"use_for_my_antenna"`
|
||||||
|
// Ant1Port says which switch port the radio's ANT1 jack is wired to
|
||||||
|
// (1 = A, 2 = B). Station wiring; neither device can report it.
|
||||||
|
Ant1Port int `json:"ant1_port"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetAntGeniusSettings returns the persisted Antenna Genius config.
|
// GetAntGeniusSettings returns the persisted Antenna Genius config.
|
||||||
@@ -17655,13 +17714,19 @@ func (a *App) GetAntGeniusSettings() (AntGeniusSettings, error) {
|
|||||||
if a.settings == nil {
|
if a.settings == nil {
|
||||||
return out, fmt.Errorf("db not initialized")
|
return out, fmt.Errorf("db not initialized")
|
||||||
}
|
}
|
||||||
m, err := a.settings.GetMany(a.ctx, keyAntGeniusEnabled, keyAntGeniusHost, keyAntGeniusPassword)
|
m, err := a.settings.GetMany(a.ctx, keyAntGeniusEnabled, keyAntGeniusHost, keyAntGeniusPassword,
|
||||||
|
keyAntGeniusMyAnt, keyAntGeniusPortForA1)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return out, err
|
return out, err
|
||||||
}
|
}
|
||||||
out.Enabled = m[keyAntGeniusEnabled] == "1"
|
out.Enabled = m[keyAntGeniusEnabled] == "1"
|
||||||
out.Host = m[keyAntGeniusHost]
|
out.Host = m[keyAntGeniusHost]
|
||||||
out.Password = m[keyAntGeniusPassword]
|
out.Password = m[keyAntGeniusPassword]
|
||||||
|
out.UseForMyAntenna = m[keyAntGeniusMyAnt] == "1"
|
||||||
|
out.Ant1Port = 1
|
||||||
|
if m[keyAntGeniusPortForA1] == "2" {
|
||||||
|
out.Ant1Port = 2
|
||||||
|
}
|
||||||
return out, nil
|
return out, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -17671,9 +17736,11 @@ func (a *App) SaveAntGeniusSettings(s AntGeniusSettings) error {
|
|||||||
return fmt.Errorf("db not initialized")
|
return fmt.Errorf("db not initialized")
|
||||||
}
|
}
|
||||||
for k, v := range map[string]string{
|
for k, v := range map[string]string{
|
||||||
keyAntGeniusEnabled: boolStr(s.Enabled),
|
keyAntGeniusEnabled: boolStr(s.Enabled),
|
||||||
keyAntGeniusHost: strings.TrimSpace(s.Host),
|
keyAntGeniusHost: strings.TrimSpace(s.Host),
|
||||||
keyAntGeniusPassword: s.Password,
|
keyAntGeniusPassword: s.Password,
|
||||||
|
keyAntGeniusMyAnt: boolStr(s.UseForMyAntenna),
|
||||||
|
keyAntGeniusPortForA1: map[bool]string{true: "2", false: "1"}[s.Ant1Port == 2],
|
||||||
} {
|
} {
|
||||||
if err := a.settings.Set(a.ctx, k, v); err != nil {
|
if err := a.settings.Set(a.ctx, k, v); err != nil {
|
||||||
return err
|
return err
|
||||||
@@ -20337,8 +20404,6 @@ func clampSpotMax(n int) int {
|
|||||||
return n
|
return n
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// GetSpotTTLMinutes returns how long a spot stays in the list, in minutes.
|
// GetSpotTTLMinutes returns how long a spot stays in the list, in minutes.
|
||||||
// 0 means spots are kept until the count cap pushes them out, which is what
|
// 0 means spots are kept until the count cap pushes them out, which is what
|
||||||
// OpsLog always did.
|
// OpsLog always did.
|
||||||
|
|||||||
+226
@@ -0,0 +1,226 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
// The first breadcrumbs, written before anything else can fail.
|
||||||
|
//
|
||||||
|
// OpsLog keeps its log in the data folder, which lives beside the executable —
|
||||||
|
// so every fault that happens BEFORE that folder exists is invisible. Reported
|
||||||
|
// from a Windows 10 machine: "the process appears, no data folder is created,
|
||||||
|
// nothing starts", with no file anywhere to say why. There was nothing to read
|
||||||
|
// because the only place we write to had not been created yet.
|
||||||
|
//
|
||||||
|
// This writes to %LOCALAPPDATA%\OpsLog\startup.log instead: a folder Windows
|
||||||
|
// guarantees is writable for the user, whatever OpsLog itself was installed
|
||||||
|
// into. It records the handful of milestones between the process starting and
|
||||||
|
// the window appearing, and nothing else — it is not a second log, it is the
|
||||||
|
// answer to "it does not start".
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"strings"
|
||||||
|
"sync/atomic"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// bootLogPath is the file, or "" when even LOCALAPPDATA is unavailable.
|
||||||
|
func bootLogPath() string {
|
||||||
|
dir := os.Getenv("LOCALAPPDATA")
|
||||||
|
if strings.TrimSpace(dir) == "" {
|
||||||
|
dir = os.TempDir()
|
||||||
|
}
|
||||||
|
if dir == "" {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
dir = filepath.Join(dir, "OpsLog")
|
||||||
|
if err := os.MkdirAll(dir, 0o755); err != nil {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
return filepath.Join(dir, "startup.log")
|
||||||
|
}
|
||||||
|
|
||||||
|
// bootLog appends one line. Never fails loudly: it exists to explain a failure,
|
||||||
|
// so it must not become one.
|
||||||
|
func bootLog(format string, args ...any) {
|
||||||
|
p := bootLogPath()
|
||||||
|
if p == "" {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
f, err := os.OpenFile(p, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0o644)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer f.Close()
|
||||||
|
// Trimmed when it gets long. A startup log that grows for two years is a
|
||||||
|
// file nobody opens, and the interesting launch is always the last one.
|
||||||
|
if fi, err := f.Stat(); err == nil && fi.Size() > 256*1024 {
|
||||||
|
f.Close()
|
||||||
|
_ = os.Remove(p)
|
||||||
|
f, err = os.OpenFile(p, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0o644)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer f.Close()
|
||||||
|
}
|
||||||
|
fmt.Fprintf(f, "%s %s\n", time.Now().Format("2006-01-02 15:04:05.000"), fmt.Sprintf(format, args...))
|
||||||
|
}
|
||||||
|
|
||||||
|
// bootLogLaunch records what was launched and from where.
|
||||||
|
func bootLogLaunch() {
|
||||||
|
exe, _ := os.Executable()
|
||||||
|
bootLog("launch: %s %v", exe, os.Args[1:])
|
||||||
|
}
|
||||||
|
|
||||||
|
// checkDataDirWritable makes sure the folder OpsLog keeps everything in can
|
||||||
|
// actually be created and written to, and says exactly what failed if not.
|
||||||
|
//
|
||||||
|
// The data folder sits beside the executable, which is fine on a stick or in a
|
||||||
|
// home directory and refused outright under Program Files — where Windows
|
||||||
|
// silently denies the write to anything not elevated. That refusal used to end
|
||||||
|
// the launch with no window and no message.
|
||||||
|
func checkDataDirWritable() error {
|
||||||
|
dir, err := userDataDir()
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("cannot work out where to keep the data: %w", err)
|
||||||
|
}
|
||||||
|
if err := os.MkdirAll(dir, 0o755); err != nil {
|
||||||
|
return fmt.Errorf("cannot create the data folder %s: %w", dir, err)
|
||||||
|
}
|
||||||
|
probe := filepath.Join(dir, ".writetest")
|
||||||
|
if err := os.WriteFile(probe, []byte("ok"), 0o644); err != nil {
|
||||||
|
return fmt.Errorf("the data folder %s cannot be written to: %w", dir, err)
|
||||||
|
}
|
||||||
|
_ = os.Remove(probe)
|
||||||
|
bootLog("data dir ok: %s", dir)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// startupReached flips as soon as OnStartup runs — the first moment OpsLog's
|
||||||
|
// own code is executing inside the window's lifecycle.
|
||||||
|
var startupReached atomic.Bool
|
||||||
|
|
||||||
|
// startupStuckMessage is what an operator sees when the window never starts.
|
||||||
|
//
|
||||||
|
// It names the two causes and what to do about each, because "OpsLog is not
|
||||||
|
// responding" sends people to reinstall OpsLog, which is the one thing that
|
||||||
|
// cannot help: the part that has not started is not ours.
|
||||||
|
const startupStuckMessage = "OpsLog started but its window never opened.\n\n" +
|
||||||
|
"This is the WebView2 runtime failing to start, and it is almost always one of two things:\n\n" +
|
||||||
|
"• The Microsoft Edge WebView2 Runtime is missing — install it from Microsoft, then start OpsLog again.\n" +
|
||||||
|
"• An antivirus is blocking msedgewebview2.exe — add OpsLog's folder to its exceptions.\n\n" +
|
||||||
|
"The details are in the OpsLog folder under LOCALAPPDATA (startup.log)."
|
||||||
|
|
||||||
|
// webviewDataPath is where WebView2 keeps its profile.
|
||||||
|
//
|
||||||
|
// Named rather than left to the default, which lands in the ROAMING profile: on
|
||||||
|
// a managed account that folder can be redirected to a network share, and a
|
||||||
|
// WebView2 profile on a share that is slow or unreachable does not fail — it
|
||||||
|
// hangs, which is indistinguishable from a runtime that will not start.
|
||||||
|
//
|
||||||
|
// It also gives the folder a name someone can be told to delete: a corrupt
|
||||||
|
// profile is a real cause of this, and "delete this folder and try again" is
|
||||||
|
// only advice if the folder can be pointed at.
|
||||||
|
func webviewDataPath() string {
|
||||||
|
dir := os.Getenv("LOCALAPPDATA")
|
||||||
|
if strings.TrimSpace(dir) == "" {
|
||||||
|
return "" // let Wails decide; there is nothing better to offer
|
||||||
|
}
|
||||||
|
p := filepath.Join(dir, "OpsLog", "WebView2")
|
||||||
|
if err := os.MkdirAll(p, 0o755); err != nil {
|
||||||
|
bootLog("WebView2 profile folder %s could not be created: %v — leaving it to Wails", p, err)
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
return p
|
||||||
|
}
|
||||||
|
|
||||||
|
// stuckMarkerPath is written before the window is attempted and removed once it
|
||||||
|
// opens, so the NEXT launch can tell that the last one never got there.
|
||||||
|
func stuckMarkerPath() string {
|
||||||
|
dir := os.Getenv("LOCALAPPDATA")
|
||||||
|
if strings.TrimSpace(dir) == "" {
|
||||||
|
dir = os.TempDir()
|
||||||
|
}
|
||||||
|
return filepath.Join(dir, "OpsLog", ".launching")
|
||||||
|
}
|
||||||
|
|
||||||
|
// lastLaunchHung is set at startup from the marker left by the previous run.
|
||||||
|
var lastLaunchHung bool
|
||||||
|
|
||||||
|
// noteLaunchAttempt records that a window is about to be attempted, and reports
|
||||||
|
// whether the previous attempt ever finished.
|
||||||
|
func noteLaunchAttempt() {
|
||||||
|
p := stuckMarkerPath()
|
||||||
|
if _, err := os.Stat(p); err == nil {
|
||||||
|
lastLaunchHung = true
|
||||||
|
bootLog("the previous launch never opened its window — trying again with GPU acceleration off")
|
||||||
|
}
|
||||||
|
_ = os.MkdirAll(filepath.Dir(p), 0o755)
|
||||||
|
_ = os.WriteFile(p, []byte(time.Now().Format(time.RFC3339)), 0o644)
|
||||||
|
}
|
||||||
|
|
||||||
|
// clearLaunchMarker is called once the window is up: the attempt finished.
|
||||||
|
func clearLaunchMarker() { _ = os.Remove(stuckMarkerPath()) }
|
||||||
|
|
||||||
|
// fixedWebView2Path finds a FIXED-VERSION WebView2 runtime shipped beside
|
||||||
|
// OpsLog, or "" when there is none.
|
||||||
|
//
|
||||||
|
// Microsoft publishes the runtime in two forms. Evergreen installs itself into
|
||||||
|
// Windows and updates itself — the normal case, and the one this looks for
|
||||||
|
// first. FIXED VERSION is a folder of files an application carries with it and
|
||||||
|
// points at, needing no installation and no administrator: it exists precisely
|
||||||
|
// for machines where Evergreen cannot be installed, which is not a rare
|
||||||
|
// situation on a managed, offline or otherwise locked-down Windows.
|
||||||
|
//
|
||||||
|
// So: drop the extracted folder next to OpsLog.exe and it is used. Nothing to
|
||||||
|
// configure — a setting for this would be a question asked of the one operator
|
||||||
|
// least able to answer it, on a machine where nothing starts.
|
||||||
|
func fixedWebView2Path() string {
|
||||||
|
exe, err := os.Executable()
|
||||||
|
if err != nil {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
base := filepath.Dir(exe)
|
||||||
|
for _, name := range []string{"WebView2", "WebView2Runtime", "webview2"} {
|
||||||
|
dir := filepath.Join(base, name)
|
||||||
|
if p := findWebView2Binary(dir); p != "" {
|
||||||
|
bootLog("using the fixed-version WebView2 runtime in %s", p)
|
||||||
|
return p
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
// findWebView2Binary returns dir (or its single versioned subfolder) when it
|
||||||
|
// holds msedgewebview2.exe — the fixed-version download unpacks with the
|
||||||
|
// version as a folder level, and asking someone to flatten it by hand is one
|
||||||
|
// more step to get wrong.
|
||||||
|
func findWebView2Binary(dir string) string {
|
||||||
|
if fileExists(filepath.Join(dir, "msedgewebview2.exe")) {
|
||||||
|
return dir
|
||||||
|
}
|
||||||
|
entries, err := os.ReadDir(dir)
|
||||||
|
if err != nil {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
for _, e := range entries {
|
||||||
|
if !e.IsDir() {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
sub := filepath.Join(dir, e.Name())
|
||||||
|
if fileExists(filepath.Join(sub, "msedgewebview2.exe")) {
|
||||||
|
return sub
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
// edgeBlockedMessage is shown when an Edge blocker is found in the way.
|
||||||
|
//
|
||||||
|
// It names the tool rather than the symptom: OpsLog draws its whole interface
|
||||||
|
// with the WebView2 engine, which is Edge's, so a machine where Edge is blocked
|
||||||
|
// cannot run it — and no amount of reinstalling OpsLog will change that.
|
||||||
|
const edgeBlockedMessage = "OpsLog cannot start because Edge is blocked on this PC.\n\n" +
|
||||||
|
"A blocker tool (or a policy) is stopping msedgewebview2.exe from running. " +
|
||||||
|
"OpsLog draws its whole interface with that engine, so it cannot open its window.\n\n" +
|
||||||
|
"Unblock Edge — in the tool that blocked it — and start OpsLog again. " +
|
||||||
|
"The details are in the OpsLog folder under LOCALAPPDATA (startup.log)."
|
||||||
+34
@@ -0,0 +1,34 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
// How a Kenwood-dialect radio is reached.
|
||||||
|
//
|
||||||
|
// Three transports, and they are genuinely different things rather than three
|
||||||
|
// spellings of one: a COM port, the same CAT bytes carried over TCP by a serial
|
||||||
|
// bridge, and the radio's own network protocol — which is a session with its own
|
||||||
|
// framing and authentication, and is not implemented here.
|
||||||
|
//
|
||||||
|
// Kept as an explicit setting rather than inferred from which field an operator
|
||||||
|
// happened to fill in. The old code preferred a network address whenever one was
|
||||||
|
// present, which is invisible from the settings page: someone who typed a host
|
||||||
|
// months ago, then set a COM port, had a radio that never answered and nothing
|
||||||
|
// on screen to explain it.
|
||||||
|
|
||||||
|
const (
|
||||||
|
kenwoodLinkUSB = "usb" // a COM port
|
||||||
|
kenwoodLinkBridge = "bridge" // RS-232 to Ethernet: the same CAT bytes over TCP
|
||||||
|
kenwoodLinkNative = "native" // the radio's own network protocol — not supported
|
||||||
|
)
|
||||||
|
|
||||||
|
// kenwoodLinkOr resolves the stored choice, falling back to what an older
|
||||||
|
// install can be read as: a configured host meant the bridge, because that is
|
||||||
|
// what the previous code used it for.
|
||||||
|
func kenwoodLinkOr(link, host string) string {
|
||||||
|
switch link {
|
||||||
|
case kenwoodLinkUSB, kenwoodLinkBridge, kenwoodLinkNative:
|
||||||
|
return link
|
||||||
|
}
|
||||||
|
if host != "" {
|
||||||
|
return kenwoodLinkBridge
|
||||||
|
}
|
||||||
|
return kenwoodLinkUSB
|
||||||
|
}
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
// The transport is a stored choice now, but installs exist that predate it and
|
||||||
|
// hold only a host. Reading those as "bridge" is what keeps a working station
|
||||||
|
// working across the upgrade — the old code used a host for exactly that.
|
||||||
|
func TestTheLinkIsReadFromAnOlderInstall(t *testing.T) {
|
||||||
|
cases := []struct {
|
||||||
|
link, host, want string
|
||||||
|
}{
|
||||||
|
{"", "", kenwoodLinkUSB}, // nothing configured
|
||||||
|
{"", "192.168.1.50:4999", kenwoodLinkBridge}, // upgraded: host only
|
||||||
|
{kenwoodLinkUSB, "192.168.1.50:4999", kenwoodLinkUSB}, // chose USB, host left behind
|
||||||
|
{kenwoodLinkBridge, "", kenwoodLinkBridge},
|
||||||
|
{kenwoodLinkNative, "", kenwoodLinkNative},
|
||||||
|
{"nonsense", "", kenwoodLinkUSB}, // a value nobody wrote: fall back, don't guess
|
||||||
|
}
|
||||||
|
for _, c := range cases {
|
||||||
|
if got := kenwoodLinkOr(c.link, c.host); got != c.want {
|
||||||
|
t.Errorf("link=%q host=%q → %q, want %q", c.link, c.host, got, c.want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The one that matters after the fact: an operator who picks USB while an old
|
||||||
|
// host is still stored must get the COM port. The previous code preferred the
|
||||||
|
// host whenever it was non-empty, which is invisible from the settings page.
|
||||||
|
func TestChoosingUSBBeatsALeftoverHost(t *testing.T) {
|
||||||
|
if got := kenwoodLinkOr(kenwoodLinkUSB, "10.0.0.9:4999"); got != kenwoodLinkUSB {
|
||||||
|
t.Fatalf("a leftover host overrode the operator's choice: %q", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,4 +1,36 @@
|
|||||||
[
|
[
|
||||||
|
{
|
||||||
|
"version": "0.26.14",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"Elecraft console: the transmit meters are read whenever the RADIO says it is transmitting, not only when OpsLog keyed it. Keying with the front-panel PTT, a footswitch or the mic button left the panel showing a receiver — and the power and SWR bars are read only while transmitting, so for anyone keying by hand they were never read at all.",
|
||||||
|
"Cluster: the list holds still while it is being read. Scrolled away from the top it stops redrawing and shows how many spots are waiting; scrolling back to the top, or clicking the notice, releases it. On a busy evening a spot lands every second or two and the callsign under the pointer had moved by the time the click arrived.",
|
||||||
|
"Cluster command buttons take 500 characters instead of 120. A DXSpider filter listing wanted prefixes runs past a hundred easily, and the field simply stopped accepting keystrokes — saving the command truncated, with nothing to say so.",
|
||||||
|
"Multi-monitor: the saved window position is now checked against the monitors themselves, not the rectangle that spans them. Monitors rarely fill that rectangle, and a window in one of the leftover gaps passed the old test while being invisible. A position that is genuinely lost is moved onto the nearest screen — keeping the window size — instead of being handed back to Windows, and the screen layout is written to the log at every start.",
|
||||||
|
"PowerGenius XL: the amplifier's real state is read at startup. Its status frame carries no 'operate' field — the state is in 'state' — so on the direct GSCP link the flag was never read at all and OpsLog opened claiming STANDBY on an amp that was in line, with the first press of the button then commanding the state it was already in. IDLE means in line, not keyed.",
|
||||||
|
"Antenna Genius: an option to write the SELECTED antenna into MY_ANTENNA, under the name it carries on the switch, ahead of the band default from Operating conditions. Which of the two ports counts is decided by the antenna jack the radio is transmitting on (ANT1/ANT2 on a Flex), with the jack-to-port wiring set once in Preferences — neither device can report it. When the port cannot be told, the log keeps the band default rather than naming an antenna at random.",
|
||||||
|
"The awards tab beside the entry form (F3) now offers only the awards this station follows, and drops the ones switched off — the same list the Awards tab reads. It offered every award that existed, so a station chasing three of them picked references out of a list of twenty.",
|
||||||
|
"CAT settings ask two questions instead of one: WHICH RADIO, then HOW IT IS CONNECTED — and the second only appears where there is a choice to make. OmniRig leads the list, the brands follow alphabetically, and each offers only what it has: USB for a Yaesu or a Xiegu, USB or an RS-232-to-Ethernet bridge for a Kenwood or an Elecraft, USB or its own network protocol for an Icom, and nothing to choose for a FlexRadio or a SunSDR, which are reached one way each. The old list mixed the two questions — 'Icom (USB)' and 'Icom (network)' were separate entries while Kenwood and Elecraft hid the same choice in a field further down — and the example network address named port 4532, which is Hamlib rigctld and the one OpsLog itself serves under Share CAT.",
|
||||||
|
"An editable list of satellites (Preferences → Lists → Satellites). The satellite-name field on the entry form offers them as a dropdown, alphabetically, and still accepts anything typed. SAT_NAME is compared character for character by the awards and by LoTW — AO-91 and AO91 are two different satellites to everything downstream — so a remembered spelling beats one retyped on every pass.",
|
||||||
|
"Awards, RDA district comparison: the conflict list is taller and scrolls, a callsign in it opens the contact, and the compare and fill-districts buttons say they are working. The list was capped at about six visible rows out of two hundred, in a panel that would not scroll to the rest, and nothing in it could be acted on.",
|
||||||
|
"Preferences no longer redraw with the main window. Being a child of the main view, the whole panel was rebuilt on every cluster spot and every CAT update — several times a second on a busy evening — which looked like a page refreshing constantly and made buttons miss their clicks, the element under the pointer being replaced between the press and the release.",
|
||||||
|
"A launch that fails before the window exists now says why, on screen and in a startup log kept outside the data folder. Every fault before that point was invisible — no window, no folder, no file to read — and the causes are named: a missing or blocked WebView2 runtime, an 'Edge blocker' tool stopping the engine OpsLog draws its interface with, a folder Windows refuses to write to, a copy already running. WebView2 also gets its own profile folder on the local disk, retries without GPU acceleration after a launch that hung, and can use a fixed-version runtime dropped beside OpsLog where the installer cannot run."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Console Elecraft : les mesures d'émission sont lues dès que la RADIO se déclare en émission, et plus seulement quand OpsLog l'a mise en émission. Passer en émission par le PTT de façade, une pédale ou le bouton du micro laissait le panneau croire à une réception — et comme les barres de puissance et de ROS ne sont lues qu'en émission, elles ne l'étaient jamais pour qui manipule à la main.",
|
||||||
|
"Cluster : la liste se fige pendant qu'on la lit. Dès qu'on quitte le haut, elle cesse de se redessiner et indique combien de spots attendent ; revenir en haut, ou cliquer sur l'avis, la relâche. Un soir chargé, un spot tombe toutes les une ou deux secondes et l'indicatif sous le pointeur avait bougé avant que le clic n'arrive.",
|
||||||
|
"Les boutons de commande du cluster acceptent 500 caractères au lieu de 120. Un filtre DXSpider qui énumère des préfixes dépasse la centaine sans peine, et le champ cessait simplement d'accepter les frappes — la commande était enregistrée tronquée, sans un mot.",
|
||||||
|
"Multi-écrans : la position enregistrée est désormais vérifiée contre les écrans eux-mêmes, et non contre le rectangle qui les englobe. Les écrans remplissent rarement ce rectangle, et une fenêtre tombée dans un des trous passait l'ancien test tout en étant invisible. Une position réellement perdue est déplacée sur l'écran le plus proche — en conservant la taille de la fenêtre — au lieu d'être rendue à Windows, et la disposition des écrans est écrite dans le journal à chaque démarrage.",
|
||||||
|
"Power Genius XL : l'état réel de l'amplificateur est lu au démarrage. Sa trame d'état ne contient pas de champ « operate » — l'état est dans « state » — si bien que sur la liaison GSCP directe l'indicateur n'était jamais lu : OpsLog s'ouvrait en annonçant STANDBY sur un ampli en ligne, et le premier appui commandait l'état dans lequel il se trouvait déjà. IDLE veut dire en ligne, pas en émission.",
|
||||||
|
"Antenna Genius : une option pour inscrire l'antenne SÉLECTIONNÉE dans MY_ANTENNA, sous le nom qu'elle porte sur le switch, avant l'antenne par défaut des conditions de trafic. C'est la prise d'antenne sur laquelle la radio émet (ANT1/ANT2 sur un Flex) qui décide du port retenu, le câblage prise→port se règlant une fois dans les préférences — aucun des deux appareils ne peut le dire. Quand le port ne peut pas être déterminé, le journal conserve l'antenne par défaut plutôt que d'en nommer une au hasard.",
|
||||||
|
"L'onglet des diplômes à côté de la saisie (F3) ne propose plus que les diplômes suivis par la station, et écarte ceux qui sont désactivés — la même liste que l'onglet Diplômes. Il proposait tous les diplômes existants : une station qui en chasse trois choisissait ses références dans une liste de vingt.",
|
||||||
|
"Les réglages CAT posent deux questions au lieu d'une : QUELLE RADIO, puis COMMENT ELLE EST RELIÉE — la seconde n'apparaissant que là où il y a un choix. OmniRig ouvre la liste, les marques suivent par ordre alphabétique, et chacune ne propose que ce qu'elle a : USB pour un Yaesu ou un Xiegu, USB ou un pont RS-232 vers Ethernet pour un Kenwood ou un Elecraft, USB ou son protocole réseau propre pour un Icom, et rien à choisir pour un FlexRadio ou un SunSDR, qui n'ont qu'une voie chacun. L'ancienne liste mélangeait les deux questions — « Icom (USB) » et « Icom (réseau) » étaient deux entrées tandis que Kenwood et Elecraft cachaient le même choix dans un champ plus bas — et l'exemple d'adresse réseau citait le port 4532, celui de Hamlib rigctld, que OpsLog propose lui-même sous « Partager le CAT ».",
|
||||||
|
"Une liste de satellites éditable (Préférences → Listes → Satellites). Le champ du nom de satellite dans la saisie les propose en liste déroulante, par ordre alphabétique, et accepte toujours ce qu'on tape. SAT_NAME est comparé caractère par caractère par les diplômes et par LoTW — AO-91 et AO91 sont deux satellites différents pour tout ce qui suit — donc une orthographe mémorisée vaut mieux qu'une ressaisie à chaque passage.",
|
||||||
|
"Diplômes, comparaison des districts RDA : la liste des divergences est plus haute et défile, un indicatif y ouvre le contact, et les boutons comparer et remplir les districts disent qu'ils travaillent. Elle était limitée à six lignes visibles environ sur deux cents, dans un panneau qui ne défilait pas pour montrer le reste, et rien n'y était actionnable.",
|
||||||
|
"Les préférences ne se redessinent plus au rythme de la fenêtre principale. Étant un enfant de la vue principale, tout le panneau était reconstruit à chaque spot du cluster et à chaque mise à jour CAT — plusieurs fois par seconde un soir chargé — ce qui donnait l'impression d'une page qui se rafraîchit sans arrêt et faisait rater les clics, l'élément sous le pointeur étant remplacé entre l'appui et le relâchement.",
|
||||||
|
"Un lancement qui échoue avant l'apparition de la fenêtre dit désormais pourquoi, à l'écran et dans un journal de démarrage tenu hors du dossier data. Toute panne survenant avant ce point était invisible — pas de fenêtre, pas de dossier, aucun fichier à lire — et les causes sont nommées : un runtime WebView2 absent ou bloqué, un « bloqueur Edge » qui empêche le moteur avec lequel OpsLog dessine son interface, un dossier où Windows refuse d'écrire, une copie déjà lancée. WebView2 reçoit aussi son propre dossier de profil sur le disque local, réessaie sans accélération GPU après un lancement bloqué, et peut utiliser un runtime en version fixe déposé à côté d'OpsLog là où l'installateur ne peut pas s'exécuter."
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"version": "0.26.13",
|
"version": "0.26.13",
|
||||||
"date": "",
|
"date": "",
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
//go:build !windows
|
||||||
|
|
||||||
|
package main
|
||||||
|
|
||||||
|
// fatalBox is Windows-only; elsewhere the terminal carries the message.
|
||||||
|
func fatalBox(title, text string) { println(title + ": " + text) }
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
//go:build windows
|
||||||
|
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"syscall"
|
||||||
|
"unsafe"
|
||||||
|
)
|
||||||
|
|
||||||
|
// fatalBox shows a message box and returns.
|
||||||
|
//
|
||||||
|
// A GUI-subsystem program has no console: println goes nowhere, and a launch
|
||||||
|
// that ends before the window exists ends in complete silence. Every silent exit
|
||||||
|
// in main now says something here first — an operator who is told "another
|
||||||
|
// OpsLog is already running" can act on it; one who sees nothing files "it does
|
||||||
|
// not start", which is the report nobody can answer.
|
||||||
|
func fatalBox(title, text string) {
|
||||||
|
user32 := syscall.NewLazyDLL("user32.dll")
|
||||||
|
proc := user32.NewProc("MessageBoxW")
|
||||||
|
t, err1 := syscall.UTF16PtrFromString(text)
|
||||||
|
ti, err2 := syscall.UTF16PtrFromString(title)
|
||||||
|
if err1 != nil || err2 != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
const mbIconError = 0x00000010
|
||||||
|
proc.Call(0, uintptr(unsafe.Pointer(t)), uintptr(unsafe.Pointer(ti)), mbIconError)
|
||||||
|
}
|
||||||
+46
-18
@@ -488,6 +488,11 @@ export default function App() {
|
|||||||
const { t, lang } = useI18n();
|
const { t, lang } = useI18n();
|
||||||
// === Lists from settings (fallback for first paint) ===
|
// === Lists from settings (fallback for first paint) ===
|
||||||
const [bands, setBands] = useState<string[]>(DEFAULT_BANDS);
|
const [bands, setBands] = useState<string[]>(DEFAULT_BANDS);
|
||||||
|
// The station's satellites, for the entry form's SAT_NAME dropdown. Held HERE
|
||||||
|
// and not inside the panel: loadLists() already runs when Preferences close,
|
||||||
|
// so a list edited there reaches the field without a restart — which is what
|
||||||
|
// a panel reading it once at mount could not do.
|
||||||
|
const [satellites, setSatellites] = useState<string[]>([]);
|
||||||
const [modes, setModes] = useState<string[]>(DEFAULT_MODES);
|
const [modes, setModes] = useState<string[]>(DEFAULT_MODES);
|
||||||
const modesRef = useRef(modes);
|
const modesRef = useRef(modes);
|
||||||
useEffect(() => { modesRef.current = modes; }, [modes]);
|
useEffect(() => { modesRef.current = modes; }, [modes]);
|
||||||
@@ -3081,6 +3086,7 @@ export default function App() {
|
|||||||
const l: ListsSettings = await GetListsSettings();
|
const l: ListsSettings = await GetListsSettings();
|
||||||
setRstLists({ phone: (l as any).rst_phone ?? [], cw: (l as any).rst_cw ?? [], digital: (l as any).rst_digital ?? [] });
|
setRstLists({ phone: (l as any).rst_phone ?? [], cw: (l as any).rst_cw ?? [], digital: (l as any).rst_digital ?? [] });
|
||||||
if (l.bands && l.bands.length) setBands(l.bands);
|
if (l.bands && l.bands.length) setBands(l.bands);
|
||||||
|
setSatellites([...(((l as any).satellites ?? []) as string[])].filter(Boolean).sort());
|
||||||
if (l.modes && l.modes.length) {
|
if (l.modes && l.modes.length) {
|
||||||
setModePresets(l.modes);
|
setModePresets(l.modes);
|
||||||
const names = l.modes.map((m) => m.name);
|
const names = l.modes.map((m) => m.name);
|
||||||
@@ -4188,6 +4194,41 @@ export default function App() {
|
|||||||
setLookupResult(null);
|
setLookupResult(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// The Settings dialog is memoised (see SettingsModal), which only helps while
|
||||||
|
// its props hold still. These three would otherwise be new functions on every
|
||||||
|
// App render — several times a second with a cluster running — and the memo
|
||||||
|
// would compare unequal every time and re-render the whole panel anyway.
|
||||||
|
const openEditRef = useRef<(id: number) => void>(() => {});
|
||||||
|
// Refreshed on every render, read only when Settings opens: the dialog gets a
|
||||||
|
// callback whose identity never changes, and still calls the current one.
|
||||||
|
useEffect(() => { openEditRef.current = (id: number) => { void openEdit(id); }; });
|
||||||
|
// The stable wrapper the dialog actually receives.
|
||||||
|
const openQSOFromSettings = useCallback((id: number) => openEditRef.current(id), []);
|
||||||
|
const closeSettings = useCallback(() => {
|
||||||
|
setShowSettings(false);
|
||||||
|
setSettingsSection(undefined);
|
||||||
|
refreshChaseNew();
|
||||||
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||||
|
}, []);
|
||||||
|
const onSettingsSaved = useCallback(() => {
|
||||||
|
loadStation(); loadLists(); loadCATCfg(); reloadWk(); refreshManualRecReady();
|
||||||
|
// Drop the cached spot statuses. They are computed once per call+band+mode
|
||||||
|
// and never expire, so a rule change in Settings — grouping the digital
|
||||||
|
// modes into one slot, above all — left every spot already on screen
|
||||||
|
// showing the answer to the OLD question.
|
||||||
|
setSpotStatus({});
|
||||||
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||||
|
}, []);
|
||||||
|
const onSettingsPaneChanged = useCallback((side: 'left' | 'right' | 'p3' | 'p4' | 'layout', v: string) => {
|
||||||
|
// Applied from the CHOSEN value, never from a re-read of the DB: the write
|
||||||
|
// is async and the layout must not lag a click behind.
|
||||||
|
if (side === 'left') setMainPaneLeft(v as MainPaneKind);
|
||||||
|
else if (side === 'right') setMainPaneRight(v as MainPaneKind);
|
||||||
|
else if (side === 'p3') setMainPane3(v as MainPaneKind);
|
||||||
|
else if (side === 'p4') setMainPane4(v as MainPaneKind);
|
||||||
|
else if (side === 'layout') setMainLayout4(v === 'cols' ? 'cols' : 'quad');
|
||||||
|
}, []);
|
||||||
|
|
||||||
async function openEdit(id: number) {
|
async function openEdit(id: number) {
|
||||||
try { setEditingQSO(await GetQSO(id)); }
|
try { setEditingQSO(await GetQSO(id)); }
|
||||||
catch (e: any) { setError(String(e?.message ?? e)); }
|
catch (e: any) { setError(String(e?.message ?? e)); }
|
||||||
@@ -7051,6 +7092,7 @@ export default function App() {
|
|||||||
band={band}
|
band={band}
|
||||||
mode={mode}
|
mode={mode}
|
||||||
bands={bands}
|
bands={bands}
|
||||||
|
satellites={satellites}
|
||||||
onEditQso={openEdit}
|
onEditQso={openEdit}
|
||||||
{...(!callsign.trim() && selQso ? {
|
{...(!callsign.trim() && selQso ? {
|
||||||
slotCall: selQso.call, slotBand: selQso.band, slotMode: selQso.mode,
|
slotCall: selQso.call, slotBand: selQso.band, slotMode: selQso.mode,
|
||||||
@@ -8488,25 +8530,11 @@ export default function App() {
|
|||||||
|
|
||||||
{showSettings && (
|
{showSettings && (
|
||||||
<SettingsModal
|
<SettingsModal
|
||||||
|
onEditQSO={openQSOFromSettings}
|
||||||
initialSection={settingsSection}
|
initialSection={settingsSection}
|
||||||
onClose={() => { setShowSettings(false); setSettingsSection(undefined); refreshChaseNew(); }}
|
onClose={closeSettings}
|
||||||
onSaved={() => {
|
onSaved={onSettingsSaved}
|
||||||
loadStation(); loadLists(); loadCATCfg(); reloadWk(); refreshManualRecReady();
|
onMainPaneChanged={onSettingsPaneChanged}
|
||||||
// Drop the cached spot statuses. They are computed once per
|
|
||||||
// call+band+mode and never expire, so a rule change in Settings —
|
|
||||||
// grouping the digital modes into one slot, above all — left every
|
|
||||||
// spot already on screen showing the answer to the OLD question.
|
|
||||||
setSpotStatus({});
|
|
||||||
}}
|
|
||||||
onMainPaneChanged={(side, v) => {
|
|
||||||
// Applied from the CHOSEN value, never from a re-read of the DB:
|
|
||||||
// the write is async and the layout must not lag a click behind.
|
|
||||||
if (side === 'left') setMainPaneLeft(v as MainPaneKind);
|
|
||||||
else if (side === 'right') setMainPaneRight(v as MainPaneKind);
|
|
||||||
else if (side === 'p3') setMainPane3(v as MainPaneKind);
|
|
||||||
else if (side === 'p4') setMainPane4(v as MainPaneKind);
|
|
||||||
else if (side === 'layout') setMainLayout4(v === 'cols' ? 'cols' : 'quad');
|
|
||||||
}}
|
|
||||||
flexAvailable={catState.backend === 'flex'}
|
flexAvailable={catState.backend === 'flex'}
|
||||||
icomAvailable={catState.backend === 'icom'}
|
icomAvailable={catState.backend === 'icom'}
|
||||||
yaesuAvailable={catState.backend === 'yaesu'}
|
yaesuAvailable={catState.backend === 'yaesu'}
|
||||||
|
|||||||
@@ -1,13 +1,13 @@
|
|||||||
import { useEffect, useMemo, useState } from 'react';
|
import { useEffect, useMemo, useState } from 'react';
|
||||||
import { X, Plus, Loader2 } from 'lucide-react';
|
import { X, Plus, Loader2 } from 'lucide-react';
|
||||||
import { SearchAwardReferences, GetAwardDefs, GetAwardReferenceMeta, AwardRefsNew } from '../../wailsjs/go/main/App';
|
import { SearchAwardReferences, GetAwardDefs, GetAwardReferenceMeta, AwardRefsNew, GetTrackedAwards } from '../../wailsjs/go/main/App';
|
||||||
import {
|
import {
|
||||||
Select, SelectTrigger, SelectValue, SelectContent, SelectItem,
|
Select, SelectTrigger, SelectValue, SelectContent, SelectItem,
|
||||||
} from '@/components/ui/select';
|
} from '@/components/ui/select';
|
||||||
import { useI18n } from '@/lib/i18n';
|
import { useI18n } from '@/lib/i18n';
|
||||||
|
|
||||||
type AwardRef = { code: string; name: string; dxcc: number; group: string; subgrp: string };
|
type AwardRef = { code: string; name: string; dxcc: number; group: string; subgrp: string };
|
||||||
type AwardDef = { code: string; name: string; field?: string; dxcc_filter?: number[] | null; dynamic?: boolean };
|
type AwardDef = { code: string; name: string; field?: string; dxcc_filter?: number[] | null; dynamic?: boolean; valid?: boolean };
|
||||||
type Meta = { code: string; count: number; can_update: boolean };
|
type Meta = { code: string; count: number; can_update: boolean };
|
||||||
|
|
||||||
// Fields auto-derived from structured QSO data — their awards (DXCC/WAZ/WAS/…)
|
// Fields auto-derived from structured QSO data — their awards (DXCC/WAZ/WAS/…)
|
||||||
@@ -94,11 +94,16 @@ export function AwardRefSelector({ dxcc, value, onChange, fieldValues, heightCla
|
|||||||
}
|
}
|
||||||
}, [value]);
|
}, [value]);
|
||||||
|
|
||||||
|
// The awards the operator FOLLOWS, exactly as the Awards tab reads them.
|
||||||
|
// This panel used to offer every award that existed, so a station chasing
|
||||||
|
// three of them was picking references out of a list of twenty.
|
||||||
|
const [tracked, setTracked] = useState<Set<string>>(new Set());
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
Promise.all([GetAwardDefs(), GetAwardReferenceMeta()])
|
Promise.all([GetAwardDefs(), GetAwardReferenceMeta(), GetTrackedAwards()])
|
||||||
.then(([d, m]) => {
|
.then(([d, m, tr]) => {
|
||||||
setDefs((d ?? []) as any);
|
setDefs((d ?? []) as any);
|
||||||
setMetas(Object.fromEntries(((m ?? []) as Meta[]).map((x) => [String(x.code).toUpperCase(), x])));
|
setMetas(Object.fromEntries(((m ?? []) as Meta[]).map((x) => [String(x.code).toUpperCase(), x])));
|
||||||
|
setTracked(new Set(((tr ?? []) as string[]).map((c) => String(c).toUpperCase())));
|
||||||
})
|
})
|
||||||
.catch(() => {});
|
.catch(() => {});
|
||||||
}, []);
|
}, []);
|
||||||
@@ -111,6 +116,12 @@ export function AwardRefSelector({ dxcc, value, onChange, fieldValues, heightCla
|
|||||||
return defs.filter((d) => {
|
return defs.filter((d) => {
|
||||||
// Computed awards (field = dxcc/cqz/…) are derived automatically.
|
// Computed awards (field = dxcc/cqz/…) are derived automatically.
|
||||||
if (COMPUTED_FIELDS.has(String(d.field ?? '').toLowerCase())) return false;
|
if (COMPUTED_FIELDS.has(String(d.field ?? '').toLowerCase())) return false;
|
||||||
|
// Switched off in the award editor: not a candidate for anything.
|
||||||
|
if (d.valid === false) return false;
|
||||||
|
// Followed awards only, when a selection has been made. An empty
|
||||||
|
// selection means "all of them" — the same rule the Awards tab uses, so
|
||||||
|
// the two lists cannot disagree about what this station chases.
|
||||||
|
if (tracked.size > 0 && !tracked.has(String(d.code).toUpperCase())) return false;
|
||||||
const scope = d.dxcc_filter ?? [];
|
const scope = d.dxcc_filter ?? [];
|
||||||
if (scope.length > 0 && (!dxcc || !scope.includes(dxcc))) return false;
|
if (scope.length > 0 && (!dxcc || !scope.includes(dxcc))) return false;
|
||||||
// Offer the award even when its reference list isn't loaded yet: a custom
|
// Offer the award even when its reference list isn't loaded yet: a custom
|
||||||
@@ -122,7 +133,7 @@ export function AwardRefSelector({ dxcc, value, onChange, fieldValues, heightCla
|
|||||||
return true;
|
return true;
|
||||||
}).map((d) => ({ code: d.code, name: d.name, field: String(d.field ?? '').toLowerCase() }))
|
}).map((d) => ({ code: d.code, name: d.name, field: String(d.field ?? '').toLowerCase() }))
|
||||||
.sort((a, b) => a.code.localeCompare(b.code));
|
.sort((a, b) => a.code.localeCompare(b.code));
|
||||||
}, [defs, metas, dxcc]);
|
}, [defs, metas, dxcc, tracked]);
|
||||||
|
|
||||||
// Keep the selected award valid as the offered list changes with the call.
|
// Keep the selected award valid as the offered list changes with the call.
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
|||||||
@@ -588,6 +588,44 @@ export function ClusterGrid({ rows, spotStatus, onSpotClick, onSpotSelect }: Pro
|
|||||||
if (state) saveState(COL_STATE_KEY, state);
|
if (state) saveState(COL_STATE_KEY, state);
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
|
// HOLDING THE LIST STILL WHILE IT IS BEING READ.
|
||||||
|
//
|
||||||
|
// A busy evening puts a spot on the list every second or two, each landing at
|
||||||
|
// the top and pushing everything below it down. At the top of the list that is
|
||||||
|
// exactly right — it is what makes the panel live. A few rows down it makes
|
||||||
|
// the panel unusable: the callsign under the pointer has moved by the time the
|
||||||
|
// click lands, and the operator ends up chasing the row they wanted.
|
||||||
|
//
|
||||||
|
// So the grid freezes as soon as it is scrolled away from the top, and says
|
||||||
|
// how many spots are waiting. Scrolling back to the top releases it, as does
|
||||||
|
// clicking the notice. Nothing is lost — the spots keep arriving in the shared
|
||||||
|
// list; this only decides when the GRID is allowed to redraw with them.
|
||||||
|
const [held, setHeld] = useState<ClusterSpot[] | null>(null);
|
||||||
|
const shown = held ?? rows;
|
||||||
|
|
||||||
|
// How many arrived since the freeze. Counted by finding the frozen top row in
|
||||||
|
// the live list rather than by comparing lengths: the list is a ring buffer,
|
||||||
|
// so once it is full the length stops growing and a length comparison would
|
||||||
|
// report nothing new for the rest of the evening.
|
||||||
|
const spotID = (r: ClusterSpot) => `${(r as any).received_at}-${r.dx_call}-${(r as any).source_id}`;
|
||||||
|
const waiting = useMemo(() => {
|
||||||
|
if (!held || held.length === 0) return 0;
|
||||||
|
const top = spotID(held[0]);
|
||||||
|
const i = rows.findIndex((r) => spotID(r) === top);
|
||||||
|
return i < 0 ? rows.length : i; // fell out of the buffer: everything is new
|
||||||
|
}, [held, rows]);
|
||||||
|
|
||||||
|
const onBodyScroll = (e: { top: number }) => {
|
||||||
|
const down = e.top > 4; // a pixel or two of overscroll is not "scrolled down"
|
||||||
|
if (!down && held) setHeld(null);
|
||||||
|
if (down && !held) setHeld(rows);
|
||||||
|
};
|
||||||
|
|
||||||
|
const release = () => {
|
||||||
|
setHeld(null);
|
||||||
|
gridRef.current?.api?.ensureIndexVisible(0, 'top');
|
||||||
|
};
|
||||||
|
|
||||||
function handleRowClicked(e: RowClickedEvent<ClusterSpot>) {
|
function handleRowClicked(e: RowClickedEvent<ClusterSpot>) {
|
||||||
if (e.data && onSpotSelect) onSpotSelect(e.data);
|
if (e.data && onSpotSelect) onSpotSelect(e.data);
|
||||||
}
|
}
|
||||||
@@ -646,7 +684,7 @@ export function ClusterGrid({ rows, spotStatus, onSpotClick, onSpotSelect }: Pro
|
|||||||
<AgGridReact<ClusterSpot>
|
<AgGridReact<ClusterSpot>
|
||||||
ref={gridRef}
|
ref={gridRef}
|
||||||
theme={hamlogTheme}
|
theme={hamlogTheme}
|
||||||
rowData={rows}
|
rowData={shown}
|
||||||
columnDefs={columnDefs}
|
columnDefs={columnDefs}
|
||||||
defaultColDef={defaultColDef}
|
defaultColDef={defaultColDef}
|
||||||
context={context}
|
context={context}
|
||||||
@@ -658,11 +696,20 @@ export function ClusterGrid({ rows, spotStatus, onSpotClick, onSpotSelect }: Pro
|
|||||||
onSortChanged={saveColumnState}
|
onSortChanged={saveColumnState}
|
||||||
onRowClicked={handleRowClicked}
|
onRowClicked={handleRowClicked}
|
||||||
onRowDoubleClicked={handleRowDoubleClicked}
|
onRowDoubleClicked={handleRowDoubleClicked}
|
||||||
|
onBodyScroll={onBodyScroll}
|
||||||
animateRows={false}
|
animateRows={false}
|
||||||
suppressCellFocus
|
suppressCellFocus
|
||||||
getRowId={(p) => `${(p.data as any).received_at}-${(p.data as any).dx_call}-${(p.data as any).source_id}`}
|
getRowId={(p) => `${(p.data as any).received_at}-${(p.data as any).dx_call}-${(p.data as any).source_id}`}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
{/* Only when something is actually waiting: a frozen list with nothing
|
||||||
|
new to show needs no announcement. */}
|
||||||
|
{waiting > 0 && (
|
||||||
|
<button type="button" onClick={release}
|
||||||
|
className="absolute left-1/2 -translate-x-1/2 top-1 z-10 rounded-full border border-primary bg-primary px-3 py-1 text-[11px] font-semibold text-primary-foreground shadow-lg hover:opacity-90">
|
||||||
|
{t('clg2.newSpots', { n: waiting })}
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<Dialog open={pickerOpen} onOpenChange={setPickerOpen}>
|
<Dialog open={pickerOpen} onOpenChange={setPickerOpen}>
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import {
|
|||||||
} from '@/components/ui/select';
|
} from '@/components/ui/select';
|
||||||
import { cn } from '@/lib/utils';
|
import { cn } from '@/lib/utils';
|
||||||
import { useI18n } from '@/lib/i18n';
|
import { useI18n } from '@/lib/i18n';
|
||||||
|
import { Combobox } from '@/components/ui/combobox';
|
||||||
import { pathBetween, pathBetweenLatLon, gridToLatLon } from '@/lib/maidenhead';
|
import { pathBetween, pathBetweenLatLon, gridToLatLon } from '@/lib/maidenhead';
|
||||||
import { BandSlotGrid } from '@/components/BandSlotGrid';
|
import { BandSlotGrid } from '@/components/BandSlotGrid';
|
||||||
import { AwardRefSelector } from '@/components/AwardRefSelector';
|
import { AwardRefSelector } from '@/components/AwardRefSelector';
|
||||||
@@ -70,6 +71,10 @@ interface Props {
|
|||||||
band: string;
|
band: string;
|
||||||
mode: string;
|
mode: string;
|
||||||
bands?: string[]; // configured bands for the worked-before matrix columns
|
bands?: string[]; // configured bands for the worked-before matrix columns
|
||||||
|
// The station's satellites, for the SAT_NAME dropdown. Passed in rather than
|
||||||
|
// read here: the list lives in Preferences, and App already reloads it when
|
||||||
|
// Preferences close — a panel reading it once at mount would need a restart.
|
||||||
|
satellites?: string[];
|
||||||
// When the entry form is empty and a QSO is selected in the log grid, the
|
// When the entry form is empty and a QSO is selected in the log grid, the
|
||||||
// Stats (F1) matrix shows THAT contact's entity instead of sitting blank.
|
// Stats (F1) matrix shows THAT contact's entity instead of sitting blank.
|
||||||
// Only the matrix is redirected — every other tab still edits the live entry.
|
// Only the matrix is redirected — every other tab still edits the live entry.
|
||||||
@@ -150,7 +155,7 @@ function Field({ label, span = 1, className, children }: { label: string; span?:
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function DetailsPanel({ callsign, prefix, operatorGrid, remoteGrid, qth, name, country, comment, note, details, onChange, wb, wbBusy, band, mode, bands, slotCall, slotBand, slotMode, slotWb, slotWbBusy, tab, onTab, keyerActive, onEditQso }: Props) {
|
export function DetailsPanel({ callsign, prefix, operatorGrid, remoteGrid, qth, name, country, comment, note, details, onChange, wb, wbBusy, band, mode, bands, satellites = [], slotCall, slotBand, slotMode, slotWb, slotWbBusy, tab, onTab, keyerActive, onEditQso }: Props) {
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const [internalOpen, setInternalOpen] = useState<TabName>('stats');
|
const [internalOpen, setInternalOpen] = useState<TabName>('stats');
|
||||||
const open = tab ?? internalOpen; // controlled when `tab` is provided
|
const open = tab ?? internalOpen; // controlled when `tab` is provided
|
||||||
@@ -478,7 +483,25 @@ export function DetailsPanel({ callsign, prefix, operatorGrid, remoteGrid, qth,
|
|||||||
{satelliteMode && (
|
{satelliteMode && (
|
||||||
<>
|
<>
|
||||||
<Field label={t('detp.satName')} span={3}>
|
<Field label={t('detp.satName')} span={3}>
|
||||||
<Input value={details.sat_name} onChange={(e) => onChange({ sat_name: e.target.value })} />
|
{/* The station's own satellites, in alphabetical order, with the
|
||||||
|
box still open to anything typed: SAT_NAME is compared
|
||||||
|
character for character by the awards and by LoTW, so a
|
||||||
|
remembered spelling beats a fresh one every pass — but a bird
|
||||||
|
worked once and never added to the list must not be
|
||||||
|
impossible to log. */}
|
||||||
|
{/* showToggle: without the chevron this control is a text box that
|
||||||
|
happens to open on a keystroke, which nobody discovers — and
|
||||||
|
is exactly what "there is still no dropdown" meant.
|
||||||
|
allowFreeText: the list is the station's own, so a bird
|
||||||
|
worked once and never added to it must still be loggable. */}
|
||||||
|
<Combobox
|
||||||
|
value={details.sat_name}
|
||||||
|
options={satellites}
|
||||||
|
placeholder={t('detp.satName')}
|
||||||
|
showToggle
|
||||||
|
allowFreeText
|
||||||
|
onChange={(v) => onChange({ sat_name: v })}
|
||||||
|
/>
|
||||||
</Field>
|
</Field>
|
||||||
<Field label={t('detp.satelliteMode')} span={3}>
|
<Field label={t('detp.satelliteMode')} span={3}>
|
||||||
<Input value={details.sat_mode} onChange={(e) => onChange({ sat_mode: e.target.value })} />
|
<Input value={details.sat_mode} onChange={(e) => onChange({ sat_mode: e.target.value })} />
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { useEffect, useMemo, useRef, useState } from 'react';
|
import { memo, useEffect, useMemo, useRef, useState } from 'react';
|
||||||
import {
|
import {
|
||||||
ArrowDown, ArrowUp, ArrowLeft, ArrowRight, Copy, Plus, Star, StarOff, Trash2,
|
ArrowDown, ArrowUp, ArrowLeft, ArrowRight, Copy, Plus, Star, StarOff, Trash2,
|
||||||
ChevronDown, ChevronRight,
|
ChevronDown, ChevronRight,
|
||||||
@@ -175,6 +175,11 @@ interface Props {
|
|||||||
flexAvailable?: boolean; // CAT backend is FlexRadio → offer it as a Main pane
|
flexAvailable?: boolean; // CAT backend is FlexRadio → offer it as a Main pane
|
||||||
icomAvailable?: boolean; // CAT backend is Icom → offer the Icom console as a Main pane
|
icomAvailable?: boolean; // CAT backend is Icom → offer the Icom console as a Main pane
|
||||||
yaesuAvailable?: boolean; // CAT backend is Yaesu → offer the Yaesu console as a Main pane
|
yaesuAvailable?: boolean; // CAT backend is Yaesu → offer the Yaesu console as a Main pane
|
||||||
|
// Opens a QSO in the editor. Settings is not where a log is edited — but the
|
||||||
|
// RDA comparison lists contacts whose district is in dispute, and a list of
|
||||||
|
// things to fix that cannot be acted on is a list to write down and look up
|
||||||
|
// again later.
|
||||||
|
onEditQSO?: (id: number) => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Pretty little card showing what OpsLog will stamp on each QSO based on
|
// Pretty little card showing what OpsLog will stamp on each QSO based on
|
||||||
@@ -200,6 +205,7 @@ type SectionId =
|
|||||||
| 'lookup'
|
| 'lookup'
|
||||||
| 'lists-bands'
|
| 'lists-bands'
|
||||||
| 'lists-modes'
|
| 'lists-modes'
|
||||||
|
| 'lists-satellites'
|
||||||
| 'cluster'
|
| 'cluster'
|
||||||
| 'backup'
|
| 'backup'
|
||||||
| 'database'
|
| 'database'
|
||||||
@@ -310,6 +316,7 @@ function buildTree(flexAvailable: boolean, t: (k: string) => string): TreeNode[]
|
|||||||
{ kind: 'group', label: t('nav.lists'), icon: Database, defaultOpen: true, children: [
|
{ kind: 'group', label: t('nav.lists'), icon: Database, defaultOpen: true, children: [
|
||||||
{ kind: 'item', label: t('sec.bands'), id: 'lists-bands' },
|
{ kind: 'item', label: t('sec.bands'), id: 'lists-bands' },
|
||||||
{ kind: 'item', label: t('sec.modes'), id: 'lists-modes' },
|
{ kind: 'item', label: t('sec.modes'), id: 'lists-modes' },
|
||||||
|
{ kind: 'item', label: t('sec.satellites'), id: 'lists-satellites' },
|
||||||
]},
|
]},
|
||||||
{ kind: 'item', label: t('sec.cluster'), id: 'cluster' },
|
{ kind: 'item', label: t('sec.cluster'), id: 'cluster' },
|
||||||
{ kind: 'item', label: t('sec.udp'), id: 'udp' },
|
{ kind: 'item', label: t('sec.udp'), id: 'udp' },
|
||||||
@@ -339,7 +346,7 @@ function buildTree(flexAvailable: boolean, t: (k: string) => string): TreeNode[]
|
|||||||
// Map section id → i18n key (breadcrumb / placeholders).
|
// Map section id → i18n key (breadcrumb / placeholders).
|
||||||
const SECTION_KEY: Partial<Record<SectionId, string>> = {
|
const SECTION_KEY: Partial<Record<SectionId, string>> = {
|
||||||
station: 'sec.station', profiles: 'sec.profiles', operating: 'sec.operating', confirmations: 'sec.confirmations',
|
station: 'sec.station', profiles: 'sec.profiles', operating: 'sec.operating', confirmations: 'sec.confirmations',
|
||||||
'external-services': 'sec.external', appearance: 'sec.appearance', lookup: 'sec.lookup', 'lists-bands': 'sec.bands', 'lists-modes': 'sec.modes',
|
'external-services': 'sec.external', appearance: 'sec.appearance', lookup: 'sec.lookup', 'lists-bands': 'sec.bands', 'lists-modes': 'sec.modes', 'lists-satellites': 'sec.satellites',
|
||||||
cluster: 'sec.cluster', backup: 'sec.backup', database: 'sec.database', autostart: 'sec.autostart', udp: 'sec.udp',
|
cluster: 'sec.cluster', backup: 'sec.backup', database: 'sec.database', autostart: 'sec.autostart', udp: 'sec.udp',
|
||||||
adifmon: 'sec.adifmon',
|
adifmon: 'sec.adifmon',
|
||||||
foldersync: 'sec.foldersync',
|
foldersync: 'sec.foldersync',
|
||||||
@@ -361,6 +368,7 @@ const SECTION_LABELS: Partial<Record<SectionId, string>> = {
|
|||||||
lookup: 'Callsign Lookup',
|
lookup: 'Callsign Lookup',
|
||||||
'lists-bands': 'Bands',
|
'lists-bands': 'Bands',
|
||||||
'lists-modes': 'Modes & default RST',
|
'lists-modes': 'Modes & default RST',
|
||||||
|
'lists-satellites': 'Satellites',
|
||||||
cluster: 'DX Cluster',
|
cluster: 'DX Cluster',
|
||||||
backup: 'Database backup',
|
backup: 'Database backup',
|
||||||
database: 'Database',
|
database: 'Database',
|
||||||
@@ -1476,7 +1484,59 @@ const ICOM_MODELS: { name: string; addr: number }[] = [
|
|||||||
{ name: 'IC-9700', addr: 0xA2 },
|
{ name: 'IC-9700', addr: 0xA2 },
|
||||||
];
|
];
|
||||||
|
|
||||||
export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChanged, flexAvailable, icomAvailable, yaesuAvailable }: Props) {
|
// The radios OpsLog talks to, by BRAND, and the ways each one can be reached.
|
||||||
|
//
|
||||||
|
// Three connections exist in the world and each brand has its own subset:
|
||||||
|
// usb — a COM port, the radio's own USB or a serial cable
|
||||||
|
// bridge — RS-232 carried over Ethernet by a serial bridge (ser2net, an
|
||||||
|
// Ethernet-serial box): the SAME CAT bytes, a socket instead of wire
|
||||||
|
// native — the manufacturer's own network protocol, a session of its own
|
||||||
|
//
|
||||||
|
// The backend NAME stored in settings is unchanged — 'icom-net' is still
|
||||||
|
// 'icom-net' — because a settings file written by an older build has to keep
|
||||||
|
// working. This table is only how the two questions map onto it.
|
||||||
|
// OmniRig leads — it is the one that works with any radio, so it is where
|
||||||
|
// someone who does not find their rig below should land. The rest are
|
||||||
|
// alphabetical, because a list of brands has no other defensible order.
|
||||||
|
const CAT_BRANDS: { id: string; label: string; links: string[]; backend: (link: string) => string }[] = [
|
||||||
|
{ id: 'omnirig', label: 'OmniRig (any rig)', links: ['usb'], backend: () => 'omnirig' },
|
||||||
|
{ id: 'elecraft', label: 'Elecraft K3 / K4', links: ['usb', 'bridge'], backend: () => 'elecraft' },
|
||||||
|
{ id: 'tci', label: 'Expert Electronics / SunSDR (TCI)', links: ['native'], backend: () => 'tci' },
|
||||||
|
{ id: 'flex', label: 'FlexRadio (SmartSDR)', links: ['native'], backend: () => 'flex' },
|
||||||
|
{ id: 'icom', label: 'Icom', links: ['usb', 'native'], backend: (l) => (l === 'native' ? 'icom-net' : 'icom') },
|
||||||
|
{ id: 'kenwood', label: 'Kenwood', links: ['usb', 'bridge'], backend: () => 'kenwood' },
|
||||||
|
{ id: 'xiegu', label: 'Xiegu', links: ['usb'], backend: () => 'xiegu' },
|
||||||
|
{ id: 'yaesu', label: 'Yaesu', links: ['usb'], backend: () => 'yaesu' },
|
||||||
|
];
|
||||||
|
|
||||||
|
// brandOfBackend reads the stored backend back into the two questions.
|
||||||
|
function brandOfBackend(backend: string, kenwoodLink?: string): { brand: string; link: string } {
|
||||||
|
switch (backend) {
|
||||||
|
case 'icom-net': return { brand: 'icom', link: 'native' };
|
||||||
|
case 'icom': return { brand: 'icom', link: 'usb' };
|
||||||
|
case 'flex': return { brand: 'flex', link: 'native' };
|
||||||
|
case 'tci': return { brand: 'tci', link: 'native' };
|
||||||
|
case 'yaesu': return { brand: 'yaesu', link: 'usb' };
|
||||||
|
case 'xiegu': return { brand: 'xiegu', link: 'usb' };
|
||||||
|
case 'kenwood': case 'elecraft':
|
||||||
|
return { brand: backend, link: kenwoodLink || 'usb' };
|
||||||
|
default: return { brand: 'omnirig', link: 'usb' };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// SETTINGS DOES NOT RE-RENDER WITH THE MAIN WINDOW.
|
||||||
|
//
|
||||||
|
// It is a child of App, and App re-renders on every cluster spot, every CAT
|
||||||
|
// status push, every decode — several times a second on a busy evening. Each of
|
||||||
|
// those re-rendered this entire panel, which is large enough that the rebuild
|
||||||
|
// takes longer than the gap between them: the page looked like it was
|
||||||
|
// refreshing ten times a second and buttons stopped responding, because the
|
||||||
|
// element under the pointer was replaced between the press and the release.
|
||||||
|
//
|
||||||
|
// memo() cuts that off. It only works if the props hold still, which is why
|
||||||
|
// App passes callbacks that do not change identity on every render — see the
|
||||||
|
// useCallback wrappers there.
|
||||||
|
function SettingsModalImpl({ onClose, onSaved, initialSection, onMainPaneChanged, flexAvailable, icomAvailable, yaesuAvailable, onEditQSO }: Props) {
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const [selected, setSelected] = useState<SectionId>((initialSection as SectionId) || 'station');
|
const [selected, setSelected] = useState<SectionId>((initialSection as SectionId) || 'station');
|
||||||
const [loading, setLoading] = useState(true);
|
const [loading, setLoading] = useState(true);
|
||||||
@@ -1505,7 +1565,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
const [activeProfile, setActiveProfile] = useState<Profile | null>(null);
|
const [activeProfile, setActiveProfile] = useState<Profile | null>(null);
|
||||||
const updateActive = (patch: Partial<Profile>) =>
|
const updateActive = (patch: Partial<Profile>) =>
|
||||||
setActiveProfile((p) => (p ? { ...p, ...patch } : p));
|
setActiveProfile((p) => (p ? { ...p, ...patch } : p));
|
||||||
const [lists, setLists] = useState<ListsSettings>({ bands: [], modes: [], rst_phone: [], rst_cw: [], rst_digital: [] });
|
const [lists, setLists] = useState<ListsSettings>({ bands: [], modes: [], rst_phone: [], rst_cw: [], rst_digital: [], satellites: [] });
|
||||||
// RST report lists edited as free text (one/space-separated values).
|
// RST report lists edited as free text (one/space-separated values).
|
||||||
const [rstText, setRstText] = useState({ phone: '', cw: '', digital: '' });
|
const [rstText, setRstText] = useState({ phone: '', cw: '', digital: '' });
|
||||||
// Custom band drafts (catalog covers ADIF spec but the user may have
|
// Custom band drafts (catalog covers ADIF spec but the user may have
|
||||||
@@ -1514,12 +1574,31 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
const [modeDraft, setModeDraft] = useState('');
|
const [modeDraft, setModeDraft] = useState('');
|
||||||
const [catCfg, setCatCfg] = useState<CATSettings>({
|
const [catCfg, setCatCfg] = useState<CATSettings>({
|
||||||
enabled: false, backend: 'omnirig', omnirig_rig: 1, omnirig_vfo: '', flex_host: '', flex_port: 4992, flex_spots: false, flex_decode_spots: false, flex_decode_secs: 120, flex_dvk_dax: false,
|
enabled: false, backend: 'omnirig', omnirig_rig: 1, omnirig_vfo: '', flex_host: '', flex_port: 4992, flex_spots: false, flex_decode_spots: false, flex_decode_secs: 120, flex_dvk_dax: false,
|
||||||
yaesu_port: '', yaesu_baud: 38400, yaesu_low_lines: false, kenwood_low_lines: false, kenwood_port: '', kenwood_baud: 9600, kenwood_host: '', kenwood_data_mode: 'usb', xiegu_port: '', xiegu_baud: 19200, xiegu_addr: 0x70, xiegu_ptt_line: '',
|
yaesu_port: '', yaesu_baud: 38400, yaesu_low_lines: false, kenwood_low_lines: false, kenwood_port: '', kenwood_baud: 9600, kenwood_host: '', kenwood_link: 'usb', kenwood_data_mode: 'usb', xiegu_port: '', xiegu_baud: 19200, xiegu_addr: 0x70, xiegu_ptt_line: '',
|
||||||
icom_port: '', icom_baud: 115200, icom_addr: 0x98, icom_net_host: '', icom_net_user: '', icom_net_pass: '', icom_net_audio: false,
|
icom_port: '', icom_baud: 115200, icom_addr: 0x98, icom_net_host: '', icom_net_user: '', icom_net_pass: '', icom_net_audio: false,
|
||||||
tci_host: '', tci_port: 40001, tci_spots: false, poll_ms: 250, delay_ms: 0, offset_on: false, offset_hz: 0,
|
tci_host: '', tci_port: 40001, tci_spots: false, poll_ms: 250, delay_ms: 0, offset_on: false, offset_hz: 0,
|
||||||
digital_default: 'FT8', share_enabled: false, share_port: 4532, share_proto: 'rigctl', share_tci_port: 40001,
|
digital_default: 'FT8', share_enabled: false, share_port: 4532, share_proto: 'rigctl', share_tci_port: 40001,
|
||||||
ptt_hotkey_enabled: false, ptt_hotkey: '', ptt_hotkey_toggle: false,
|
ptt_hotkey_enabled: false, ptt_hotkey: '', ptt_hotkey_toggle: false,
|
||||||
});
|
});
|
||||||
|
// Brand + connection, derived from the stored backend rather than held
|
||||||
|
// separately: two sources for one fact drift apart the first time something
|
||||||
|
// else writes the backend (loading a profile, an older settings file).
|
||||||
|
const catBrand = brandOfBackend(catCfg.backend, (catCfg as any).kenwood_link).brand;
|
||||||
|
const catLink = brandOfBackend(catCfg.backend, (catCfg as any).kenwood_link).link;
|
||||||
|
const applyCatBrand = (id: string) => {
|
||||||
|
const b = CAT_BRANDS.find((x) => x.id === id);
|
||||||
|
if (!b) return;
|
||||||
|
// Keep the connection when the new brand offers it, otherwise take its
|
||||||
|
// first — picking Flex from Kenwood-over-USB has to land on something.
|
||||||
|
const link = b.links.includes(catLink) ? catLink : b.links[0];
|
||||||
|
setCatCfg((s) => ({ ...s, backend: b.backend(link), kenwood_link: link } as any));
|
||||||
|
};
|
||||||
|
const applyCatLink = (link: string) => {
|
||||||
|
const b = CAT_BRANDS.find((x) => x.id === catBrand);
|
||||||
|
if (!b || !b.links.includes(link)) return;
|
||||||
|
setCatCfg((s) => ({ ...s, backend: b.backend(link), kenwood_link: link } as any));
|
||||||
|
};
|
||||||
|
|
||||||
// While true, the next key press is captured as the PTT hotkey.
|
// While true, the next key press is captured as the PTT hotkey.
|
||||||
const [capturingPtt, setCapturingPtt] = useState(false);
|
const [capturingPtt, setCapturingPtt] = useState(false);
|
||||||
const [rotors, setRotors] = useState<RotatorDevice[]>([]);
|
const [rotors, setRotors] = useState<RotatorDevice[]>([]);
|
||||||
@@ -1543,7 +1622,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
const [ubTest, setUbTest] = useState<{ ok: boolean; msg: string } | null>(null);
|
const [ubTest, setUbTest] = useState<{ ok: boolean; msg: string } | null>(null);
|
||||||
|
|
||||||
// Antenna Genius (4O3A) switch settings — TCP port is fixed at 9007.
|
// Antenna Genius (4O3A) switch settings — TCP port is fixed at 9007.
|
||||||
const [antgenius, setAntgenius] = useState<{ enabled: boolean; host: string; password: string }>({ enabled: false, host: '', password: '' });
|
const [antgenius, setAntgenius] = useState<{ enabled: boolean; host: string; password: string; use_for_my_antenna?: boolean; ant1_port?: number }>({ enabled: false, host: '', password: '', use_for_my_antenna: false, ant1_port: 1 });
|
||||||
const [tunergenius, setTunergenius] = useState<{ enabled: boolean; host: string; password: string }>({ enabled: false, host: '', password: '' });
|
const [tunergenius, setTunergenius] = useState<{ enabled: boolean; host: string; password: string }>({ enabled: false, host: '', password: '' });
|
||||||
const [psuCfg, setPsuCfg] = useState<{ enabled: boolean; com_port: string; baud: number; address: number }>({ enabled: false, com_port: '', baud: 9600, address: 1 });
|
const [psuCfg, setPsuCfg] = useState<{ enabled: boolean; com_port: string; baud: number; address: number }>({ enabled: false, com_port: '', baud: 9600, address: 1 });
|
||||||
|
|
||||||
@@ -1860,10 +1939,23 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
// operator's own log, and answering it must not modify that log.
|
// operator's own log, and answering it must not modify that log.
|
||||||
const [rdaCmp, setRdaCmp] = useState<any>(null);
|
const [rdaCmp, setRdaCmp] = useState<any>(null);
|
||||||
const [rdaCmpBusy, setRdaCmpBusy] = useState(false);
|
const [rdaCmpBusy, setRdaCmpBusy] = useState(false);
|
||||||
|
// Its own message, next to its own button.
|
||||||
|
//
|
||||||
|
// A failed comparison used to write into rdaMsg — which is rendered beside
|
||||||
|
// the FILL DISTRICTS button, a row above. The error appeared under a button
|
||||||
|
// nobody had pressed, and the one that had been pressed showed nothing at
|
||||||
|
// all, which reads as "the button does nothing".
|
||||||
|
const [rdaCmpMsg, setRdaCmpMsg] = useState<string>('');
|
||||||
const runRDACompare = async () => {
|
const runRDACompare = async () => {
|
||||||
setRdaCmpBusy(true); setRdaCmp(null);
|
setRdaCmpBusy(true); setRdaCmp(null); setRdaCmpMsg('');
|
||||||
try { setRdaCmp(await CompareRDASources()); }
|
try {
|
||||||
catch (e: any) { setRdaMsg(String(e?.message ?? e)); }
|
const r: any = await CompareRDASources();
|
||||||
|
setRdaCmp(r);
|
||||||
|
// A comparison that finds nothing is a RESULT, and the most likely one on
|
||||||
|
// a tidy log. Without a word for it the panel looked like it had not run.
|
||||||
|
if (!r || (r.scanned ?? 0) === 0) setRdaCmpMsg(t('rda.cmpNoRussian'));
|
||||||
|
else if ((r.disagree ?? 0) === 0) setRdaCmpMsg(t('rda.cmpNoConflict'));
|
||||||
|
} catch (e: any) { setRdaCmpMsg(String(e?.message ?? e)); }
|
||||||
finally { setRdaCmpBusy(false); }
|
finally { setRdaCmpBusy(false); }
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -2278,6 +2370,11 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
rst_phone: splitList(rstText.phone),
|
rst_phone: splitList(rstText.phone),
|
||||||
rst_cw: splitList(rstText.cw),
|
rst_cw: splitList(rstText.cw),
|
||||||
rst_digital: splitList(rstText.digital),
|
rst_digital: splitList(rstText.digital),
|
||||||
|
// Normalised HERE and not only on the field's blur: Save is reachable
|
||||||
|
// without ever leaving the box, and a list that depends on where the
|
||||||
|
// cursor went before the click is a list that sometimes saves.
|
||||||
|
satellites: Array.from(new Set(((lists.satellites ?? []) as string[])
|
||||||
|
.map((v) => v.trim().toUpperCase()).filter(Boolean))).sort(),
|
||||||
} as any);
|
} as any);
|
||||||
|
|
||||||
if (activeProfile) {
|
if (activeProfile) {
|
||||||
@@ -2872,6 +2969,40 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function SatellitesPanel() {
|
||||||
|
const sats = lists.satellites ?? [];
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<SectionHeader title={t('sec.satellites')} hint={t('sat.hint')} />
|
||||||
|
<div className="space-y-3 max-w-xl">
|
||||||
|
<div className="space-y-1">
|
||||||
|
<Label>{t('sat.listLabel')}</Label>
|
||||||
|
{/* Raw text, one per line, parsed on change — not a row-per-entry
|
||||||
|
editor with add and delete buttons. The list is short, edited
|
||||||
|
twice a year, and usually arrives pasted from a satellite
|
||||||
|
tracker; a textarea takes that paste in one gesture. */}
|
||||||
|
<textarea
|
||||||
|
className="w-full h-56 rounded-md border border-input bg-background p-2 font-mono text-xs"
|
||||||
|
value={sats.join('\n')}
|
||||||
|
placeholder={'AO-7\nAO-91\nRS-44\nSO-50'}
|
||||||
|
onChange={(e) => {
|
||||||
|
const next = e.target.value.split('\n').map((v) => v.trim());
|
||||||
|
setLists((s) => ({ ...s, satellites: next }));
|
||||||
|
}}
|
||||||
|
onBlur={() => setLists((s) => ({
|
||||||
|
// Tidied when the field is LEFT, never while typing: dropping an
|
||||||
|
// empty line as it is typed makes the Enter key look broken.
|
||||||
|
...s,
|
||||||
|
satellites: Array.from(new Set((s.satellites ?? []).map((v) => v.trim().toUpperCase()).filter(Boolean))).sort(),
|
||||||
|
}))}
|
||||||
|
/>
|
||||||
|
<p className="text-xs text-muted-foreground">{t('sat.listHint')}</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
function ModesPanel() {
|
function ModesPanel() {
|
||||||
const selected = lists.modes ?? [];
|
const selected = lists.modes ?? [];
|
||||||
const selectedSet = new Set(selected.map((m) => (m.name ?? '').toUpperCase()));
|
const selectedSet = new Set(selected.map((m) => (m.name ?? '').toUpperCase()));
|
||||||
@@ -3019,24 +3150,40 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
{t('cat.enable')}
|
{t('cat.enable')}
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
<div className="grid grid-cols-2 gap-3">
|
{/* BRAND, then CONNECTION.
|
||||||
|
The backend list mixed the two: "Icom (USB)" and "Icom (network)"
|
||||||
|
were separate entries, while Kenwood and Elecraft hid the same
|
||||||
|
choice in a field further down. An operator picks a radio, then
|
||||||
|
says how it is plugged in — so that is what the panel asks, in
|
||||||
|
that order, and the two answers together choose the backend. */}
|
||||||
|
<div className="grid grid-cols-2 gap-3 items-start">
|
||||||
<div className="space-y-1">
|
<div className="space-y-1">
|
||||||
<Label>{t('cat.backend')}</Label>
|
<Label>{t('cat.brand')}</Label>
|
||||||
<Select value={catCfg.backend} onValueChange={(v) => setCatCfg((s) => ({ ...s, backend: v }))}>
|
<Select value={catBrand} onValueChange={(v) => applyCatBrand(v)}>
|
||||||
<SelectTrigger><SelectValue /></SelectTrigger>
|
<SelectTrigger><SelectValue /></SelectTrigger>
|
||||||
<SelectContent>
|
<SelectContent>
|
||||||
<SelectItem value="omnirig">{t('cat.optOmnirig')}</SelectItem>
|
{CAT_BRANDS.map((b) => <SelectItem key={b.id} value={b.id}>{b.label}</SelectItem>)}
|
||||||
<SelectItem value="flex">{t('cat.optFlex')}</SelectItem>
|
|
||||||
<SelectItem value="yaesu">{t('cat.optYaesu')}</SelectItem>
|
|
||||||
<SelectItem value="kenwood">{t('cat.optKenwood')}</SelectItem>
|
|
||||||
<SelectItem value="elecraft">{t('cat.optElecraft')}</SelectItem>
|
|
||||||
<SelectItem value="xiegu">{t('cat.optXiegu')}</SelectItem>
|
|
||||||
<SelectItem value="icom">{t('cat.optIcom')}</SelectItem>
|
|
||||||
<SelectItem value="icom-net">{t('cat.optIcomNet')}</SelectItem>
|
|
||||||
<SelectItem value="tci">{t('cat.optTci')}</SelectItem>
|
|
||||||
</SelectContent>
|
</SelectContent>
|
||||||
</Select>
|
</Select>
|
||||||
</div>
|
</div>
|
||||||
|
{/* Only where there IS a choice. A dropdown showing one entry that
|
||||||
|
cannot be changed is a control pretending to be a decision — a
|
||||||
|
Yaesu is reached over USB and that is the end of it. */}
|
||||||
|
{(CAT_BRANDS.find((b) => b.id === catBrand)?.links ?? []).length > 1 ? (
|
||||||
|
<div className="space-y-1">
|
||||||
|
<Label>{t('cat.kwLink')}</Label>
|
||||||
|
<Select value={catLink} onValueChange={applyCatLink}>
|
||||||
|
<SelectTrigger><SelectValue /></SelectTrigger>
|
||||||
|
<SelectContent>
|
||||||
|
{(CAT_BRANDS.find((b) => b.id === catBrand)?.links ?? []).map((l) => (
|
||||||
|
<SelectItem key={l} value={l}>
|
||||||
|
{l === 'usb' ? t('cat.kwLinkUsb') : l === 'bridge' ? t('cat.kwLinkBridge') : t('cat.kwLinkNative')}
|
||||||
|
</SelectItem>
|
||||||
|
))}
|
||||||
|
</SelectContent>
|
||||||
|
</Select>
|
||||||
|
</div>
|
||||||
|
) : <div />}
|
||||||
{catCfg.backend === 'omnirig' && (
|
{catCfg.backend === 'omnirig' && (
|
||||||
<div className="space-y-1">
|
<div className="space-y-1">
|
||||||
<Label>{t('cat.omnirigRig')}</Label>
|
<Label>{t('cat.omnirigRig')}</Label>
|
||||||
@@ -3163,7 +3310,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
</Select>
|
</Select>
|
||||||
<span className="text-xs text-muted-foreground">{t('cat.yaesuBaudHint')}</span>
|
<span className="text-xs text-muted-foreground">{t('cat.yaesuBaudHint')}</span>
|
||||||
</div>
|
</div>
|
||||||
<div className="space-y-1">
|
<div className="col-span-2 space-y-1">
|
||||||
<label className="flex items-center gap-2 text-xs cursor-pointer">
|
<label className="flex items-center gap-2 text-xs cursor-pointer">
|
||||||
<Checkbox checked={!!catCfg.yaesu_low_lines} onCheckedChange={(c) => setCatCfg((s) => ({ ...s, yaesu_low_lines: !!c }))} />
|
<Checkbox checked={!!catCfg.yaesu_low_lines} onCheckedChange={(c) => setCatCfg((s) => ({ ...s, yaesu_low_lines: !!c }))} />
|
||||||
{t('cat.lowerLines')}
|
{t('cat.lowerLines')}
|
||||||
@@ -3172,8 +3319,8 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
</div>
|
</div>
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
{['icom', 'xiegu', 'kenwood'].includes(catCfg.backend) && (
|
{['icom', 'xiegu', 'kenwood', 'elecraft'].includes(catCfg.backend) && (
|
||||||
<div className="border-t border-border/60 pt-3">
|
<div className="col-span-2 border-t border-border/60 pt-3">
|
||||||
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
||||||
<Checkbox checked={civTrace} onCheckedChange={(c) => { setCivTrace(!!c); SetCIVTrace(!!c); }} />
|
<Checkbox checked={civTrace} onCheckedChange={(c) => { setCivTrace(!!c); SetCIVTrace(!!c); }} />
|
||||||
{t('cat.civTrace')}
|
{t('cat.civTrace')}
|
||||||
@@ -3181,6 +3328,11 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
)}
|
)}
|
||||||
{(catCfg.backend === 'kenwood' || catCfg.backend === 'elecraft') && (
|
{(catCfg.backend === 'kenwood' || catCfg.backend === 'elecraft') && (
|
||||||
<>
|
<>
|
||||||
|
{/* USB or network, as a choice.
|
||||||
|
The two were offered side by side with nothing to say which one
|
||||||
|
the backend would use — it prefers the network address whenever
|
||||||
|
the field is not empty, which is invisible from here. */}
|
||||||
|
{(((catCfg as any).kenwood_link || 'usb') === 'usb') && (<>
|
||||||
<div className="space-y-1">
|
<div className="space-y-1">
|
||||||
<Label>{t('cat.kenwoodPort')}</Label>
|
<Label>{t('cat.kenwoodPort')}</Label>
|
||||||
<div className="flex gap-2">
|
<div className="flex gap-2">
|
||||||
@@ -3202,14 +3354,19 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
{[4800, 9600, 19200, 38400, 57600, 115200].map((r) => <SelectItem key={r} value={String(r)}>{r}</SelectItem>)}
|
{[4800, 9600, 19200, 38400, 57600, 115200].map((r) => <SelectItem key={r} value={String(r)}>{r}</SelectItem>)}
|
||||||
</SelectContent>
|
</SelectContent>
|
||||||
</Select> </div>
|
</Select> </div>
|
||||||
|
</>)}
|
||||||
|
{((catCfg as any).kenwood_link === 'bridge') && (
|
||||||
<div className="space-y-1">
|
<div className="space-y-1">
|
||||||
<Label>{t('cat.kenwoodHost')}</Label>
|
<Label>{t('cat.kenwoodHost')}</Label>
|
||||||
<Input
|
<Input
|
||||||
value={catCfg.kenwood_host || ''}
|
value={catCfg.kenwood_host || ''}
|
||||||
placeholder="192.168.1.50:4532"
|
placeholder="192.168.1.50:4999"
|
||||||
onChange={(e) => setCatCfg((s) => ({ ...s, kenwood_host: e.target.value }))}
|
onChange={(e) => setCatCfg((s) => ({ ...s, kenwood_host: e.target.value }))}
|
||||||
/> </div>
|
/>
|
||||||
<div className="space-y-1">
|
<p className="text-xs text-muted-foreground">{t('cat.kenwoodHostHint')}</p>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
<div className="col-span-2 space-y-1">
|
||||||
<label className="flex items-center gap-2 text-xs cursor-pointer">
|
<label className="flex items-center gap-2 text-xs cursor-pointer">
|
||||||
<Checkbox checked={!!catCfg.kenwood_low_lines} onCheckedChange={(c) => setCatCfg((s) => ({ ...s, kenwood_low_lines: !!c }))} />
|
<Checkbox checked={!!catCfg.kenwood_low_lines} onCheckedChange={(c) => setCatCfg((s) => ({ ...s, kenwood_low_lines: !!c }))} />
|
||||||
{t('cat.lowerLines')}
|
{t('cat.lowerLines')}
|
||||||
@@ -3822,6 +3979,38 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
/>
|
/>
|
||||||
<p className="text-xs text-muted-foreground">{t('ag2.passwordHint')}</p>
|
<p className="text-xs text-muted-foreground">{t('ag2.passwordHint')}</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{/* MY_ANTENNA from the switch.
|
||||||
|
The working conditions hold what was PLANNED for the band; the
|
||||||
|
switch knows what is connected. Off by default: a station that
|
||||||
|
names its antennas differently in the two places would otherwise
|
||||||
|
find its log quietly rewritten. */}
|
||||||
|
<div className="border-t border-border/60 pt-3 space-y-2">
|
||||||
|
<label className="flex items-start gap-2 text-sm cursor-pointer">
|
||||||
|
<Checkbox className="mt-0.5" checked={!!antgenius.use_for_my_antenna}
|
||||||
|
onCheckedChange={(c) => setAntgenius((s: any) => ({ ...s, use_for_my_antenna: !!c }))} />
|
||||||
|
<span>
|
||||||
|
{t('ag2.useForMyAnt')}
|
||||||
|
<span className="block text-xs text-muted-foreground">{t('ag2.useForMyAntHint')}</span>
|
||||||
|
</span>
|
||||||
|
</label>
|
||||||
|
{!!antgenius.use_for_my_antenna && (
|
||||||
|
<div className="pl-6 space-y-1">
|
||||||
|
<Label>{t('ag2.ant1Port')}</Label>
|
||||||
|
<div className="inline-flex rounded-md border border-border overflow-hidden text-xs">
|
||||||
|
{[1, 2].map((n) => (
|
||||||
|
<button key={n} type="button"
|
||||||
|
onClick={() => setAntgenius((s: any) => ({ ...s, ant1_port: n }))}
|
||||||
|
className={cn('px-3 py-1.5 font-medium',
|
||||||
|
(antgenius.ant1_port ?? 1) === n ? 'bg-primary text-primary-foreground' : 'text-muted-foreground hover:bg-muted')}>
|
||||||
|
{n === 1 ? t('ag2.portA') : t('ag2.portB')}
|
||||||
|
</button>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
<p className="text-xs text-muted-foreground">{t('ag2.ant1PortHint')}</p>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
@@ -4918,11 +5107,18 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
maxLength={24}
|
maxLength={24}
|
||||||
onChange={(e) => setMacro(i, { label: e.target.value })}
|
onChange={(e) => setMacro(i, { label: e.target.value })}
|
||||||
/>
|
/>
|
||||||
|
{/* 500, not 120. A DXSpider filter is a list of prefixes and
|
||||||
|
an operator's own list of wanted countries runs past a
|
||||||
|
hundred characters easily — the field simply stopped
|
||||||
|
accepting keystrokes, with nothing to say why, and the
|
||||||
|
command was saved truncated. The title shows the whole
|
||||||
|
thing, since the box cannot. */}
|
||||||
<Input
|
<Input
|
||||||
className="h-8 flex-1 min-w-0 font-mono text-xs"
|
className="h-8 flex-1 min-w-0 font-mono text-xs"
|
||||||
placeholder={t('clu.macroCmd')}
|
placeholder={t('clu.macroCmd')}
|
||||||
value={m.cmd}
|
value={m.cmd}
|
||||||
maxLength={120}
|
title={m.cmd}
|
||||||
|
maxLength={500}
|
||||||
onChange={(e) => setMacro(i, { cmd: e.target.value })}
|
onChange={(e) => setMacro(i, { cmd: e.target.value })}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
@@ -7250,7 +7446,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
<div className="flex items-center gap-3">
|
<div className="flex items-center gap-3">
|
||||||
<Button size="sm" variant="secondary" onClick={runRDABackfill} disabled={rdaBusy}>
|
<Button size="sm" variant="secondary" onClick={runRDABackfill} disabled={rdaBusy}>
|
||||||
{rdaBusy ? <Loader2 className="size-3.5 animate-spin mr-1.5" /> : null}
|
{rdaBusy ? <Loader2 className="size-3.5 animate-spin mr-1.5" /> : null}
|
||||||
{t('rda.backfillRun')}
|
{rdaBusy ? t('rda.backfillRunning') : t('rda.backfillRun')}
|
||||||
</Button>
|
</Button>
|
||||||
{rdaMsg && <span className="text-xs text-muted-foreground">{rdaMsg}</span>}
|
{rdaMsg && <span className="text-xs text-muted-foreground">{rdaMsg}</span>}
|
||||||
</div>
|
</div>
|
||||||
@@ -7264,8 +7460,9 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
<div className="flex items-center gap-3">
|
<div className="flex items-center gap-3">
|
||||||
<Button size="sm" variant="secondary" onClick={runRDACompare} disabled={rdaCmpBusy}>
|
<Button size="sm" variant="secondary" onClick={runRDACompare} disabled={rdaCmpBusy}>
|
||||||
{rdaCmpBusy ? <Loader2 className="size-3.5 animate-spin mr-1.5" /> : null}
|
{rdaCmpBusy ? <Loader2 className="size-3.5 animate-spin mr-1.5" /> : null}
|
||||||
{t('rda.cmpRun')}
|
{rdaCmpBusy ? t('rda.cmpRunning') : t('rda.cmpRun')}
|
||||||
</Button>
|
</Button>
|
||||||
|
{!!rdaCmpMsg && <span className="text-xs text-muted-foreground">{rdaCmpMsg}</span>}
|
||||||
{rdaCmp && (
|
{rdaCmp && (
|
||||||
<span className="text-xs text-muted-foreground">
|
<span className="text-xs text-muted-foreground">
|
||||||
{t('rda.cmpDone', {
|
{t('rda.cmpDone', {
|
||||||
@@ -7278,7 +7475,19 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
{/* The disagreements themselves. A count alone would say "there is a
|
{/* The disagreements themselves. A count alone would say "there is a
|
||||||
problem" and leave the operator with no way to look at it. */}
|
problem" and leave the operator with no way to look at it. */}
|
||||||
{rdaCmp?.conflicts?.length > 0 && (
|
{rdaCmp?.conflicts?.length > 0 && (
|
||||||
<div className="max-h-56 overflow-auto rounded border border-border">
|
<>
|
||||||
|
<p className="text-[11px] text-muted-foreground">
|
||||||
|
{t('rda.cmpListHint', { n: rdaCmp.conflicts.length, d: rdaCmp.disagree ?? 0 })}
|
||||||
|
</p>
|
||||||
|
{/* Tall enough to work through. It was capped at 224 px — about six
|
||||||
|
rows of a list that can hold two hundred — inside a panel that
|
||||||
|
does not scroll to reveal what the box could not show. */}
|
||||||
|
{/* NO overscroll-contain here. It stops the wheel from chaining to
|
||||||
|
the settings pane behind, so with a short list — nothing to
|
||||||
|
scroll inside the box — the pointer over the table froze the
|
||||||
|
whole panel. The box scrolls when it has to; the page scrolls
|
||||||
|
the rest of the time. */}
|
||||||
|
<div className="max-h-[28rem] overflow-y-auto rounded border border-border">
|
||||||
<table className="w-full text-[11px]">
|
<table className="w-full text-[11px]">
|
||||||
<thead className="sticky top-0 bg-card text-left text-muted-foreground border-b border-border">
|
<thead className="sticky top-0 bg-card text-left text-muted-foreground border-b border-border">
|
||||||
<tr>
|
<tr>
|
||||||
@@ -7292,7 +7501,19 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
<tbody>
|
<tbody>
|
||||||
{rdaCmp.conflicts.map((c: any) => (
|
{rdaCmp.conflicts.map((c: any) => (
|
||||||
<tr key={c.qso_id} className="border-b border-border/30">
|
<tr key={c.qso_id} className="border-b border-border/30">
|
||||||
<td className="py-1 px-2 font-mono font-semibold">{c.callsign}</td>
|
{/* The callsign opens the contact. A list of things to fix
|
||||||
|
that cannot be acted on is a list of things to write
|
||||||
|
down and look up again later. */}
|
||||||
|
<td className="py-1 px-2 font-mono font-semibold">
|
||||||
|
{onEditQSO ? (
|
||||||
|
<button type="button"
|
||||||
|
onClick={() => { onEditQSO(c.qso_id); onClose(); }}
|
||||||
|
title={t('rda.cmpOpen')}
|
||||||
|
className="underline decoration-dotted underline-offset-2 hover:text-primary">
|
||||||
|
{c.callsign}
|
||||||
|
</button>
|
||||||
|
) : c.callsign}
|
||||||
|
</td>
|
||||||
<td className="py-1 pr-2 font-mono">{c.date}</td>
|
<td className="py-1 pr-2 font-mono">{c.date}</td>
|
||||||
<td className="py-1 pr-2 font-mono">{c.from_log}{c.confirmed ? ' ✓' : ''}</td>
|
<td className="py-1 pr-2 font-mono">{c.from_log}{c.confirmed ? ' ✓' : ''}</td>
|
||||||
<td className="py-1 pr-2 font-mono">{c.from_db}</td>
|
<td className="py-1 pr-2 font-mono">{c.from_db}</td>
|
||||||
@@ -7304,6 +7525,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
|
</>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -7323,6 +7545,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
lookup: LookupPanel,
|
lookup: LookupPanel,
|
||||||
'lists-bands': BandsPanel,
|
'lists-bands': BandsPanel,
|
||||||
'lists-modes': ModesPanel,
|
'lists-modes': ModesPanel,
|
||||||
|
'lists-satellites': SatellitesPanel,
|
||||||
cluster: ClusterPanel,
|
cluster: ClusterPanel,
|
||||||
udp: UDPIntegrationsPanelWrapper,
|
udp: UDPIntegrationsPanelWrapper,
|
||||||
// Module-scope components, wrapped so their props can be passed. The nested
|
// Module-scope components, wrapped so their props can be passed. The nested
|
||||||
@@ -7505,6 +7728,8 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export const SettingsModal = memo(SettingsModalImpl);
|
||||||
|
|
||||||
// PortInput — a TCP port field you can actually clear.
|
// PortInput — a TCP port field you can actually clear.
|
||||||
//
|
//
|
||||||
// Every port box was written as `parseInt(e.target.value) || <default>`. Delete
|
// Every port box was written as `parseInt(e.target.value) || <default>`. Delete
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import { useEffect, useRef, useState } from 'react';
|
import { useEffect, useLayoutEffect, useRef, useState } from 'react';
|
||||||
|
import { createPortal } from 'react-dom';
|
||||||
import { ChevronDown } from 'lucide-react';
|
import { ChevronDown } from 'lucide-react';
|
||||||
import { Input } from './input';
|
import { Input } from './input';
|
||||||
import { cn } from '@/lib/utils';
|
import { cn } from '@/lib/utils';
|
||||||
@@ -36,6 +37,10 @@ export function Combobox({
|
|||||||
// otherwise "open" onto COM7 alone.
|
// otherwise "open" onto COM7 alone.
|
||||||
const [browse, setBrowse] = useState(false);
|
const [browse, setBrowse] = useState(false);
|
||||||
const ref = useRef<HTMLDivElement>(null);
|
const ref = useRef<HTMLDivElement>(null);
|
||||||
|
// Where the portalled menu goes. Measured from the field itself, and
|
||||||
|
// re-measured while it is open, so scrolling the panel underneath does not
|
||||||
|
// leave the list floating over the wrong row.
|
||||||
|
const [menuPos, setMenuPos] = useState({ top: 0, left: 0, width: 0 });
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
function onDoc(e: MouseEvent) {
|
function onDoc(e: MouseEvent) {
|
||||||
@@ -45,6 +50,28 @@ export function Combobox({
|
|||||||
return () => document.removeEventListener('mousedown', onDoc);
|
return () => document.removeEventListener('mousedown', onDoc);
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
|
useLayoutEffect(() => {
|
||||||
|
if (!open) return;
|
||||||
|
const place = () => {
|
||||||
|
const el = ref.current;
|
||||||
|
if (!el) return;
|
||||||
|
const r = el.getBoundingClientRect();
|
||||||
|
// Opens UPWARD when there is not enough room below — which is exactly
|
||||||
|
// where these fields tend to sit, at the bottom of a panel.
|
||||||
|
const height = 240;
|
||||||
|
const below = window.innerHeight - r.bottom;
|
||||||
|
const top = below < height + 8 ? Math.max(4, r.top - height - 4) : r.bottom + 4;
|
||||||
|
setMenuPos({ top, left: r.left, width: r.width });
|
||||||
|
};
|
||||||
|
place();
|
||||||
|
window.addEventListener('scroll', place, true);
|
||||||
|
window.addEventListener('resize', place);
|
||||||
|
return () => {
|
||||||
|
window.removeEventListener('scroll', place, true);
|
||||||
|
window.removeEventListener('resize', place);
|
||||||
|
};
|
||||||
|
}, [open]);
|
||||||
|
|
||||||
const filtered = !open ? []
|
const filtered = !open ? []
|
||||||
: browse ? options.slice(0, 60)
|
: browse ? options.slice(0, 60)
|
||||||
: options.filter((o) => o.toLowerCase().includes(query.toLowerCase())).slice(0, 60);
|
: options.filter((o) => o.toLowerCase().includes(query.toLowerCase())).slice(0, 60);
|
||||||
@@ -121,8 +148,16 @@ export function Combobox({
|
|||||||
<ChevronDown className="size-3.5" />
|
<ChevronDown className="size-3.5" />
|
||||||
</button>
|
</button>
|
||||||
)}
|
)}
|
||||||
{open && filtered.length > 0 && (
|
{/* THE MENU IS PORTALLED to the body, and positioned from the field's own
|
||||||
<div className="absolute z-50 mt-1 max-h-60 w-full overflow-auto rounded-md border border-border bg-card shadow-lg text-xs">
|
rectangle. As an absolutely-positioned child it was clipped by whichever
|
||||||
|
scrolling or overflow-hidden box it happened to sit in: in the details
|
||||||
|
panel it was cut off after the first row, and a list showing one entry
|
||||||
|
of eight is worse than no list at all. */}
|
||||||
|
{open && filtered.length > 0 && createPortal(
|
||||||
|
<div
|
||||||
|
style={{ position: 'fixed', top: menuPos.top, left: menuPos.left, width: menuPos.width }}
|
||||||
|
className="z-[100] max-h-60 overflow-auto rounded-md border border-border bg-card shadow-lg text-xs"
|
||||||
|
>
|
||||||
{filtered.map((o) => (
|
{filtered.map((o) => (
|
||||||
<button
|
<button
|
||||||
key={o}
|
key={o}
|
||||||
@@ -134,7 +169,8 @@ export function Combobox({
|
|||||||
{o}
|
{o}
|
||||||
</button>
|
</button>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>,
|
||||||
|
document.body,
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|||||||
+10
-10
File diff suppressed because one or more lines are too long
@@ -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.26.13';
|
export const APP_VERSION = '0.26.14';
|
||||||
|
|
||||||
// Author / credits, shown in Help -> About.
|
// Author / credits, shown in Help -> About.
|
||||||
export const APP_AUTHOR = 'F4BPO';
|
export const APP_AUTHOR = 'F4BPO';
|
||||||
|
|||||||
@@ -1738,6 +1738,8 @@ export namespace main {
|
|||||||
enabled: boolean;
|
enabled: boolean;
|
||||||
host: string;
|
host: string;
|
||||||
password: string;
|
password: string;
|
||||||
|
use_for_my_antenna: boolean;
|
||||||
|
ant1_port: number;
|
||||||
|
|
||||||
static createFrom(source: any = {}) {
|
static createFrom(source: any = {}) {
|
||||||
return new AntGeniusSettings(source);
|
return new AntGeniusSettings(source);
|
||||||
@@ -1748,6 +1750,8 @@ export namespace main {
|
|||||||
this.enabled = source["enabled"];
|
this.enabled = source["enabled"];
|
||||||
this.host = source["host"];
|
this.host = source["host"];
|
||||||
this.password = source["password"];
|
this.password = source["password"];
|
||||||
|
this.use_for_my_antenna = source["use_for_my_antenna"];
|
||||||
|
this.ant1_port = source["ant1_port"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
export class AudioSettings {
|
export class AudioSettings {
|
||||||
@@ -2148,6 +2152,7 @@ export namespace main {
|
|||||||
yaesu_baud: number;
|
yaesu_baud: number;
|
||||||
kenwood_host: string;
|
kenwood_host: string;
|
||||||
kenwood_port: string;
|
kenwood_port: string;
|
||||||
|
kenwood_link: string;
|
||||||
kenwood_baud: number;
|
kenwood_baud: number;
|
||||||
kenwood_data_mode: string;
|
kenwood_data_mode: string;
|
||||||
yaesu_low_lines: boolean;
|
yaesu_low_lines: boolean;
|
||||||
@@ -2199,6 +2204,7 @@ export namespace main {
|
|||||||
this.yaesu_baud = source["yaesu_baud"];
|
this.yaesu_baud = source["yaesu_baud"];
|
||||||
this.kenwood_host = source["kenwood_host"];
|
this.kenwood_host = source["kenwood_host"];
|
||||||
this.kenwood_port = source["kenwood_port"];
|
this.kenwood_port = source["kenwood_port"];
|
||||||
|
this.kenwood_link = source["kenwood_link"];
|
||||||
this.kenwood_baud = source["kenwood_baud"];
|
this.kenwood_baud = source["kenwood_baud"];
|
||||||
this.kenwood_data_mode = source["kenwood_data_mode"];
|
this.kenwood_data_mode = source["kenwood_data_mode"];
|
||||||
this.yaesu_low_lines = source["yaesu_low_lines"];
|
this.yaesu_low_lines = source["yaesu_low_lines"];
|
||||||
@@ -2833,6 +2839,7 @@ export namespace main {
|
|||||||
rst_phone: string[];
|
rst_phone: string[];
|
||||||
rst_cw: string[];
|
rst_cw: string[];
|
||||||
rst_digital: string[];
|
rst_digital: string[];
|
||||||
|
satellites: string[];
|
||||||
|
|
||||||
static createFrom(source: any = {}) {
|
static createFrom(source: any = {}) {
|
||||||
return new ListsSettings(source);
|
return new ListsSettings(source);
|
||||||
@@ -2845,6 +2852,7 @@ export namespace main {
|
|||||||
this.rst_phone = source["rst_phone"];
|
this.rst_phone = source["rst_phone"];
|
||||||
this.rst_cw = source["rst_cw"];
|
this.rst_cw = source["rst_cw"];
|
||||||
this.rst_digital = source["rst_digital"];
|
this.rst_digital = source["rst_digital"];
|
||||||
|
this.satellites = source["satellites"];
|
||||||
}
|
}
|
||||||
|
|
||||||
convertValues(a: any, classs: any, asMap: boolean = false): any {
|
convertValues(a: any, classs: any, asMap: boolean = false): any {
|
||||||
|
|||||||
+15
-1
@@ -273,6 +273,15 @@ func (k *Kenwood) Connect() error {
|
|||||||
// commands back produces the same). Say which of the two it is, and quote
|
// commands back produces the same). Say which of the two it is, and quote
|
||||||
// what came back, because that is the fact that decides where to look.
|
// what came back, because that is the fact that decides where to look.
|
||||||
if seen := k.heard; seen != "" {
|
if seen := k.heard; seen != "" {
|
||||||
|
// Over a NETWORK link, baud means nothing and saying "check the baud
|
||||||
|
// rate" sends the operator to a setting that cannot be the cause.
|
||||||
|
// The usual mistake there is a different protocol on the other end:
|
||||||
|
// Hamlib's rigctld (4532) answers text, so it looks alive and never
|
||||||
|
// replies to ID;. OpsLog itself serves that port under "Share CAT",
|
||||||
|
// which makes it an easy number to reach for.
|
||||||
|
if k.host != "" {
|
||||||
|
return fmt.Errorf("kenwood: %s is sending data but no reply to ID; or IF; — got %q. That end is not speaking the radio's CAT: point this at a serial-over-network bridge or the radio's own raw CAT port, not at Hamlib rigctld (4532)", k.host, seen)
|
||||||
|
}
|
||||||
return fmt.Errorf("kenwood: %s is sending data but no reply to ID; or IF; — got %q. Check the baud rate (set to %d here) and that nothing else is echoing the port", k.where(), seen, k.baud)
|
return fmt.Errorf("kenwood: %s is sending data but no reply to ID; or IF; — got %q. Check the baud rate (set to %d here) and that nothing else is echoing the port", k.where(), seen, k.baud)
|
||||||
}
|
}
|
||||||
if k.host != "" {
|
if k.host != "" {
|
||||||
@@ -451,7 +460,12 @@ func (k *Kenwood) ReadState() (RigState, error) {
|
|||||||
// The panel rides on the same poll and the same held mutex: its own reader
|
// The panel rides on the same poll and the same held mutex: its own reader
|
||||||
// would have to take turns on the serial port, and the K3 is slow enough
|
// would have to take turns on the serial port, and the K3 is slow enough
|
||||||
// that two readers taking turns is what makes a dial lag.
|
// that two readers taking turns is what makes a dial lag.
|
||||||
k.readPanel(s.Mode, s.Split, s.FreqHz)
|
// f.TX, not k.tx: the radio is the one that knows it is transmitting. k.tx
|
||||||
|
// only records that OPSLOG keyed it, so a carrier raised with the front-panel
|
||||||
|
// PTT, a footswitch or the mic button left the panel showing a receiver — and
|
||||||
|
// the transmit meters, which are read only while transmitting, were never
|
||||||
|
// read at all for anyone who keys the radio by hand.
|
||||||
|
k.readPanel(s.Mode, s.Split, s.FreqHz, f.TX)
|
||||||
return s, nil
|
return s, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -135,14 +135,14 @@ func (k *Kenwood) RefreshKenwood() error {
|
|||||||
|
|
||||||
// readPanel refreshes the panel. Called from ReadState with the mutex HELD, so
|
// readPanel refreshes the panel. Called from ReadState with the mutex HELD, so
|
||||||
// it shares the same serialised link as everything else.
|
// it shares the same serialised link as everything else.
|
||||||
func (k *Kenwood) readPanel(mode string, split bool, txHz int64) {
|
func (k *Kenwood) readPanel(mode string, split bool, txHz int64, txNow bool) {
|
||||||
k.panel.Mode = mode
|
k.panel.Mode = mode
|
||||||
k.panel.Split = split
|
k.panel.Split = split
|
||||||
k.panel.SplitTXHz = 0
|
k.panel.SplitTXHz = 0
|
||||||
if split {
|
if split {
|
||||||
k.panel.SplitTXHz = txHz
|
k.panel.SplitTXHz = txHz
|
||||||
}
|
}
|
||||||
k.panel.Transmitting = k.tx
|
k.panel.Transmitting = k.tx || txNow
|
||||||
k.panel.MetersProvisional = true
|
k.panel.MetersProvisional = true
|
||||||
|
|
||||||
if k.panel.Transmitting {
|
if k.panel.Transmitting {
|
||||||
@@ -309,16 +309,7 @@ func kenwoodAGCValue(name string) int {
|
|||||||
// answered and what it said, next to the power SETTING: the meter that tracks a
|
// answered and what it said, next to the power SETTING: the meter that tracks a
|
||||||
// known carrier at two different power levels is the power meter, and no amount
|
// known carrier at two different power levels is the power meter, and no amount
|
||||||
// of reading the reference settles that as well as one transmission does.
|
// of reading the reference settles that as well as one transmission does.
|
||||||
var kenwoodMeterProbes = []struct {
|
var kenwoodMeterProbes = []string{"SM;", "SMH;", "BG;", "SW;", "PO;", "TQ;"}
|
||||||
cmd string
|
|
||||||
prefix string
|
|
||||||
digits int
|
|
||||||
}{
|
|
||||||
{"SM;", "SM", 4},
|
|
||||||
{"BG;", "BG", 2},
|
|
||||||
{"SW;", "SW", 4},
|
|
||||||
{"PO;", "PO", 3},
|
|
||||||
}
|
|
||||||
|
|
||||||
// readTXMeters reads the transmit meters.
|
// readTXMeters reads the transmit meters.
|
||||||
func (k *Kenwood) readTXMeters() {
|
func (k *Kenwood) readTXMeters() {
|
||||||
@@ -342,12 +333,15 @@ func (k *Kenwood) readTXMeters() {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
k.metersLogged++
|
k.metersLogged++
|
||||||
|
// The RAW answers, not parsed numbers: a command that answers in a shape we
|
||||||
|
// did not expect is the interesting case, and a parsed "-" hides it behind
|
||||||
|
// the same dash as a command the radio refused.
|
||||||
raw := make([]string, 0, len(kenwoodMeterProbes))
|
raw := make([]string, 0, len(kenwoodMeterProbes))
|
||||||
for _, p := range kenwoodMeterProbes {
|
for _, cmd := range kenwoodMeterProbes {
|
||||||
if v, ok := k.askNum(p.cmd, p.prefix, p.digits); ok {
|
if r, err := k.ask(cmd); err == nil {
|
||||||
raw = append(raw, fmt.Sprintf("%s=%d", strings.TrimSuffix(p.cmd, ";"), v))
|
raw = append(raw, strings.TrimSuffix(cmd, ";")+"→"+strings.TrimSuffix(r, ";"))
|
||||||
} else {
|
} else {
|
||||||
raw = append(raw, strings.TrimSuffix(p.cmd, ";")+"=-")
|
raw = append(raw, strings.TrimSuffix(cmd, ";")+"→refused")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
debugLog.Printf("kenwood: TX meters at PC=%dW: %s (compare two power settings, and a known SWR)",
|
debugLog.Printf("kenwood: TX meters at PC=%dW: %s (compare two power settings, and a known SWR)",
|
||||||
|
|||||||
@@ -0,0 +1,39 @@
|
|||||||
|
package powergenius
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
// The amplifier's status frame has no "operate=" field: its live state is in
|
||||||
|
// "state", and that is what says whether the amp is in line. Reading only
|
||||||
|
// operate= meant the flag was never read at all — OpsLog opened claiming
|
||||||
|
// STANDBY on an amp that was operating, and the first press of the button
|
||||||
|
// commanded the state it was already in.
|
||||||
|
func TestOperateIsReadFromTheStateField(t *testing.T) {
|
||||||
|
cases := []struct {
|
||||||
|
state string
|
||||||
|
operate bool
|
||||||
|
known bool
|
||||||
|
}{
|
||||||
|
{"STANDBY", false, true},
|
||||||
|
{"OFF", false, true},
|
||||||
|
{"OPERATE", true, true},
|
||||||
|
// IDLE is the one that matters: the amp is IN LINE, simply not keyed.
|
||||||
|
// Reading it as standby is how the wrong state got on screen.
|
||||||
|
{"IDLE", true, true},
|
||||||
|
{"TRANSMIT_A", true, true},
|
||||||
|
{"idle", true, true}, // case is the firmware's business, not ours
|
||||||
|
// A state nobody has seen leaves the flag alone rather than guessing:
|
||||||
|
// claiming STANDBY on an amp that is in line is the error that matters.
|
||||||
|
{"WARMING_UP", false, false},
|
||||||
|
{"", false, false},
|
||||||
|
}
|
||||||
|
for _, c := range cases {
|
||||||
|
op, known := operateFromState(c.state)
|
||||||
|
if known != c.known {
|
||||||
|
t.Errorf("state %q: known = %v, want %v", c.state, known, c.known)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if known && op != c.operate {
|
||||||
|
t.Errorf("state %q: operate = %v, want %v", c.state, op, c.operate)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -159,6 +159,22 @@ func replyCode(reply string) string {
|
|||||||
return strings.TrimSpace(p[1])
|
return strings.TrimSpace(p[1])
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// operateFromState maps the amplifier's live state to "in line or not".
|
||||||
|
//
|
||||||
|
// Unknown states leave the flag alone rather than guessing: a state nobody has
|
||||||
|
// seen is not evidence that the amp is standing by, and claiming STANDBY on an
|
||||||
|
// amplifier that is in line is the error that matters here — it invites the
|
||||||
|
// operator to "switch it on" and command the state it is already in.
|
||||||
|
func operateFromState(state string) (operate, known bool) {
|
||||||
|
switch strings.ToUpper(strings.TrimSpace(state)) {
|
||||||
|
case "STANDBY", "OFF", "POWERED_OFF", "DISCONNECTED":
|
||||||
|
return false, true
|
||||||
|
case "OPERATE", "OPERATING", "IDLE", "RECEIVE", "RX", "TRANSMIT", "TRANSMIT_A", "TRANSMIT_B", "TX", "KEYED":
|
||||||
|
return true, true
|
||||||
|
}
|
||||||
|
return false, false
|
||||||
|
}
|
||||||
|
|
||||||
// SetOperate puts the amp in OPERATE (1) or STANDBY (0).
|
// SetOperate puts the amp in OPERATE (1) or STANDBY (0).
|
||||||
func (c *Client) SetOperate(on bool) error {
|
func (c *Client) SetOperate(on bool) error {
|
||||||
v := "0"
|
v := "0"
|
||||||
@@ -349,6 +365,7 @@ func (c *Client) parse(resp string) {
|
|||||||
c.lastRaw = data
|
c.lastRaw = data
|
||||||
applog.Printf("pgxl: status raw=%q", data)
|
applog.Printf("pgxl: status raw=%q", data)
|
||||||
}
|
}
|
||||||
|
sawOperate := false
|
||||||
for _, pair := range strings.Fields(data) {
|
for _, pair := range strings.Fields(data) {
|
||||||
kv := strings.SplitN(pair, "=", 2)
|
kv := strings.SplitN(pair, "=", 2)
|
||||||
if len(kv) != 2 {
|
if len(kv) != 2 {
|
||||||
@@ -358,6 +375,7 @@ func (c *Client) parse(resp string) {
|
|||||||
case "state":
|
case "state":
|
||||||
c.status.State = kv[1]
|
c.status.State = kv[1]
|
||||||
case "operate":
|
case "operate":
|
||||||
|
sawOperate = true
|
||||||
c.status.Operate = kv[1] == "1"
|
c.status.Operate = kv[1] == "1"
|
||||||
case "fanmode":
|
case "fanmode":
|
||||||
dev := strings.ToUpper(kv[1])
|
dev := strings.ToUpper(kv[1])
|
||||||
@@ -387,6 +405,23 @@ func (c *Client) parse(resp string) {
|
|||||||
c.status.PeakId, _ = strconv.ParseFloat(kv[1], 64)
|
c.status.PeakId, _ = strconv.ParseFloat(kv[1], 64)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// THE AMP DOES NOT SEND "operate=".
|
||||||
|
//
|
||||||
|
// Operate was therefore never read at all on this link: it stayed at the
|
||||||
|
// zero value until the operator pressed the button, so OpsLog opened
|
||||||
|
// claiming STANDBY on an amplifier that was in line — and the first press
|
||||||
|
// then commanded the state it was already in. Reported from a real PGXL.
|
||||||
|
//
|
||||||
|
// The live state IS in the frame, under "state", and the FlexRadio side of
|
||||||
|
// this same amplifier has been reading it that way all along (see
|
||||||
|
// flexAmp): anything but STANDBY/OFF means the amp is IN LINE. IDLE is
|
||||||
|
// operate — in line, not keyed.
|
||||||
|
if !sawOperate && c.status.State != "" {
|
||||||
|
if op, known := operateFromState(c.status.State); known {
|
||||||
|
c.status.Operate = op
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
c.statusMu.Unlock()
|
c.statusMu.Unlock()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import (
|
|||||||
"github.com/wailsapp/wails/v2"
|
"github.com/wailsapp/wails/v2"
|
||||||
"github.com/wailsapp/wails/v2/pkg/options"
|
"github.com/wailsapp/wails/v2/pkg/options"
|
||||||
"github.com/wailsapp/wails/v2/pkg/options/assetserver"
|
"github.com/wailsapp/wails/v2/pkg/options/assetserver"
|
||||||
|
wailswindows "github.com/wailsapp/wails/v2/pkg/options/windows"
|
||||||
)
|
)
|
||||||
|
|
||||||
//go:embed all:frontend/dist
|
//go:embed all:frontend/dist
|
||||||
@@ -87,14 +88,43 @@ func main() {
|
|||||||
// A --post-update relaunch (from the auto-updater) may start while the previous
|
// A --post-update relaunch (from the auto-updater) may start while the previous
|
||||||
// instance is still exiting and holding the single-instance mutex — wait for it
|
// instance is still exiting and holding the single-instance mutex — wait for it
|
||||||
// to free instead of bailing out. Then clear the old exe it left behind.
|
// to free instead of bailing out. Then clear the old exe it left behind.
|
||||||
|
bootLogLaunch()
|
||||||
postUpdate := hasFlag(os.Args[1:], "--post-update")
|
postUpdate := hasFlag(os.Args[1:], "--post-update")
|
||||||
if !acquireInstance(postUpdate) {
|
if !acquireInstance(postUpdate) {
|
||||||
|
// SAID, not merely done. This exit is correct — a second instance would
|
||||||
|
// fight the first over the rig — but it happened in total silence: no
|
||||||
|
// window, no data folder, no log, which is indistinguishable from a
|
||||||
|
// program that died on its first instruction.
|
||||||
|
bootLog("another instance already holds the single-instance mutex - exiting")
|
||||||
|
fatalBox("OpsLog", "OpsLog is already running.\n\nLook for its window, or for a leftover OpsLog.exe in the Task Manager, and close it before starting another.")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
bootLog("single-instance mutex acquired")
|
||||||
|
|
||||||
|
// The data folder is created BESIDE the executable, so a copy dropped into
|
||||||
|
// Program Files is refused the write by Windows — and that refusal ended the
|
||||||
|
// launch with nothing on screen and nothing in any file, since the only log
|
||||||
|
// OpsLog had was inside the folder it could not create.
|
||||||
|
if err := checkDataDirWritable(); err != nil {
|
||||||
|
bootLog("FATAL %v", err)
|
||||||
|
fatalBox("OpsLog", "OpsLog cannot write next to its own program file.\n\n"+err.Error()+
|
||||||
|
"\n\nMove OpsLog.exe somewhere your account can write — a folder in Documents, or the desktop — and start it again. Program Files is refused to anything not running as administrator.")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if postUpdate {
|
if postUpdate {
|
||||||
cleanupOldUpdateBinary()
|
cleanupOldUpdateBinary()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// The WebView2 runtime, named before the window is attempted. Its absence is
|
||||||
|
// the classic silent failure — the process starts, the browser environment
|
||||||
|
// cannot be created, and on some machines that ends the launch without an
|
||||||
|
// error anyone can see.
|
||||||
|
if v := webView2Version(); v != "" {
|
||||||
|
bootLog("WebView2 runtime: %s", v)
|
||||||
|
} else {
|
||||||
|
bootLog("WebView2 runtime: NOT FOUND — install Microsoft Edge WebView2 Runtime")
|
||||||
|
}
|
||||||
|
|
||||||
// Create an instance of the app structure
|
// Create an instance of the app structure
|
||||||
app := NewApp()
|
app := NewApp()
|
||||||
app.startupProfile = profileArg(os.Args[1:])
|
app.startupProfile = profileArg(os.Args[1:])
|
||||||
@@ -116,6 +146,35 @@ func main() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Create application with options
|
// Create application with options
|
||||||
|
// A HANG has no error to report, and that is the shape being chased here:
|
||||||
|
// the process stays up, the data folder is created and stays empty, and no
|
||||||
|
// window appears — WebView2 never finishes creating its environment, and
|
||||||
|
// nothing returns to be logged.
|
||||||
|
//
|
||||||
|
// So the absence of progress is what gets reported. If OnStartup has not
|
||||||
|
// been reached a few seconds in, this says so and names the two things that
|
||||||
|
// cause it, rather than leaving an operator watching a process that is doing
|
||||||
|
// nothing at all.
|
||||||
|
go func() {
|
||||||
|
time.Sleep(12 * time.Second)
|
||||||
|
if startupReached.Load() {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
bootLog("STUCK: 12 s after wails.Run and the window has not started — WebView2 never handed control back")
|
||||||
|
fatalBox("OpsLog", startupStuckMessage)
|
||||||
|
}()
|
||||||
|
noteLaunchAttempt()
|
||||||
|
bootLog("Windows %s", windowsVersion())
|
||||||
|
bootLog("Edge policy: %s", edgePolicyNotes())
|
||||||
|
// The blocker utilities: they leave an IFEO entry that makes Windows refuse
|
||||||
|
// to run the WebView2 process at all. Named loudly, because a machine in
|
||||||
|
// this state looks identical to one with a broken graphics driver.
|
||||||
|
if blocked := edgeExecutionBlocked(); blocked != "" {
|
||||||
|
bootLog("EDGE EXECUTION IS BLOCKED: %s — an \"Edge blocker\" tool is stopping WebView2 from starting", blocked)
|
||||||
|
fatalBox("OpsLog", edgeBlockedMessage)
|
||||||
|
}
|
||||||
|
bootLog("WebView2 profile: %q", webviewDataPath())
|
||||||
|
bootLog("entering wails.Run (window %dx%d, state %v)", width, height, startState)
|
||||||
err := wails.Run(&options.App{
|
err := wails.Run(&options.App{
|
||||||
Title: "OpsLog",
|
Title: "OpsLog",
|
||||||
Width: width,
|
Width: width,
|
||||||
@@ -140,16 +199,43 @@ func main() {
|
|||||||
// graphite theme's background (#16181d), which is the default on a fresh
|
// graphite theme's background (#16181d), which is the default on a fresh
|
||||||
// install — otherwise every launch flashes white first.
|
// install — otherwise every launch flashes white first.
|
||||||
BackgroundColour: &options.RGBA{R: 0x16, G: 0x18, B: 0x1d, A: 1},
|
BackgroundColour: &options.RGBA{R: 0x16, G: 0x18, B: 0x1d, A: 1},
|
||||||
OnStartup: app.startup,
|
// WEBVIEW2, pinned down.
|
||||||
OnDomReady: app.domReady,
|
//
|
||||||
OnBeforeClose: app.beforeClose,
|
// Its profile folder is normally chosen by Wails under the roaming
|
||||||
OnShutdown: app.shutdown,
|
// profile — a place that on a managed or redirected account can be slow,
|
||||||
|
// locked or simply gone, and the failure mode is a creation that never
|
||||||
|
// returns rather than an error. Naming it puts it on the local disk,
|
||||||
|
// beside the startup log, where it can also be DELETED when it is the
|
||||||
|
// thing that is broken.
|
||||||
|
//
|
||||||
|
// GPU acceleration is switched off only when the previous launch hung
|
||||||
|
// (see stuckMarker): a WebView2 that cannot get on with the graphics
|
||||||
|
// driver hangs exactly like one that cannot start at all, and this is the
|
||||||
|
// one lever that separates the two — without costing anything on the
|
||||||
|
// machines where it was never the problem.
|
||||||
|
Windows: &wailswindows.Options{
|
||||||
|
WebviewUserDataPath: webviewDataPath(),
|
||||||
|
// A fixed-version runtime carried beside OpsLog, when one is there.
|
||||||
|
// Empty means the installed Evergreen runtime, as before.
|
||||||
|
WebviewBrowserPath: fixedWebView2Path(),
|
||||||
|
WebviewGpuIsDisabled: lastLaunchHung,
|
||||||
|
},
|
||||||
|
OnStartup: app.startup,
|
||||||
|
OnDomReady: app.domReady,
|
||||||
|
OnBeforeClose: app.beforeClose,
|
||||||
|
OnShutdown: app.shutdown,
|
||||||
Bind: []interface{}{
|
Bind: []interface{}{
|
||||||
app,
|
app,
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
|
bootLog("wails.Run returned")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
println("Error:", err.Error())
|
// The last thing that can fail before a window exists, and the most
|
||||||
|
// opaque of them: a missing WebView2 runtime lands here. println goes
|
||||||
|
// nowhere in a GUI-subsystem program, so this went unseen and unlogged.
|
||||||
|
bootLog("FATAL wails.Run: %v", err)
|
||||||
|
fatalBox("OpsLog", "OpsLog could not open its window.\n\n"+err.Error()+
|
||||||
|
"\n\nThis is usually a missing WebView2 runtime — install \"Microsoft Edge WebView2 Runtime\" and try again.")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -80,8 +80,13 @@ func (a *App) CompareRDASources() (RDACompareResult, error) {
|
|||||||
if a.qso == nil {
|
if a.qso == nil {
|
||||||
return res, fmt.Errorf("db not initialized")
|
return res, fmt.Errorf("db not initialized")
|
||||||
}
|
}
|
||||||
|
// Said before the work starts, not only after: this reads the WHOLE log, and
|
||||||
|
// on a remote MySQL that is seconds of silence during which the only
|
||||||
|
// evidence that anything is happening is this line.
|
||||||
|
applog.Printf("rda compare: reading the log…")
|
||||||
rows, err := a.qso.List(a.ctx, qso.ListFilter{Limit: 1_000_000})
|
rows, err := a.qso.List(a.ctx, qso.ListFilter{Limit: 1_000_000})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
applog.Printf("rda compare: reading the log failed: %v", err)
|
||||||
return res, err
|
return res, err
|
||||||
}
|
}
|
||||||
for i := range rows {
|
for i := range rows {
|
||||||
|
|||||||
@@ -2,6 +2,13 @@
|
|||||||
|
|
||||||
package main
|
package main
|
||||||
|
|
||||||
// virtualScreenBounds is Windows-only; elsewhere we cannot tell, and the caller
|
// The screen geometry helpers are Windows-only; elsewhere we cannot tell where
|
||||||
// treats "cannot tell" as "trust the saved position".
|
// the monitors are, and the callers treat "cannot tell" as "trust the operator's
|
||||||
|
// saved position" rather than second-guessing it.
|
||||||
func virtualScreenBounds() (x, y, w, h int, ok bool) { return 0, 0, 0, 0, false }
|
func virtualScreenBounds() (x, y, w, h int, ok bool) { return 0, 0, 0, 0, false }
|
||||||
|
|
||||||
|
func onSomeMonitorImpl(x, y, w, h int) bool { return true }
|
||||||
|
|
||||||
|
func clampToVisible(x, y, w, h int) (int, int, bool) { return x, y, false }
|
||||||
|
|
||||||
|
func logMonitorLayout() {}
|
||||||
|
|||||||
+96
-6
@@ -2,12 +2,17 @@
|
|||||||
|
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import "syscall"
|
import (
|
||||||
|
"fmt"
|
||||||
|
"strings"
|
||||||
|
"syscall"
|
||||||
|
"unsafe"
|
||||||
|
|
||||||
|
"hamlog/internal/applog"
|
||||||
|
)
|
||||||
|
|
||||||
// GetSystemMetrics indices for the virtual desktop — the rectangle spanning
|
// GetSystemMetrics indices for the virtual desktop — the rectangle spanning
|
||||||
// every attached monitor. Wails' ScreenGetAll reports each monitor's size but
|
// every attached monitor.
|
||||||
// not its offset, so it cannot answer "is this coordinate on any screen?"; the
|
|
||||||
// Win32 metrics can.
|
|
||||||
const (
|
const (
|
||||||
smXVirtualScreen = 76
|
smXVirtualScreen = 76
|
||||||
smYVirtualScreen = 77
|
smYVirtualScreen = 77
|
||||||
@@ -16,8 +21,10 @@ const (
|
|||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
user32Dll = syscall.NewLazyDLL("user32.dll")
|
user32Dll = syscall.NewLazyDLL("user32.dll")
|
||||||
procGetSystemMetrics = user32Dll.NewProc("GetSystemMetrics")
|
procGetSystemMetrics = user32Dll.NewProc("GetSystemMetrics")
|
||||||
|
procEnumDisplayMonitors = user32Dll.NewProc("EnumDisplayMonitors")
|
||||||
|
procGetMonitorInfoW = user32Dll.NewProc("GetMonitorInfoW")
|
||||||
)
|
)
|
||||||
|
|
||||||
func systemMetric(index int) int {
|
func systemMetric(index int) int {
|
||||||
@@ -34,3 +41,86 @@ func virtualScreenBounds() (x, y, w, h int, ok bool) {
|
|||||||
}
|
}
|
||||||
return systemMetric(smXVirtualScreen), systemMetric(smYVirtualScreen), w, h, true
|
return systemMetric(smXVirtualScreen), systemMetric(smYVirtualScreen), w, h, true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// winRect is Win32's RECT.
|
||||||
|
type winRect struct{ Left, Top, Right, Bottom int32 }
|
||||||
|
|
||||||
|
// monitorInfo is MONITORINFO: the monitor's whole rectangle and its work area
|
||||||
|
// (what is left once the taskbar is taken out).
|
||||||
|
type monitorInfo struct {
|
||||||
|
CbSize uint32
|
||||||
|
RcMonitor winRect
|
||||||
|
RcWork winRect
|
||||||
|
DwFlags uint32
|
||||||
|
}
|
||||||
|
|
||||||
|
// monitorRects enumerates the attached monitors.
|
||||||
|
//
|
||||||
|
// THE BOUNDING BOX IS NOT THE DESKTOP. The virtual screen is the rectangle that
|
||||||
|
// spans every monitor, and monitors are rarely arranged to fill it: a wide
|
||||||
|
// screen beside a tall one, or one offset vertically, leaves rectangular HOLES
|
||||||
|
// inside the box that belong to no monitor at all. A window placed in a hole
|
||||||
|
// passes a bounding-box test and is invisible — which is exactly what was
|
||||||
|
// reported from a four-monitor station whose window.json held x=-7680.
|
||||||
|
//
|
||||||
|
// So the test has to be against the monitors themselves.
|
||||||
|
func monitorRects() []screenRect {
|
||||||
|
var out []screenRect
|
||||||
|
cb := syscall.NewCallback(func(hMonitor, hdc uintptr, lprc *winRect, data uintptr) uintptr {
|
||||||
|
var mi monitorInfo
|
||||||
|
mi.CbSize = uint32(unsafe.Sizeof(mi))
|
||||||
|
if r, _, _ := procGetMonitorInfoW.Call(hMonitor, uintptr(unsafe.Pointer(&mi))); r != 0 {
|
||||||
|
// The WORK area, not the full rectangle: a title bar under the
|
||||||
|
// taskbar is a window that cannot be dragged, which is the fault
|
||||||
|
// being guarded against in the first place.
|
||||||
|
out = append(out, screenRect{
|
||||||
|
X: int(mi.RcWork.Left), Y: int(mi.RcWork.Top),
|
||||||
|
W: int(mi.RcWork.Right - mi.RcWork.Left),
|
||||||
|
H: int(mi.RcWork.Bottom - mi.RcWork.Top),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
return 1 // keep enumerating
|
||||||
|
})
|
||||||
|
procEnumDisplayMonitors.Call(0, 0, cb, 0)
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
// describeMonitors renders the layout for the log. A window that opens where
|
||||||
|
// nobody can see it is reported as "OpsLog did not start", and the first
|
||||||
|
// question is what the screens looked like at that moment.
|
||||||
|
func describeMonitors(rects []screenRect) string {
|
||||||
|
if len(rects) == 0 {
|
||||||
|
return "none detected"
|
||||||
|
}
|
||||||
|
parts := make([]string, 0, len(rects))
|
||||||
|
for _, r := range rects {
|
||||||
|
parts = append(parts, fmt.Sprintf("%dx%d at %d,%d", r.W, r.H, r.X, r.Y))
|
||||||
|
}
|
||||||
|
return strings.Join(parts, " · ")
|
||||||
|
}
|
||||||
|
|
||||||
|
// onSomeMonitorImpl reports whether a window at these coordinates would land
|
||||||
|
// where it can be seen and grabbed.
|
||||||
|
func onSomeMonitorImpl(x, y, w, h int) bool {
|
||||||
|
rects := monitorRects()
|
||||||
|
if len(rects) == 0 {
|
||||||
|
// Enumeration failed. Fall back to the bounding box rather than refuse
|
||||||
|
// the operator's own saved position on the strength of a failed call.
|
||||||
|
vx, vy, vw, vh, ok := virtualScreenBounds()
|
||||||
|
if !ok {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return overlapsEnough(x, y, w, h, vx, vy, vw, vh)
|
||||||
|
}
|
||||||
|
return onAnyScreen(x, y, w, h, rects)
|
||||||
|
}
|
||||||
|
|
||||||
|
// clampToVisible moves a window rectangle onto the monitor it is closest to.
|
||||||
|
func clampToVisible(x, y, w, h int) (int, int, bool) {
|
||||||
|
return clampRectToScreens(x, y, w, h, monitorRects())
|
||||||
|
}
|
||||||
|
|
||||||
|
// logMonitorLayout writes the current screen arrangement once at startup.
|
||||||
|
func logMonitorLayout() {
|
||||||
|
applog.Printf("window: monitors — %s", describeMonitors(monitorRects()))
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,75 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
// Placing a window on a set of monitors — the arithmetic, with no Win32 in it.
|
||||||
|
//
|
||||||
|
// Kept apart from the platform code so it can be tested: the fault it guards
|
||||||
|
// against (a window that opens where nobody can see it) is reported as "OpsLog
|
||||||
|
// does not start", is invisible by definition, and cannot be reproduced without
|
||||||
|
// the reporter's screen layout. A table test can hold that layout.
|
||||||
|
|
||||||
|
// screenRect is one monitor's work area, in virtual-desktop coordinates.
|
||||||
|
type screenRect struct{ X, Y, W, H int }
|
||||||
|
|
||||||
|
// screenRectOf is the same shape under the name the helpers below read with.
|
||||||
|
type screenRectOf = screenRect
|
||||||
|
|
||||||
|
// onAnyScreen reports whether a window would land where it can be seen and
|
||||||
|
// grabbed on ONE of the screens.
|
||||||
|
//
|
||||||
|
// One of them, not their bounding box: monitors rarely tile the box they span,
|
||||||
|
// and the leftover rectangles belong to no screen at all. A window in one of
|
||||||
|
// those holes passes a bounding-box test and is invisible.
|
||||||
|
func onAnyScreen(x, y, w, h int, screens []screenRectOf) bool {
|
||||||
|
for _, r := range screens {
|
||||||
|
if overlapsEnough(x, y, w, h, r.X, r.Y, r.W, r.H) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
// nearestScreen picks the screen whose centre is closest to the window's.
|
||||||
|
func nearestScreen(x, y, w, h int, screens []screenRectOf) (screenRectOf, bool) {
|
||||||
|
if len(screens) == 0 {
|
||||||
|
return screenRectOf{}, false
|
||||||
|
}
|
||||||
|
best, bestDist := screens[0], int64(1)<<62
|
||||||
|
cx, cy := x+w/2, y+h/2
|
||||||
|
for _, r := range screens {
|
||||||
|
rcx, rcy := r.X+r.W/2, r.Y+r.H/2
|
||||||
|
dx, dy := int64(cx-rcx), int64(cy-rcy)
|
||||||
|
if d := dx*dx + dy*dy; d < bestDist {
|
||||||
|
best, bestDist = r, d
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return best, true
|
||||||
|
}
|
||||||
|
|
||||||
|
// clampRectToScreens moves a window onto the nearest screen, keeping its size
|
||||||
|
// where the screen can hold it. Returns the new position and whether it moved.
|
||||||
|
func clampRectToScreens(x, y, w, h int, screens []screenRectOf) (int, int, bool) {
|
||||||
|
best, ok := nearestScreen(x, y, w, h, screens)
|
||||||
|
if !ok {
|
||||||
|
return x, y, false
|
||||||
|
}
|
||||||
|
if w > best.W {
|
||||||
|
w = best.W
|
||||||
|
}
|
||||||
|
if h > best.H {
|
||||||
|
h = best.H
|
||||||
|
}
|
||||||
|
nx, ny := x, y
|
||||||
|
if nx < best.X {
|
||||||
|
nx = best.X
|
||||||
|
}
|
||||||
|
if ny < best.Y {
|
||||||
|
ny = best.Y
|
||||||
|
}
|
||||||
|
if nx+w > best.X+best.W {
|
||||||
|
nx = best.X + best.W - w
|
||||||
|
}
|
||||||
|
if ny+h > best.Y+best.H {
|
||||||
|
ny = best.Y + best.H - h
|
||||||
|
}
|
||||||
|
return nx, ny, nx != x || ny != y
|
||||||
|
}
|
||||||
@@ -0,0 +1,72 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
// The layout that produced the report: four monitors in a row, the leftmost at
|
||||||
|
// x=-7680, and a window.json holding exactly that corner.
|
||||||
|
func fourAcross() []screenRectOf {
|
||||||
|
return []screenRectOf{
|
||||||
|
{X: -7680, Y: 0, W: 2560, H: 1392},
|
||||||
|
{X: -5120, Y: 0, W: 2560, H: 1392},
|
||||||
|
{X: -2560, Y: 0, W: 2560, H: 1392},
|
||||||
|
{X: 0, Y: 0, W: 2560, H: 1392},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSavedCornerOnTheLeftMostMonitorIsAccepted(t *testing.T) {
|
||||||
|
if !onAnyScreen(-7680, 0, 2272, 1044, fourAcross()) {
|
||||||
|
t.Fatal("a window on the left-hand monitor was judged off-screen")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The fault the bounding box could not see: monitors do not tile the rectangle
|
||||||
|
// they span, and a window in the leftover space is invisible while passing a
|
||||||
|
// bounding-box test.
|
||||||
|
func TestAHoleBetweenMonitorsIsNotAScreen(t *testing.T) {
|
||||||
|
screens := []screenRectOf{
|
||||||
|
{X: 0, Y: 0, W: 1920, H: 1040}, // primary
|
||||||
|
{X: 1920, Y: -1080, W: 1920, H: 1040}, // second, mounted above and to the right
|
||||||
|
}
|
||||||
|
// Inside the bounding box (0..3840, -1080..1040), on neither monitor.
|
||||||
|
if onAnyScreen(2400, 600, 1200, 800, screens) {
|
||||||
|
t.Fatal("a window in the gap between two monitors was judged visible")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestAWindowInAHoleIsMovedOntoTheNearestScreen(t *testing.T) {
|
||||||
|
screens := []screenRectOf{
|
||||||
|
{X: 0, Y: 0, W: 1920, H: 1040},
|
||||||
|
{X: 1920, Y: -1080, W: 1920, H: 1040},
|
||||||
|
}
|
||||||
|
x, y, moved := clampRectToScreens(2400, 600, 1200, 800, screens)
|
||||||
|
if !moved {
|
||||||
|
t.Fatal("the window was left where nobody can see it")
|
||||||
|
}
|
||||||
|
if !onAnyScreen(x, y, 1200, 800, screens) {
|
||||||
|
t.Fatalf("moved to %d,%d, which is still not on a screen", x, y)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A window wider than the screen it is moved to must still have its top-left
|
||||||
|
// corner on that screen — clamping the right edge first would push the corner
|
||||||
|
// off to the left, which is the same fault wearing a different hat.
|
||||||
|
func TestAWindowTooBigForTheScreenKeepsItsCornerVisible(t *testing.T) {
|
||||||
|
screens := []screenRectOf{{X: 0, Y: 0, W: 1280, H: 800}}
|
||||||
|
x, y, _ := clampRectToScreens(-9000, -9000, 2560, 1440, screens)
|
||||||
|
if x < 0 || y < 0 {
|
||||||
|
t.Fatalf("corner at %d,%d is off the screen", x, y)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The saved position is only refused when it is genuinely lost. The rule is
|
||||||
|
// overlapsEnough's: a real slab of title bar — 160x32 — has to be visible, so a
|
||||||
|
// window hanging well over the edge is kept and a sliver is not.
|
||||||
|
func TestAWindowMostlyOffTheEdgeKeepsEnoughToGrab(t *testing.T) {
|
||||||
|
screens := []screenRectOf{{X: 0, Y: 0, W: 1920, H: 1040}}
|
||||||
|
if !onAnyScreen(1700, 900, 1200, 800, screens) { // 220 px still showing
|
||||||
|
t.Fatal("a window with 220 px on screen was judged off-screen")
|
||||||
|
}
|
||||||
|
if onAnyScreen(1850, 900, 1200, 800, screens) { // 70 px: not enough to grab
|
||||||
|
t.Fatal("a 70 px sliver was judged grabbable")
|
||||||
|
}
|
||||||
|
}
|
||||||
+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.26.13"
|
appVersion = "0.26.14"
|
||||||
|
|
||||||
// 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.
|
||||||
|
|||||||
@@ -0,0 +1,16 @@
|
|||||||
|
//go:build !windows
|
||||||
|
|
||||||
|
package main
|
||||||
|
|
||||||
|
// webView2Version is a Windows question; elsewhere the browser engine comes
|
||||||
|
// with the platform.
|
||||||
|
func webView2Version() string { return "n/a" }
|
||||||
|
|
||||||
|
// windowsVersion is a Windows question too.
|
||||||
|
func windowsVersion() string { return "n/a" }
|
||||||
|
|
||||||
|
// edgePolicyNotes is a Windows question too.
|
||||||
|
func edgePolicyNotes() string { return "n/a" }
|
||||||
|
|
||||||
|
// edgeExecutionBlocked is a Windows question too.
|
||||||
|
func edgeExecutionBlocked() string { return "" }
|
||||||
@@ -0,0 +1,137 @@
|
|||||||
|
//go:build windows
|
||||||
|
|
||||||
|
package main
|
||||||
|
|
||||||
|
// Is the WebView2 runtime actually installed?
|
||||||
|
//
|
||||||
|
// It is the one dependency OpsLog cannot ship inside its own executable, and
|
||||||
|
// its absence is invisible: the process starts, Wails fails to create the
|
||||||
|
// browser environment, and on some machines that failure arrives as a silent
|
||||||
|
// exit rather than as an error we can print. So the version is read straight
|
||||||
|
// from where the runtime registers itself, and written to the startup log
|
||||||
|
// BEFORE the window is attempted — a log that says "WebView2: not found"
|
||||||
|
// answers the whole question in one line.
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"golang.org/x/sys/windows/registry"
|
||||||
|
)
|
||||||
|
|
||||||
|
// webview2Client is the runtime's own update-client GUID, the key it registers
|
||||||
|
// its version under. Documented by Microsoft for exactly this check.
|
||||||
|
const webview2Client = `Software\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}`
|
||||||
|
|
||||||
|
// webView2Version returns the installed runtime version, or "" if there is none.
|
||||||
|
//
|
||||||
|
// Both hives: a per-machine install writes to HKLM (and to the WOW6432 view of
|
||||||
|
// it on 64-bit Windows, which is where it usually lands), a per-user install to
|
||||||
|
// HKCU. Missing all three is the answer that matters.
|
||||||
|
func webView2Version() string {
|
||||||
|
type place struct {
|
||||||
|
key registry.Key
|
||||||
|
access uint32
|
||||||
|
}
|
||||||
|
for _, p := range []place{
|
||||||
|
{registry.CURRENT_USER, registry.QUERY_VALUE},
|
||||||
|
{registry.LOCAL_MACHINE, registry.QUERY_VALUE},
|
||||||
|
{registry.LOCAL_MACHINE, registry.QUERY_VALUE | registry.WOW64_32KEY},
|
||||||
|
} {
|
||||||
|
k, err := registry.OpenKey(p.key, webview2Client, p.access)
|
||||||
|
if err != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
v, _, err := k.GetStringValue("pv")
|
||||||
|
k.Close()
|
||||||
|
if err == nil && v != "" && v != "0.0.0.0" {
|
||||||
|
return v
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
// windowsVersion reads the build from the registry, for the startup log.
|
||||||
|
//
|
||||||
|
// Not curiosity: "WebView2 will not install either" is a statement about the
|
||||||
|
// machine, not about OpsLog, and the build number is the first thing anyone
|
||||||
|
// diagnosing that will ask for.
|
||||||
|
func windowsVersion() string {
|
||||||
|
k, err := registry.OpenKey(registry.LOCAL_MACHINE,
|
||||||
|
`SOFTWARE\Microsoft\Windows NT\CurrentVersion`, registry.QUERY_VALUE)
|
||||||
|
if err != nil {
|
||||||
|
return "unknown"
|
||||||
|
}
|
||||||
|
defer k.Close()
|
||||||
|
name, _, _ := k.GetStringValue("ProductName")
|
||||||
|
build, _, _ := k.GetStringValue("CurrentBuild")
|
||||||
|
ubr, _, _ := k.GetIntegerValue("UBR")
|
||||||
|
display, _, _ := k.GetStringValue("DisplayVersion")
|
||||||
|
return fmt.Sprintf("%s %s build %s.%d", name, display, build, ubr)
|
||||||
|
}
|
||||||
|
|
||||||
|
// edgePolicyNotes reports the administrative policies applied to Edge, which is
|
||||||
|
// the engine WebView2 runs on.
|
||||||
|
//
|
||||||
|
// "Edge is blocked on this PC" is a sentence about group policy, and policy is
|
||||||
|
// readable: rather than have an operator guess which rule is in the way, the
|
||||||
|
// names of the values under the Edge policy key go into the startup log. It is
|
||||||
|
// evidence for whoever administers that machine, in the one file we can be sure
|
||||||
|
// they will be sent.
|
||||||
|
//
|
||||||
|
// Value NAMES only, never their contents: a policy key can hold URLs, account
|
||||||
|
// names and site lists that are nobody's business here.
|
||||||
|
func edgePolicyNotes() string {
|
||||||
|
var found []string
|
||||||
|
for _, hive := range []registry.Key{registry.LOCAL_MACHINE, registry.CURRENT_USER} {
|
||||||
|
k, err := registry.OpenKey(hive, `SOFTWARE\Policies\Microsoft\Edge`, registry.QUERY_VALUE|registry.ENUMERATE_SUB_KEYS)
|
||||||
|
if err != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
names, _ := k.ReadValueNames(0)
|
||||||
|
subs, _ := k.ReadSubKeyNames(0)
|
||||||
|
k.Close()
|
||||||
|
where := "HKLM"
|
||||||
|
if hive == registry.CURRENT_USER {
|
||||||
|
where = "HKCU"
|
||||||
|
}
|
||||||
|
if len(names) > 0 || len(subs) > 0 {
|
||||||
|
found = append(found, fmt.Sprintf("%s: %d policy values, %d sub-keys %v", where, len(names), len(subs), names))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(found) == 0 {
|
||||||
|
return "no Edge policies set"
|
||||||
|
}
|
||||||
|
return strings.Join(found, " | ")
|
||||||
|
}
|
||||||
|
|
||||||
|
// edgeExecutionBlocked reports an Image File Execution Options entry that stops
|
||||||
|
// the WebView2 process from running.
|
||||||
|
//
|
||||||
|
// This is what the "Edge blocker" utilities do: they register a Debugger value
|
||||||
|
// under IFEO for msedge.exe and msedgewebview2.exe, which makes Windows launch
|
||||||
|
// something else — usually nothing — in its place. The WebView2 runtime is
|
||||||
|
// installed, it registers its version, and it never starts, which is exactly
|
||||||
|
// the hang OpsLog was showing. Confirmed on a real machine: an Edge blocker was
|
||||||
|
// in the way, and unblocking it fixed the launch.
|
||||||
|
//
|
||||||
|
// One line in the startup log instead of an afternoon.
|
||||||
|
func edgeExecutionBlocked() string {
|
||||||
|
const ifeo = `SOFTWARE\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\`
|
||||||
|
var hits []string
|
||||||
|
for _, exe := range []string{"msedge.exe", "msedgewebview2.exe"} {
|
||||||
|
k, err := registry.OpenKey(registry.LOCAL_MACHINE, ifeo+exe, registry.QUERY_VALUE)
|
||||||
|
if err != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
dbg, _, err := k.GetStringValue("Debugger")
|
||||||
|
k.Close()
|
||||||
|
if err == nil && strings.TrimSpace(dbg) != "" {
|
||||||
|
hits = append(hits, fmt.Sprintf("%s → Debugger=%q", exe, dbg))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(hits) == 0 {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
return strings.Join(hits, " | ")
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user