Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
87ff0a9e16 | ||
|
|
18f9b915c5 | ||
|
|
b3fdd0b7fa | ||
|
|
9846354bf9 |
@@ -136,6 +136,9 @@ const (
|
|||||||
keyCATTCIHost = "cat.tci.host" // TCI host (Expert Electronics SunSDR / ExpertSDR2)
|
keyCATTCIHost = "cat.tci.host" // TCI host (Expert Electronics SunSDR / ExpertSDR2)
|
||||||
keyCATTCIPort = "cat.tci.port" // TCI WebSocket port (default 40001)
|
keyCATTCIPort = "cat.tci.port" // TCI WebSocket port (default 40001)
|
||||||
keyCATTCISpots = "cat.tci.spots" // push cluster spots to the TCI panorama
|
keyCATTCISpots = "cat.tci.spots" // push cluster spots to the TCI panorama
|
||||||
|
keyCATPttHotkeyEnabled = "cat.ptt_hotkey.enabled" // keyboard PTT key active
|
||||||
|
keyCATPttHotkey = "cat.ptt_hotkey.code" // bound key (KeyboardEvent.code)
|
||||||
|
keyCATPttHotkeyToggle = "cat.ptt_hotkey.toggle" // toggle mode vs hold-to-talk
|
||||||
|
|
||||||
// Audio (Digital Voice Keyer + QSO recorder). Machine-local hardware, so
|
// Audio (Digital Voice Keyer + QSO recorder). Machine-local hardware, so
|
||||||
// global (not per-profile) like CAT/rotator. Device fields store the
|
// global (not per-profile) like CAT/rotator. Device fields store the
|
||||||
@@ -196,9 +199,25 @@ const (
|
|||||||
keyRotatorHasElevation = "rotator.has_elevation"
|
keyRotatorHasElevation = "rotator.has_elevation"
|
||||||
keyRotatorType = "rotator.type" // "pst" (PstRotator UDP) | "rotgenius" (4O3A native TCP) | "arco" (microHAM ARCO, GS-232A)
|
keyRotatorType = "rotator.type" // "pst" (PstRotator UDP) | "rotgenius" (4O3A native TCP) | "arco" (microHAM ARCO, GS-232A)
|
||||||
keyRotatorNum = "rotator.num" // Rotator Genius rotator index: 1 or 2
|
keyRotatorNum = "rotator.num" // Rotator Genius rotator index: 1 or 2
|
||||||
|
keyRotatorDual = "rotator.dual" // Rotator Genius drives both rotors; compass shows a Rotor 1/2 toggle
|
||||||
|
keyRotatorActive = "rotator.active" // currently selected rotor when dual: 1 or 2 (set from the compass toggle, not the settings panel)
|
||||||
|
keyRotatorName1 = "rotator.name1" // optional label for rotor 1 (e.g. "Yagi HF")
|
||||||
|
keyRotatorName2 = "rotator.name2" // optional label for rotor 2
|
||||||
|
keyRotatorMotor1 = "rotator.motor1" // rotor 1 carries the motorized antenna (Ultrabeam/SteppIR) → show pattern paths
|
||||||
|
keyRotatorMotor2 = "rotator.motor2" // rotor 2 carries the motorized antenna
|
||||||
keyRotatorTransport = "rotator.transport" // arco: "tcp" (LAN) | "serial" (USB virtual COM)
|
keyRotatorTransport = "rotator.transport" // arco: "tcp" (LAN) | "serial" (USB virtual COM)
|
||||||
keyRotatorComPort = "rotator.com_port" // GS-232 serial transport
|
keyRotatorComPort = "rotator.com_port" // GS-232 serial transport
|
||||||
keyRotatorBaud = "rotator.baud" // GS-232 serial baud (an ERC needs it; an ARCO ignores it)
|
keyRotatorBaud = "rotator.baud" // GS-232 serial baud (an ERC needs it; an ARCO ignores it)
|
||||||
|
// Rotor 2 — a fully independent second rotor (any type), so an ARCO and a
|
||||||
|
// Rotator Genius can run side by side. Mirrors the rotor-1 device keys.
|
||||||
|
keyRotatorType2 = "rotator.type2"
|
||||||
|
keyRotatorHost2 = "rotator.host2"
|
||||||
|
keyRotatorPort2 = "rotator.port2"
|
||||||
|
keyRotatorHasElevation2 = "rotator.has_elevation2"
|
||||||
|
keyRotatorNum2 = "rotator.num2" // Rotator Genius internal index when rotor 2 is a RG
|
||||||
|
keyRotatorTransport2 = "rotator.transport2"
|
||||||
|
keyRotatorComPort2 = "rotator.com_port2"
|
||||||
|
keyRotatorBaud2 = "rotator.baud2"
|
||||||
|
|
||||||
// Motorized antenna (Ultrabeam or SteppIR) — Hardware → Antenna. Keys keep the
|
// Motorized antenna (Ultrabeam or SteppIR) — Hardware → Antenna. Keys keep the
|
||||||
// "ultrabeam." prefix for backward compatibility with configs saved before the
|
// "ultrabeam." prefix for backward compatibility with configs saved before the
|
||||||
@@ -404,6 +423,12 @@ type CATSettings struct {
|
|||||||
DigitalDefault string `json:"digital_default"` // when CAT says DATA, surface this mode (FT8/FT4/RTTY/…)
|
DigitalDefault string `json:"digital_default"` // when CAT says DATA, surface this mode (FT8/FT4/RTTY/…)
|
||||||
ShareEnabled bool `json:"share_enabled"` // serve CAT to other programs (Hamlib NET rigctl)
|
ShareEnabled bool `json:"share_enabled"` // serve CAT to other programs (Hamlib NET rigctl)
|
||||||
SharePort int `json:"share_port"` // TCP port for it (default 4532)
|
SharePort int `json:"share_port"` // TCP port for it (default 4532)
|
||||||
|
// PTT hotkey — a keyboard key that keys the transmitter while OpsLog is
|
||||||
|
// focused (hold-to-talk, or toggle). Uses the configured Audio → PTT method,
|
||||||
|
// falling back to CAT keying when that is VOX/none.
|
||||||
|
PTTHotkeyEnabled bool `json:"ptt_hotkey_enabled"`
|
||||||
|
PTTHotkey string `json:"ptt_hotkey"` // KeyboardEvent.code, e.g. "Backslash", "Pause"
|
||||||
|
PTTHotkeyToggle bool `json:"ptt_hotkey_toggle"` // press to key / press again to unkey (vs hold)
|
||||||
}
|
}
|
||||||
|
|
||||||
// ModePreset is a mode entry with default RST values to auto-populate
|
// ModePreset is a mode entry with default RST values to auto-populate
|
||||||
@@ -6830,7 +6855,7 @@ 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, keyCATFlexDecodeSpots, keyCATFlexDecodeSecs, keyCATXieguPort, keyCATXieguBaud, keyCATXieguAddr, keyCATXieguPTTLine, keyCATYaesuPort, keyCATYaesuBaud, keyCATKenwoodPort, keyCATKenwoodBaud, keyCATKenwoodHost, keyCATYaesuLowLines, keyCATKenwoodLowLines, keyCATIcomPort, keyCATIcomBaud, keyCATIcomAddr, keyCATIcomNetHost, keyCATIcomNetUser, keyCATIcomNetPass, keyCATIcomNetAudio, keyCATTCIHost, keyCATTCIPort, keyCATTCISpots, keyCATPollMs, keyCATDelayMs, keyCATDigitalDefault, keyCATShareEnabled, keyCATSharePort)
|
m, err := a.settings.GetMany(a.ctx, keyCATEnabled, keyCATBackend, keyCATOmniRigNum, keyCATOmniRigVFO, keyCATFlexHost, keyCATFlexPort, keyCATFlexSpots, keyCATFlexDecodeSpots, keyCATFlexDecodeSecs, keyCATXieguPort, keyCATXieguBaud, keyCATXieguAddr, keyCATXieguPTTLine, keyCATYaesuPort, keyCATYaesuBaud, keyCATKenwoodPort, keyCATKenwoodBaud, keyCATKenwoodHost, keyCATYaesuLowLines, keyCATKenwoodLowLines, keyCATIcomPort, keyCATIcomBaud, keyCATIcomAddr, keyCATIcomNetHost, keyCATIcomNetUser, keyCATIcomNetPass, keyCATIcomNetAudio, keyCATTCIHost, keyCATTCIPort, keyCATTCISpots, keyCATPttHotkeyEnabled, keyCATPttHotkey, keyCATPttHotkeyToggle, keyCATPollMs, keyCATDelayMs, keyCATDigitalDefault, keyCATShareEnabled, keyCATSharePort)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return CATSettings{}, err
|
return CATSettings{}, err
|
||||||
}
|
}
|
||||||
@@ -6863,6 +6888,9 @@ func (a *App) GetCATSettings() (CATSettings, error) {
|
|||||||
TCIHost: m[keyCATTCIHost],
|
TCIHost: m[keyCATTCIHost],
|
||||||
TCIPort: 40001,
|
TCIPort: 40001,
|
||||||
TCISpots: m[keyCATTCISpots] == "1",
|
TCISpots: m[keyCATTCISpots] == "1",
|
||||||
|
PTTHotkeyEnabled: m[keyCATPttHotkeyEnabled] == "1",
|
||||||
|
PTTHotkey: m[keyCATPttHotkey],
|
||||||
|
PTTHotkeyToggle: m[keyCATPttHotkeyToggle] == "1",
|
||||||
PollMs: 250,
|
PollMs: 250,
|
||||||
DelayMs: 0,
|
DelayMs: 0,
|
||||||
DigitalDefault: m[keyCATDigitalDefault],
|
DigitalDefault: m[keyCATDigitalDefault],
|
||||||
@@ -7029,6 +7057,9 @@ func (a *App) SaveCATSettings(s CATSettings) error {
|
|||||||
keyCATTCIHost: strings.TrimSpace(s.TCIHost),
|
keyCATTCIHost: strings.TrimSpace(s.TCIHost),
|
||||||
keyCATTCIPort: strconv.Itoa(s.TCIPort),
|
keyCATTCIPort: strconv.Itoa(s.TCIPort),
|
||||||
keyCATTCISpots: tciSpots,
|
keyCATTCISpots: tciSpots,
|
||||||
|
keyCATPttHotkeyEnabled: b01(s.PTTHotkeyEnabled),
|
||||||
|
keyCATPttHotkey: strings.TrimSpace(s.PTTHotkey),
|
||||||
|
keyCATPttHotkeyToggle: b01(s.PTTHotkeyToggle),
|
||||||
keyCATPollMs: strconv.Itoa(s.PollMs),
|
keyCATPollMs: strconv.Itoa(s.PollMs),
|
||||||
keyCATDelayMs: strconv.Itoa(s.DelayMs),
|
keyCATDelayMs: strconv.Itoa(s.DelayMs),
|
||||||
keyCATDigitalDefault: strings.ToUpper(strings.TrimSpace(s.DigitalDefault)),
|
keyCATDigitalDefault: strings.ToUpper(strings.TrimSpace(s.DigitalDefault)),
|
||||||
@@ -8949,6 +8980,32 @@ func (a *App) pttUnkey() {
|
|||||||
applog.Printf("dvk: PTT released")
|
applog.Printf("dvk: PTT released")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// PTTHotkeyDown keys the transmitter for the keyboard PTT hotkey. It uses the
|
||||||
|
// configured Audio → PTT method (CAT / RTS / DTR); when that is VOX/none it
|
||||||
|
// falls back to CAT keying so the hotkey still works with a plain CAT rig.
|
||||||
|
func (a *App) PTTHotkeyDown() error {
|
||||||
|
// This hotkey lives under CAT and is meant to key the rig over CAT — so prefer
|
||||||
|
// CAT whenever a backend is active. Only a rig with no CAT link falls back to
|
||||||
|
// the Audio-tab PTT method (RTS/DTR serial). Previously it always used the
|
||||||
|
// Audio method, so a stale serial PTT setting (e.g. an RTS line on a COM port
|
||||||
|
// that is no longer present) hijacked the hotkey and it failed with a serial
|
||||||
|
// error — even though the operator only ever wanted CAT.
|
||||||
|
if a.cat != nil {
|
||||||
|
return a.pttKey(AudioSettings{PTTMethod: "cat"})
|
||||||
|
}
|
||||||
|
cfg, err := a.GetAudioSettings()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if cfg.PTTMethod == "" || cfg.PTTMethod == "none" {
|
||||||
|
return fmt.Errorf("no PTT method configured and CAT not active")
|
||||||
|
}
|
||||||
|
return a.pttKey(cfg)
|
||||||
|
}
|
||||||
|
|
||||||
|
// PTTHotkeyUp releases the PTT hotkey.
|
||||||
|
func (a *App) PTTHotkeyUp() { a.pttUnkey() }
|
||||||
|
|
||||||
// TestPTT keys PTT for ~600ms so the user can confirm the rig transmits.
|
// TestPTT keys PTT for ~600ms so the user can confirm the rig transmits.
|
||||||
// TestPTT keys the transmitter for ~600ms using the GIVEN settings (the live
|
// TestPTT keys the transmitter for ~600ms using the GIVEN settings (the live
|
||||||
// UI selection), so the user can test a method/port without saving first —
|
// UI selection), so the user can test a method/port without saving first —
|
||||||
@@ -9121,6 +9178,49 @@ func (a *App) GetLogFilePath() string {
|
|||||||
return applog.Path()
|
return applog.Path()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TailLogFile returns the END of the diagnostic log — the last maxBytes, cut
|
||||||
|
// back to a line boundary so the first line is never a fragment.
|
||||||
|
//
|
||||||
|
// The tail, not the file: it rotates at 10 MB, and the live viewer polls this
|
||||||
|
// every second. Shipping megabytes across the Wails bridge on a timer would cost
|
||||||
|
// more than the whole rest of the UI.
|
||||||
|
func (a *App) TailLogFile(maxBytes int) (string, error) {
|
||||||
|
p := applog.Path()
|
||||||
|
if p == "" {
|
||||||
|
return "", fmt.Errorf("log file not initialised")
|
||||||
|
}
|
||||||
|
if maxBytes <= 0 || maxBytes > 4*1024*1024 {
|
||||||
|
maxBytes = 256 * 1024
|
||||||
|
}
|
||||||
|
f, err := os.Open(p)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
defer f.Close()
|
||||||
|
fi, err := f.Stat()
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
start := int64(0)
|
||||||
|
if fi.Size() > int64(maxBytes) {
|
||||||
|
start = fi.Size() - int64(maxBytes)
|
||||||
|
}
|
||||||
|
if _, err := f.Seek(start, io.SeekStart); err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
buf, err := io.ReadAll(f)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
s := string(buf)
|
||||||
|
if start > 0 {
|
||||||
|
if i := strings.IndexByte(s, '\n'); i >= 0 {
|
||||||
|
s = s[i+1:]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return s, nil
|
||||||
|
}
|
||||||
|
|
||||||
// UILog lets the frontend write to the same diagnostic log as the backend.
|
// UILog lets the frontend write to the same diagnostic log as the backend.
|
||||||
//
|
//
|
||||||
// Frontend-only logic (entry-strip auto-fill, debounce ordering, which field the
|
// Frontend-only logic (entry-strip auto-fill, debounce ordering, which field the
|
||||||
@@ -11377,13 +11477,18 @@ func (a *App) consumeUDPEvents() {
|
|||||||
// after the configured duration. De-duped per call in the Flex backend.
|
// after the configured duration. De-duped per call in the Flex backend.
|
||||||
if a.catFlexDecodeSpots && a.cat != nil {
|
if a.catFlexDecodeSpots && a.cat != nil {
|
||||||
now := time.Now()
|
now := time.Now()
|
||||||
if t, seen := lastDecodeSpot[ev.DecodeCall]; seen && now.Sub(t) < decodeSpotWindow {
|
// Key by call AND 100 kHz slot, not by call alone: with two
|
||||||
|
// receivers running (50.313 and 50.400, say) a station heard on
|
||||||
|
// both is two legitimate spots on two panadapters, and a
|
||||||
|
// call-only key threw the second away.
|
||||||
|
key := fmt.Sprintf("%s@%d", ev.DecodeCall, ev.DecodeFreqHz/100_000)
|
||||||
|
if t, seen := lastDecodeSpot[key]; seen && now.Sub(t) < decodeSpotWindow {
|
||||||
continue // spotted this call very recently — don't re-hammer the radio
|
continue // spotted this call very recently — don't re-hammer the radio
|
||||||
}
|
}
|
||||||
if len(lastDecodeSpot) > 4000 {
|
if len(lastDecodeSpot) > 4000 {
|
||||||
lastDecodeSpot = map[string]time.Time{} // bound memory on long sessions
|
lastDecodeSpot = map[string]time.Time{} // bound memory on long sessions
|
||||||
}
|
}
|
||||||
lastDecodeSpot[ev.DecodeCall] = now
|
lastDecodeSpot[key] = now
|
||||||
secs := a.catFlexDecodeSecs
|
secs := a.catFlexDecodeSecs
|
||||||
if secs <= 0 {
|
if secs <= 0 {
|
||||||
secs = 120
|
secs = 120
|
||||||
@@ -12898,7 +13003,14 @@ func (a *App) reloadCAT() {
|
|||||||
case "tci":
|
case "tci":
|
||||||
// Expert Electronics TCI (WebSocket) — SunSDR / ExpertSDR2, or any
|
// Expert Electronics TCI (WebSocket) — SunSDR / ExpertSDR2, or any
|
||||||
// TCI-compatible server.
|
// TCI-compatible server.
|
||||||
a.cat.Start(cat.NewTCI(s.TCIHost, s.TCIPort, s.DigitalDefault, s.TCISpots))
|
tb := cat.NewTCI(s.TCIHost, s.TCIPort, s.DigitalDefault, s.TCISpots)
|
||||||
|
// Clicking one of our spots on the ExpertSDR panorama fills the entry form.
|
||||||
|
tb.OnSpotClick = func(call string, hz int64) {
|
||||||
|
if a.ctx != nil {
|
||||||
|
wruntime.EventsEmit(a.ctx, "tci:spot_clicked", map[string]any{"call": call, "freq_hz": hz})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
a.cat.Start(tb)
|
||||||
default:
|
default:
|
||||||
// Unknown backend → stop and emit a dummy state so the UI shows it.
|
// Unknown backend → stop and emit a dummy state so the UI shows it.
|
||||||
a.cat.Stop()
|
a.cat.Stop()
|
||||||
@@ -13206,246 +13318,414 @@ func (a *App) DuplicateProfile(id int64, newName string) (profile.Profile, error
|
|||||||
return p, nil
|
return p, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// --- Rotator bindings (PstRotator UDP v0) ---
|
// --- Rotator bindings ---
|
||||||
|
|
||||||
// RotatorSettings is the JSON shape for the Hardware → Rotator panel.
|
const keyRotatorsList = "rotators.json"
|
||||||
type RotatorSettings struct {
|
|
||||||
Enabled bool `json:"enabled"`
|
// RotatorDevice is one configured rotor in Settings → Rotator (a list, like the
|
||||||
Type string `json:"type"` // "pst" (PstRotator UDP) | "rotgenius" (4O3A native TCP) | "arco" (microHAM ARCO, Yaesu GS-232A over TCP)
|
// amplifiers). A Rotator Genius with Dual on drives BOTH its ports and so
|
||||||
|
// contributes TWO logical rotors — Name/Motorized for the first, Name2/Motorized2
|
||||||
|
// for the second.
|
||||||
|
type RotatorDevice struct {
|
||||||
|
ID string `json:"id"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
Type string `json:"type"` // "pst" (PstRotator UDP) | "rotgenius" (4O3A native TCP) | "arco" (GS-232A)
|
||||||
Host string `json:"host"` // default 127.0.0.1
|
Host string `json:"host"` // default 127.0.0.1
|
||||||
Port int `json:"port"` // default 12000 (pst) / 9006 (rotgenius) / 4001 (arco — must match the port set in ARCO's LAN CONTROL PROTOCOL)
|
Port int `json:"port"` // default 12000 (pst) / 9006 (rotgenius) / 4001 (arco)
|
||||||
HasElevation bool `json:"has_elevation"` // include EL in GoTo packets (PstRotator)
|
HasElevation bool `json:"has_elevation"` // include EL in GoTo packets (PstRotator)
|
||||||
RotatorNum int `json:"rotator_num"` // Rotator Genius index: 1 or 2
|
RotatorNum int `json:"rotator_num"` // Rotator Genius internal index (1/2) when not Dual
|
||||||
Transport string `json:"transport"` // GS-232 controller: "tcp" (LAN) | "serial" (COM)
|
Dual bool `json:"dual"` // Rotator Genius: drive both ports → two logical rotors
|
||||||
|
Motorized bool `json:"motorized"` // carries a motorized antenna (Ultrabeam/SteppIR) → show pattern paths
|
||||||
|
Name2 string `json:"name2"` // Dual: label for the second rotor
|
||||||
|
Motorized2 bool `json:"motorized2"` // Dual: second rotor motorized
|
||||||
|
Transport string `json:"transport"` // ARCO: "tcp" (LAN) | "serial" (USB COM)
|
||||||
ComPort string `json:"com_port"` // GS-232 serial transport
|
ComPort string `json:"com_port"` // GS-232 serial transport
|
||||||
// Baud for the serial transport. An ARCO's virtual COM ignores it; an ERC runs
|
Baud int `json:"baud"` // GS-232 serial baud (an ERC needs it; an ARCO ignores it)
|
||||||
// at the rate set in its own configuration, so it has to be selectable.
|
|
||||||
Baud int `json:"baud"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetRotatorSettings returns the persisted rotator config with defaults.
|
// logicalRotor is one addressable rotor. Flattening the device list expands a
|
||||||
func (a *App) GetRotatorSettings() (RotatorSettings, error) {
|
// Dual Rotator Genius into two.
|
||||||
out := RotatorSettings{Type: "pst", Host: "127.0.0.1", Port: 12000, RotatorNum: 1}
|
type logicalRotor struct {
|
||||||
|
Name string
|
||||||
|
Motorized bool
|
||||||
|
Link rotorLink
|
||||||
|
}
|
||||||
|
|
||||||
|
// normRotorType clamps a rotor type to a known backend.
|
||||||
|
func normRotorType(t string) string {
|
||||||
|
if t == "rotgenius" || t == "arco" {
|
||||||
|
return t
|
||||||
|
}
|
||||||
|
return "pst"
|
||||||
|
}
|
||||||
|
|
||||||
|
// rotatorDefaultPort is each backend's default network port.
|
||||||
|
func rotatorDefaultPort(typ string) int {
|
||||||
|
switch typ {
|
||||||
|
case "rotgenius":
|
||||||
|
return 9006 // 4O3A native default
|
||||||
|
case "arco":
|
||||||
|
return 4001 // placeholder — the real number is set in ARCO's LAN menu
|
||||||
|
default:
|
||||||
|
return 12000 // PstRotator UDP
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// deviceLink builds the connection params for a device's rotor. sub selects the
|
||||||
|
// Rotator Genius internal port (1/2) for a Dual device; ignored otherwise.
|
||||||
|
func deviceLink(d RotatorDevice, sub int) rotorLink {
|
||||||
|
l := rotorLink{
|
||||||
|
Type: normRotorType(d.Type), Host: d.Host, Port: d.Port,
|
||||||
|
Transport: d.Transport, ComPort: d.ComPort, Baud: d.Baud, HasElevation: d.HasElevation,
|
||||||
|
}
|
||||||
|
if l.Host == "" {
|
||||||
|
l.Host = "127.0.0.1"
|
||||||
|
}
|
||||||
|
if l.Port <= 0 || l.Port > 65535 {
|
||||||
|
l.Port = rotatorDefaultPort(l.Type)
|
||||||
|
}
|
||||||
|
if l.Baud <= 0 {
|
||||||
|
l.Baud = 9600
|
||||||
|
}
|
||||||
|
if l.Transport != "serial" {
|
||||||
|
l.Transport = "tcp"
|
||||||
|
}
|
||||||
|
if l.Type == "rotgenius" {
|
||||||
|
if d.Dual {
|
||||||
|
l.Num = 1
|
||||||
|
if sub == 2 {
|
||||||
|
l.Num = 2
|
||||||
|
}
|
||||||
|
} else if d.RotatorNum == 2 {
|
||||||
|
l.Num = 2
|
||||||
|
} else {
|
||||||
|
l.Num = 1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return l
|
||||||
|
}
|
||||||
|
|
||||||
|
// flattenRotors expands the device list into the ordered logical rotors the
|
||||||
|
// compass switches between (a Dual Rotator Genius yields two).
|
||||||
|
func flattenRotors(devs []RotatorDevice) []logicalRotor {
|
||||||
|
var out []logicalRotor
|
||||||
|
for _, d := range devs {
|
||||||
|
if normRotorType(d.Type) == "rotgenius" && d.Dual {
|
||||||
|
out = append(out,
|
||||||
|
logicalRotor{Name: d.Name, Motorized: d.Motorized, Link: deviceLink(d, 1)},
|
||||||
|
logicalRotor{Name: d.Name2, Motorized: d.Motorized2, Link: deviceLink(d, 2)},
|
||||||
|
)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
out = append(out, logicalRotor{Name: d.Name, Motorized: d.Motorized, Link: deviceLink(d, 1)})
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetRotators returns the configured rotor list, migrating the legacy single-
|
||||||
|
// rotor flat settings into the list on first read (persisted on next save).
|
||||||
|
func (a *App) GetRotators() ([]RotatorDevice, error) {
|
||||||
if a.settings == nil {
|
if a.settings == nil {
|
||||||
return out, fmt.Errorf("db not initialized")
|
return nil, fmt.Errorf("db not initialized")
|
||||||
}
|
}
|
||||||
m, err := a.settings.GetMany(a.ctx,
|
raw, _ := a.settings.Get(a.ctx, keyRotatorsList)
|
||||||
keyRotatorEnabled, keyRotatorHost, keyRotatorPort, keyRotatorHasElevation, keyRotatorType, keyRotatorNum,
|
if strings.TrimSpace(raw) != "" {
|
||||||
keyRotatorTransport, keyRotatorComPort, keyRotatorBaud)
|
var list []RotatorDevice
|
||||||
if err != nil {
|
if err := json.Unmarshal([]byte(raw), &list); err == nil {
|
||||||
return out, err
|
return list, nil
|
||||||
}
|
}
|
||||||
out.Enabled = m[keyRotatorEnabled] == "1"
|
|
||||||
if t := m[keyRotatorType]; t == "rotgenius" || t == "pst" || t == "arco" {
|
|
||||||
out.Type = t
|
|
||||||
}
|
}
|
||||||
if h := m[keyRotatorHost]; h != "" {
|
return a.migrateLegacyRotors(), nil
|
||||||
out.Host = h
|
|
||||||
}
|
|
||||||
if p, _ := strconv.Atoi(m[keyRotatorPort]); p > 0 && p <= 65535 {
|
|
||||||
out.Port = p
|
|
||||||
} else if out.Type == "rotgenius" {
|
|
||||||
out.Port = 9006 // native default when no port stored yet
|
|
||||||
} else if out.Type == "arco" {
|
|
||||||
out.Port = 4001 // placeholder — the real number is set in ARCO's LAN menu
|
|
||||||
}
|
|
||||||
out.HasElevation = m[keyRotatorHasElevation] == "1"
|
|
||||||
if rn, _ := strconv.Atoi(m[keyRotatorNum]); rn == 2 {
|
|
||||||
out.RotatorNum = 2
|
|
||||||
}
|
|
||||||
out.Transport = "tcp"
|
|
||||||
if m[keyRotatorTransport] == "serial" {
|
|
||||||
out.Transport = "serial"
|
|
||||||
}
|
|
||||||
out.ComPort = m[keyRotatorComPort]
|
|
||||||
out.Baud = 9600
|
|
||||||
if b, _ := strconv.Atoi(m[keyRotatorBaud]); b > 0 {
|
|
||||||
out.Baud = b
|
|
||||||
}
|
|
||||||
return out, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// SaveRotatorSettings persists the rotator config. Connection is per-call
|
// migrateLegacyRotors builds a device list from the pre-list flat settings keys
|
||||||
// (UDP, no socket to (re)open) so no reload step is needed.
|
// (the single rotor shipped in 0.23.2, plus the unreleased two-rotor keys).
|
||||||
func (a *App) SaveRotatorSettings(s RotatorSettings) error {
|
func (a *App) migrateLegacyRotors() []RotatorDevice {
|
||||||
|
m, _ := a.settings.GetMany(a.ctx,
|
||||||
|
keyRotatorEnabled, keyRotatorType, keyRotatorHost, keyRotatorPort, keyRotatorHasElevation, keyRotatorNum,
|
||||||
|
keyRotatorDual, keyRotatorName1, keyRotatorName2, keyRotatorMotor1, keyRotatorMotor2,
|
||||||
|
keyRotatorTransport, keyRotatorComPort, keyRotatorBaud,
|
||||||
|
keyRotatorType2, keyRotatorHost2, keyRotatorPort2, keyRotatorHasElevation2, keyRotatorNum2,
|
||||||
|
keyRotatorTransport2, keyRotatorComPort2, keyRotatorBaud2)
|
||||||
|
if m[keyRotatorEnabled] != "1" && m[keyRotatorType] == "" && m[keyRotatorHost] == "" {
|
||||||
|
return []RotatorDevice{} // never configured
|
||||||
|
}
|
||||||
|
atoi := func(s string) int { n, _ := strconv.Atoi(s); return n }
|
||||||
|
typ := normRotorType(m[keyRotatorType])
|
||||||
|
dual := m[keyRotatorDual] == "1"
|
||||||
|
d1 := RotatorDevice{
|
||||||
|
ID: "rotor-1", Name: strings.TrimSpace(m[keyRotatorName1]), Type: typ,
|
||||||
|
Host: m[keyRotatorHost], Port: atoi(m[keyRotatorPort]), HasElevation: m[keyRotatorHasElevation] == "1",
|
||||||
|
RotatorNum: map[bool]int{true: 2, false: 1}[m[keyRotatorNum] == "2"],
|
||||||
|
Motorized: m[keyRotatorMotor1] != "0", Transport: m[keyRotatorTransport], ComPort: m[keyRotatorComPort], Baud: atoi(m[keyRotatorBaud]),
|
||||||
|
// A legacy Rotator Genius "two rotors" was one Dual device.
|
||||||
|
Dual: dual && typ == "rotgenius", Name2: strings.TrimSpace(m[keyRotatorName2]), Motorized2: m[keyRotatorMotor2] == "1",
|
||||||
|
}
|
||||||
|
devs := []RotatorDevice{d1}
|
||||||
|
// The unreleased "two independent rotors" (dual with a distinct rotor 2 of any
|
||||||
|
// type) becomes a second list entry.
|
||||||
|
if dual && typ != "rotgenius" {
|
||||||
|
devs = append(devs, RotatorDevice{
|
||||||
|
ID: "rotor-2", Name: strings.TrimSpace(m[keyRotatorName2]), Type: normRotorType(m[keyRotatorType2]),
|
||||||
|
Host: m[keyRotatorHost2], Port: atoi(m[keyRotatorPort2]), HasElevation: m[keyRotatorHasElevation2] == "1",
|
||||||
|
RotatorNum: map[bool]int{true: 2, false: 1}[m[keyRotatorNum2] == "2"],
|
||||||
|
Motorized: m[keyRotatorMotor2] == "1", Transport: m[keyRotatorTransport2], ComPort: m[keyRotatorComPort2], Baud: atoi(m[keyRotatorBaud2]),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
return devs
|
||||||
|
}
|
||||||
|
|
||||||
|
// SaveRotators persists the rotor list. Connections are per-call (no socket to
|
||||||
|
// (re)open) so no reload step is needed.
|
||||||
|
func (a *App) SaveRotators(list []RotatorDevice) error {
|
||||||
if a.settings == nil {
|
if a.settings == nil {
|
||||||
return fmt.Errorf("db not initialized")
|
return fmt.Errorf("db not initialized")
|
||||||
}
|
}
|
||||||
if s.Type != "rotgenius" && s.Type != "arco" {
|
for i := range list {
|
||||||
s.Type = "pst"
|
d := &list[i]
|
||||||
|
if strings.TrimSpace(d.ID) == "" {
|
||||||
|
d.ID = fmt.Sprintf("rotor-%d-%d", time.Now().Unix(), i)
|
||||||
}
|
}
|
||||||
if s.Host == "" {
|
d.Type = normRotorType(d.Type)
|
||||||
s.Host = "127.0.0.1"
|
if strings.TrimSpace(d.Host) == "" {
|
||||||
|
d.Host = "127.0.0.1"
|
||||||
}
|
}
|
||||||
if s.Port <= 0 || s.Port > 65535 {
|
if d.Port <= 0 || d.Port > 65535 {
|
||||||
s.Port = map[string]int{"rotgenius": 9006, "pst": 12000, "arco": 4001}[s.Type]
|
d.Port = rotatorDefaultPort(d.Type)
|
||||||
}
|
}
|
||||||
if s.RotatorNum != 2 {
|
if d.RotatorNum != 2 {
|
||||||
s.RotatorNum = 1
|
d.RotatorNum = 1
|
||||||
}
|
}
|
||||||
if s.Transport != "serial" {
|
if d.Transport != "serial" {
|
||||||
s.Transport = "tcp"
|
d.Transport = "tcp"
|
||||||
}
|
}
|
||||||
for k, v := range map[string]string{
|
if d.Baud <= 0 {
|
||||||
keyRotatorEnabled: boolStr(s.Enabled),
|
d.Baud = 9600
|
||||||
keyRotatorType: s.Type,
|
}
|
||||||
keyRotatorHost: s.Host,
|
}
|
||||||
keyRotatorPort: strconv.Itoa(s.Port),
|
b, err := json.Marshal(list)
|
||||||
keyRotatorHasElevation: boolStr(s.HasElevation),
|
if err != nil {
|
||||||
keyRotatorNum: strconv.Itoa(s.RotatorNum),
|
|
||||||
keyRotatorTransport: s.Transport,
|
|
||||||
keyRotatorComPort: strings.TrimSpace(s.ComPort),
|
|
||||||
keyRotatorBaud: strconv.Itoa(s.Baud),
|
|
||||||
} {
|
|
||||||
if err := a.settings.Set(a.ctx, k, v); err != nil {
|
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
return a.settings.Set(a.ctx, keyRotatorsList, string(b))
|
||||||
return nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// arcoClient builds the GS-232 client for the configured ARCO transport:
|
// rotorLink is the connection params for one rotor, so the command methods don't
|
||||||
|
// branch on device shape.
|
||||||
|
type rotorLink struct {
|
||||||
|
Type string
|
||||||
|
Host string
|
||||||
|
Port int
|
||||||
|
Num int // Rotator Genius internal index (1/2)
|
||||||
|
Transport string
|
||||||
|
ComPort string
|
||||||
|
Baud int
|
||||||
|
HasElevation bool
|
||||||
|
}
|
||||||
|
|
||||||
|
// activeRotorIndex returns the compass-selected rotor index, clamped to the
|
||||||
|
// available logical rotors (0-based). Persisted via SetActiveRotor.
|
||||||
|
func (a *App) activeRotorIndex(n int) int {
|
||||||
|
if n <= 0 {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
raw, _ := a.settings.Get(a.ctx, keyRotatorActive)
|
||||||
|
i, _ := strconv.Atoi(raw)
|
||||||
|
if i < 0 || i >= n {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
return i
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetActiveRotor selects which rotor the compass drives and displays. Persisted
|
||||||
|
// so it survives a restart. The index is into the flattened logical-rotor list.
|
||||||
|
func (a *App) SetActiveRotor(index int) error {
|
||||||
|
if a.settings == nil {
|
||||||
|
return fmt.Errorf("db not initialized")
|
||||||
|
}
|
||||||
|
if index < 0 {
|
||||||
|
index = 0
|
||||||
|
}
|
||||||
|
return a.settings.Set(a.ctx, keyRotatorActive, strconv.Itoa(index))
|
||||||
|
}
|
||||||
|
|
||||||
|
// arcoClient builds the GS-232 client for a rotor's ARCO transport:
|
||||||
// USB virtual COM (serial) or the LAN CONTROL PROTOCOL TCP port.
|
// USB virtual COM (serial) or the LAN CONTROL PROTOCOL TCP port.
|
||||||
func arcoClient(s RotatorSettings) *gs232.Client {
|
func arcoClient(l rotorLink) *gs232.Client {
|
||||||
if s.Transport == "serial" {
|
if l.Transport == "serial" {
|
||||||
return gs232.NewSerial(s.ComPort, s.Baud)
|
return gs232.NewSerial(l.ComPort, l.Baud)
|
||||||
}
|
}
|
||||||
return gs232.New(s.Host, s.Port)
|
return gs232.New(l.Host, l.Port)
|
||||||
}
|
}
|
||||||
|
|
||||||
// RotatorHeading is the live antenna heading for the status bar.
|
// RotatorHeading is the live antenna heading for the status bar and compass.
|
||||||
type RotatorHeading struct {
|
type RotatorHeading struct {
|
||||||
Enabled bool `json:"enabled"`
|
Enabled bool `json:"enabled"`
|
||||||
OK bool `json:"ok"`
|
OK bool `json:"ok"`
|
||||||
Azimuth int `json:"azimuth"`
|
Azimuth int `json:"azimuth"`
|
||||||
Raw string `json:"raw"`
|
Raw string `json:"raw"`
|
||||||
|
// The compass renders a rotor selector from these — one entry per logical
|
||||||
|
// rotor — without an extra roundtrip.
|
||||||
|
Rotors []string `json:"rotors"` // names of every logical rotor (may be empty strings)
|
||||||
|
Active int `json:"active"` // index this heading is for (0-based)
|
||||||
|
Motorized bool `json:"motorized"` // active rotor carries the motorized antenna → show pattern paths
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetRotatorHeading queries PstRotator for the current azimuth. Returns
|
// activeRotor resolves the currently selected logical rotor. ok is false when no
|
||||||
// Enabled=false when the rotator isn't configured. Polled by the status bar.
|
// rotor is configured.
|
||||||
|
func (a *App) activeRotor() (lr logicalRotor, rotors []logicalRotor, idx int, ok bool) {
|
||||||
|
devs, err := a.GetRotators()
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
rotors = flattenRotors(devs)
|
||||||
|
if len(rotors) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
idx = a.activeRotorIndex(len(rotors))
|
||||||
|
return rotors[idx], rotors, idx, true
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetRotatorHeading queries the active rotor for its azimuth. Returns
|
||||||
|
// Enabled=false when no rotator is configured. Polled by the status bar.
|
||||||
func (a *App) GetRotatorHeading() RotatorHeading {
|
func (a *App) GetRotatorHeading() RotatorHeading {
|
||||||
s, err := a.GetRotatorSettings()
|
lr, rotors, idx, ok := a.activeRotor()
|
||||||
if err != nil || !s.Enabled {
|
if !ok {
|
||||||
return RotatorHeading{Enabled: false}
|
return RotatorHeading{Enabled: false}
|
||||||
}
|
}
|
||||||
if s.Type == "rotgenius" {
|
names := make([]string, len(rotors))
|
||||||
st, raw, herr := rotgenius.New(s.Host, s.Port).Heading(s.RotatorNum)
|
for i, r := range rotors {
|
||||||
|
names[i] = r.Name
|
||||||
|
}
|
||||||
|
base := RotatorHeading{Enabled: true, Rotors: names, Active: idx, Motorized: lr.Motorized}
|
||||||
|
link := lr.Link
|
||||||
|
switch link.Type {
|
||||||
|
case "rotgenius":
|
||||||
|
st, raw, herr := rotgenius.New(link.Host, link.Port).Heading(link.Num)
|
||||||
if herr != nil {
|
if herr != nil {
|
||||||
return RotatorHeading{Enabled: true, OK: false, Raw: herr.Error()}
|
base.Raw = herr.Error()
|
||||||
|
return base
|
||||||
}
|
}
|
||||||
if !st.Connected {
|
if !st.Connected {
|
||||||
return RotatorHeading{Enabled: true, OK: false, Raw: "sensor not connected (999)"}
|
base.Raw = "sensor not connected (999)"
|
||||||
|
return base
|
||||||
}
|
}
|
||||||
return RotatorHeading{Enabled: true, OK: true, Azimuth: st.Azimuth, Raw: raw}
|
base.OK = true
|
||||||
}
|
base.Azimuth = st.Azimuth
|
||||||
if s.Type == "arco" {
|
base.Raw = raw
|
||||||
az, raw, herr := arcoClient(s).Heading()
|
return base
|
||||||
|
case "arco":
|
||||||
|
az, raw, herr := arcoClient(link).Heading()
|
||||||
if herr != nil {
|
if herr != nil {
|
||||||
return RotatorHeading{Enabled: true, OK: false, Raw: herr.Error()}
|
base.Raw = herr.Error()
|
||||||
|
return base
|
||||||
}
|
}
|
||||||
return RotatorHeading{Enabled: true, OK: true, Azimuth: az, Raw: raw}
|
base.OK = true
|
||||||
}
|
base.Azimuth = az
|
||||||
az, raw, herr := pst.New(s.Host, s.Port).Heading()
|
base.Raw = raw
|
||||||
|
return base
|
||||||
|
default:
|
||||||
|
az, raw, herr := pst.New(link.Host, link.Port).Heading()
|
||||||
if herr != nil {
|
if herr != nil {
|
||||||
return RotatorHeading{Enabled: true, OK: false, Raw: raw}
|
base.Raw = raw
|
||||||
|
return base
|
||||||
|
}
|
||||||
|
base.OK = true
|
||||||
|
base.Azimuth = az
|
||||||
|
base.Raw = raw
|
||||||
|
return base
|
||||||
}
|
}
|
||||||
return RotatorHeading{Enabled: true, OK: true, Azimuth: az, Raw: raw}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// RotatorGoTo points the antenna at the given azimuth (and optional
|
// RotatorGoTo points the active rotor at the given azimuth (and optional
|
||||||
// elevation if the rotator is configured for it).
|
// elevation if it is configured for it).
|
||||||
func (a *App) RotatorGoTo(az int, el int) error {
|
func (a *App) RotatorGoTo(az int, el int) error {
|
||||||
s, err := a.GetRotatorSettings()
|
lr, _, _, ok := a.activeRotor()
|
||||||
if err != nil {
|
if !ok {
|
||||||
return err
|
return fmt.Errorf("no rotator configured")
|
||||||
}
|
}
|
||||||
if !s.Enabled {
|
link := lr.Link
|
||||||
return fmt.Errorf("rotator disabled in settings")
|
switch link.Type {
|
||||||
|
case "rotgenius":
|
||||||
|
return rotgenius.New(link.Host, link.Port).GoTo(link.Num, az)
|
||||||
|
case "arco":
|
||||||
|
return arcoClient(link).GoTo(az)
|
||||||
|
default:
|
||||||
|
return pst.New(link.Host, link.Port).GoTo(az, link.HasElevation, el)
|
||||||
}
|
}
|
||||||
if s.Type == "rotgenius" {
|
|
||||||
return rotgenius.New(s.Host, s.Port).GoTo(s.RotatorNum, az)
|
|
||||||
}
|
|
||||||
if s.Type == "arco" {
|
|
||||||
return arcoClient(s).GoTo(az)
|
|
||||||
}
|
|
||||||
return pst.New(s.Host, s.Port).GoTo(az, s.HasElevation, el)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// RotatorStop interrupts any in-progress rotation, on either backend.
|
// RotatorStop interrupts any in-progress rotation of the active rotor.
|
||||||
func (a *App) RotatorStop() error {
|
func (a *App) RotatorStop() error {
|
||||||
s, err := a.GetRotatorSettings()
|
lr, _, _, ok := a.activeRotor()
|
||||||
if err != nil {
|
if !ok {
|
||||||
return err
|
return fmt.Errorf("no rotator configured")
|
||||||
}
|
}
|
||||||
if !s.Enabled {
|
link := lr.Link
|
||||||
return fmt.Errorf("rotator disabled in settings")
|
switch link.Type {
|
||||||
|
case "rotgenius":
|
||||||
|
return rotgenius.New(link.Host, link.Port).Stop()
|
||||||
|
case "arco":
|
||||||
|
return arcoClient(link).Stop()
|
||||||
|
default:
|
||||||
|
return pst.New(link.Host, link.Port).Stop()
|
||||||
}
|
}
|
||||||
if s.Type == "rotgenius" {
|
|
||||||
return rotgenius.New(s.Host, s.Port).Stop()
|
|
||||||
}
|
|
||||||
if s.Type == "arco" {
|
|
||||||
return arcoClient(s).Stop()
|
|
||||||
}
|
|
||||||
return pst.New(s.Host, s.Port).Stop()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// RotatorPark moves the antenna to its parked position (configured in
|
// RotatorPark moves the active rotor to its parked position (PstRotator only;
|
||||||
// PstRotator itself). Park is a PstRotator concept — the 4O3A native protocol
|
// the 4O3A native and ARCO GS-232 protocols have no park command).
|
||||||
// has no park command.
|
|
||||||
func (a *App) RotatorPark() error {
|
func (a *App) RotatorPark() error {
|
||||||
s, err := a.GetRotatorSettings()
|
lr, _, _, ok := a.activeRotor()
|
||||||
if err != nil {
|
if !ok {
|
||||||
return err
|
return fmt.Errorf("no rotator configured")
|
||||||
}
|
}
|
||||||
if !s.Enabled {
|
link := lr.Link
|
||||||
return fmt.Errorf("rotator disabled in settings")
|
switch link.Type {
|
||||||
}
|
case "rotgenius":
|
||||||
if s.Type == "rotgenius" {
|
|
||||||
return fmt.Errorf("park is a PstRotator feature; not available on the Rotator Genius")
|
return fmt.Errorf("park is a PstRotator feature; not available on the Rotator Genius")
|
||||||
}
|
case "arco":
|
||||||
if s.Type == "arco" {
|
|
||||||
return fmt.Errorf("park is a PstRotator feature; not available over the ARCO GS-232 link")
|
return fmt.Errorf("park is a PstRotator feature; not available over the ARCO GS-232 link")
|
||||||
|
default:
|
||||||
|
return pst.New(link.Host, link.Port).Park()
|
||||||
}
|
}
|
||||||
return pst.New(s.Host, s.Port).Park()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// TestRotator sends a no-op GoTo to the rotator's current heading to
|
// TestRotatorDevice verifies a rotor device's link (sub picks the Rotator Genius
|
||||||
// verify the UDP link without actually moving the antenna. We use 0° as
|
// port 1/2 for a Dual device). Takes the live panel device so it can be tested
|
||||||
// the test target — pick a known direction the user expects to see.
|
// before saving.
|
||||||
// Returns nil on success or a descriptive error.
|
func (a *App) TestRotatorDevice(d RotatorDevice, sub int) error {
|
||||||
func (a *App) TestRotator(s RotatorSettings) error {
|
return testRotorLink(deviceLink(d, sub))
|
||||||
if s.Host == "" {
|
}
|
||||||
s.Host = "127.0.0.1"
|
|
||||||
|
// testRotorLink confirms a rotor's link without meaningfully moving the antenna.
|
||||||
|
func testRotorLink(l rotorLink) error {
|
||||||
|
if l.Host == "" {
|
||||||
|
l.Host = "127.0.0.1"
|
||||||
}
|
}
|
||||||
if s.Type == "rotgenius" {
|
if l.Port <= 0 || l.Port > 65535 {
|
||||||
if s.Port <= 0 || s.Port > 65535 {
|
l.Port = rotatorDefaultPort(l.Type)
|
||||||
s.Port = 9006
|
|
||||||
}
|
}
|
||||||
rn := s.RotatorNum
|
switch l.Type {
|
||||||
|
case "rotgenius":
|
||||||
|
rn := l.Num
|
||||||
if rn != 2 {
|
if rn != 2 {
|
||||||
rn = 1
|
rn = 1
|
||||||
}
|
}
|
||||||
// Match the button ("Test — point to 0°"): actually command the move, like
|
// Match the button ("Test — point to 0°"): actually command the move, like
|
||||||
// the PstRotator path does. GoTo confirms the link AND the accept ('K')
|
// the PstRotator path does. GoTo confirms the link AND the accept ('K')
|
||||||
// reply, so a rejected command surfaces as an error instead of a false OK.
|
// reply, so a rejected command surfaces as an error instead of a false OK.
|
||||||
return rotgenius.New(s.Host, s.Port).GoTo(rn, 0)
|
return rotgenius.New(l.Host, l.Port).GoTo(rn, 0)
|
||||||
}
|
case "arco":
|
||||||
if s.Type == "arco" {
|
if l.Transport == "serial" && strings.TrimSpace(l.ComPort) == "" {
|
||||||
if s.Port <= 0 || s.Port > 65535 {
|
|
||||||
s.Port = 4001
|
|
||||||
}
|
|
||||||
if s.Transport == "serial" && strings.TrimSpace(s.ComPort) == "" {
|
|
||||||
return fmt.Errorf("select the ARCO's COM port first")
|
return fmt.Errorf("select the ARCO's COM port first")
|
||||||
}
|
}
|
||||||
// A heading query proves the link AND that the ARCO port really speaks
|
// A heading query proves the link AND that the ARCO port really speaks
|
||||||
// GS-232 — without moving the antenna.
|
// GS-232 — without moving the antenna.
|
||||||
_, _, err := arcoClient(s).Heading()
|
_, _, err := arcoClient(l).Heading()
|
||||||
return err
|
return err
|
||||||
|
default:
|
||||||
|
return pst.New(l.Host, l.Port).GoTo(0, false, -1)
|
||||||
}
|
}
|
||||||
if s.Port <= 0 || s.Port > 65535 {
|
|
||||||
s.Port = 12000
|
|
||||||
}
|
|
||||||
return pst.New(s.Host, s.Port).GoTo(0, false, -1)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func boolStr(b bool) string {
|
func boolStr(b bool) string {
|
||||||
@@ -14509,6 +14789,7 @@ type AmpConfig struct {
|
|||||||
Transport string `json:"transport"` // "tcp" | "serial"
|
Transport string `json:"transport"` // "tcp" | "serial"
|
||||||
Host string `json:"host"`
|
Host string `json:"host"`
|
||||||
Port int `json:"port"`
|
Port int `json:"port"`
|
||||||
|
Password string `json:"password"` // PowerGenius XL remote-access code (blank on LAN); sent as AUTH like the Tuner/Antenna Genius
|
||||||
ComPort string `json:"com_port"`
|
ComPort string `json:"com_port"`
|
||||||
Baud int `json:"baud"`
|
Baud int `json:"baud"`
|
||||||
|
|
||||||
@@ -14657,7 +14938,7 @@ func (a *App) startAmps() {
|
|||||||
inst := &Inst{cfg: c}
|
inst := &Inst{cfg: c}
|
||||||
switch {
|
switch {
|
||||||
case isPGXL:
|
case isPGXL:
|
||||||
inst.pgxl = powergenius.New(c.Host, c.Port)
|
inst.pgxl = powergenius.New(c.Host, c.Port, c.Password)
|
||||||
_ = inst.pgxl.Start()
|
_ = inst.pgxl.Start()
|
||||||
if a.pgxl == nil {
|
if a.pgxl == nil {
|
||||||
a.pgxl = inst.pgxl
|
a.pgxl = inst.pgxl
|
||||||
@@ -15836,3 +16117,32 @@ func (a *App) YaesuStopCW() error {
|
|||||||
}
|
}
|
||||||
return a.cat.YaesuDo(func(y cat.YaesuController) error { return y.StopCW() })
|
return a.cat.YaesuDo(func(y cat.YaesuController) error { return y.StopCW() })
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// KenwoodSendCW keys a CW message through the Kenwood/Elecraft keyer (CAT "KY"),
|
||||||
|
// so a K3 keys CW over its single CAT link — no WinKeyer, no second COM port.
|
||||||
|
func (a *App) KenwoodSendCW(text string) error {
|
||||||
|
if a.cat == nil {
|
||||||
|
return fmt.Errorf("cat not initialized")
|
||||||
|
}
|
||||||
|
err := a.cat.KenwoodDo(func(k cat.KenwoodController) error { return k.SendCW(text) })
|
||||||
|
if err != nil {
|
||||||
|
applog.Printf("kenwood cw: KenwoodSendCW(%q) failed: %v", text, err)
|
||||||
|
}
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// KenwoodStopCW aborts the message being sent (drops to receive).
|
||||||
|
func (a *App) KenwoodStopCW() error {
|
||||||
|
if a.cat == nil {
|
||||||
|
return fmt.Errorf("cat not initialized")
|
||||||
|
}
|
||||||
|
return a.cat.KenwoodDo(func(k cat.KenwoodController) error { return k.StopCW() })
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetKenwoodKeySpeed sets the K3/Kenwood keyer speed in WPM (CAT "KS").
|
||||||
|
func (a *App) SetKenwoodKeySpeed(wpm int) error {
|
||||||
|
if a.cat == nil {
|
||||||
|
return fmt.Errorf("cat not initialized")
|
||||||
|
}
|
||||||
|
return a.cat.KenwoodDo(func(k cat.KenwoodController) error { return k.SetKeySpeed(wpm) })
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,4 +1,48 @@
|
|||||||
[
|
[
|
||||||
|
{
|
||||||
|
"version": "0.23.3",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"Multiple rotors: Settings → Rotator is now a list, like the amplifiers — add rotors with “Add rotor”, remove with the trash icon. Mix any types (an ARCO and a Rotator Genius); a Rotator Genius set to “drives two rotors” adds a second one. The compass has a selector to pick the active rotor, which it turns, displays and points to the DX; each rotor is named, and you mark which one carries the motorized antenna (Ultrabeam/SteppIR) so the boom and reverse/bidirectional pattern paths show only for it.",
|
||||||
|
"CAT PTT hotkey: pick a key in Settings → CAT and it keys the transmitter over CAT while OpsLog is focused — hold-to-talk or toggle (a rig with no CAT link falls back to the Audio-tab RTS/DTR method). Keys that need AltGr on your layout (e.g. \"\\\" on AZERTY) work, and each press is written to the diagnostic log.",
|
||||||
|
"TCI spots (ExpertSDR / SunSDR): OpsLog's cluster spots now show on the panorama — the colour is sent as the decimal integer the protocol expects (a hex string was silently dropped), with a valid modulation — and clicking one fills the entry (callsign + frequency) via the CLICKED_ON_SPOT message.",
|
||||||
|
"FlexRadio spot click: clicking one of OpsLog's spots on the SmartSDR panadapter now switches the mode too, not just the frequency.",
|
||||||
|
"PowerGenius XL: the widget and the FlexRadio amplifier card now read forward power, drain current and temperature from the amp's own link (polled every 250 ms with peak-hold), so the meters keep working — and stay steady — over a remote link where the radio's VITA stream never reaches OpsLog. Adds a remote-access password (Settings → Amplifier) to reach the amp from outside the LAN, and fixes the fan mode (Standard/Contest/Broadcast), which was reverting to Contest.",
|
||||||
|
"CW macro <LOGQSO>: a macro ending in the token (e.g. \"BK UR <STX> TU <LOGQSO>\") now logs the QSO once the CW before it has been sent, not the instant the macro starts — it was logging on the first keyed letter.",
|
||||||
|
"Filter presets: the trash icon next to a saved preset deletes it again — clicking it was loading the preset instead of removing it.",
|
||||||
|
"Kenwood/Elecraft (K3/K4): data modes (FT8/PSK/JT) now go out on USB on every band — below 10 MHz they were landing on LSB, which a K3 shows as \"DATA REV\". The frequency refreshes promptly again (the split double-check no longer runs on every poll). And a new CW keyer engine (Settings → CW Keyer → Kenwood/Elecraft) sends CW over the CAT link with the KY command — no WinKeyer and no second COM port — for a rig whose single USB port is the CAT port. Needs on-air testing on a K3."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Plusieurs rotors : Réglages → Rotator est désormais une liste, comme les amplis — ajoutez des rotors avec « Ajouter un rotor », supprimez avec la corbeille. Mélangez les types (un ARCO et un Rotator Genius) ; un Rotator Genius réglé sur « pilote deux rotors » en ajoute un second. Le compas a un sélecteur pour choisir le rotor actif, qu'il tourne, affiche et pointe vers le DX ; chaque rotor est nommé, et vous indiquez lequel porte l'antenne motorisée (Ultrabeam/SteppIR) pour que les tracés de boom et de diagramme inverse/bidirectionnel n'apparaissent que pour lui.",
|
||||||
|
"Touche PTT CAT : choisissez une touche dans Réglages → CAT et elle passe la radio en émission via CAT quand OpsLog a le focus — maintien ou bascule (une radio sans liaison CAT retombe sur la méthode RTS/DTR de l'onglet Audio). Les touches nécessitant AltGr (ex. « \\ » en AZERTY) fonctionnent, et chaque appui est tracé dans le journal de diagnostic.",
|
||||||
|
"Spots TCI (ExpertSDR / SunSDR) : les spots cluster d'OpsLog apparaissent sur le panorama — la couleur est envoyée en entier décimal attendu par le protocole (une chaîne hexadécimale était silencieusement rejetée), avec une modulation valide — et cliquer un spot remplit la saisie (indicatif + fréquence) via le message CLICKED_ON_SPOT.",
|
||||||
|
"Clic sur un spot FlexRadio : cliquer un spot d'OpsLog sur le panadapter SmartSDR change désormais aussi le mode, plus seulement la fréquence.",
|
||||||
|
"PowerGenius XL : le widget et la carte ampli du panneau FlexRadio lisent maintenant puissance directe, courant de drain et température depuis la liaison propre de l'ampli (interrogée toutes les 250 ms avec maintien de crête) — les meters continuent donc de fonctionner, et restent stables, sur une liaison distante où le flux VITA de la radio n'atteint jamais OpsLog. Ajoute un mot de passe d'accès distant (Réglages → Amplificateur) pour joindre l'ampli hors du réseau local, et corrige le mode ventilateur (Standard/Contest/Broadcast) qui repassait sur Contest.",
|
||||||
|
"Macro CW <LOGQSO> : une macro se terminant par le token (ex. « BK UR <STX> TU <LOGQSO> ») journalise le QSO une fois le CW qui précède envoyé, et non à l'instant où la macro démarre — elle journalisait dès la première lettre manipulée.",
|
||||||
|
"Presets de filtre : la corbeille à côté d'un preset enregistré le supprime de nouveau — le clic chargeait le preset au lieu de le retirer.",
|
||||||
|
"Kenwood/Elecraft (K3/K4) : les modes data (FT8/PSK/JT) partent désormais en USB sur toutes les bandes — sous 10 MHz ils passaient en LSB, ce qu'un K3 affiche comme « DATA REV ». La fréquence se rafraîchit de nouveau rapidement (la double-vérification du split ne se fait plus à chaque cycle). Et un nouveau moteur de keyer (Réglages → Keyer CW → Kenwood/Elecraft) envoie le CW sur la liaison CAT avec la commande KY — sans WinKeyer ni second port COM — pour une radio dont l'unique port USB est le port CAT. À tester sur l'air avec un K3."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.23.2",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"Lookup: the locator now keeps whichever is more precise. A 4-character square from QRZ or HamQTH no longer overwrites the full 6-character locator confirmed on a previous contact.",
|
||||||
|
"LoTW badge: when ARRL's own user list has not been rebuilt for a while, the tooltip says so with its date — a station shown as \"uploaded 7 days ago\" may simply be sitting in a frozen list.",
|
||||||
|
"FlexRadio decode spots: with two WSJT-X instances on two slices, decodes are no longer placed on the wrong panadapter, and a station heard on both is now spotted on both.",
|
||||||
|
"DX cluster: a spot glued to the login prompt is no longer dropped. Clusters that print the prompt without a newline cost you the first spot after connecting.",
|
||||||
|
"Help → Diagnostic log: read the log live, without leaving OpsLog. Filter the lines, and follow the end or scroll back freely.",
|
||||||
|
"Entity stats: the DX station's sunrise and sunset (UTC) now show on the right, next to Most Wanted. Midnight sun and polar night are named as such."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Recherche : le locator garde désormais le plus précis des deux. Un carré en 4 caractères venant de QRZ ou HamQTH n'écrase plus le locator complet en 6 caractères confirmé lors d'un contact précédent.",
|
||||||
|
"Badge LoTW : quand la liste ARRL elle-même n'a pas été régénérée depuis un moment, l'infobulle le dit avec sa date — une station annoncée « dernier envoi il y a 7 jours » peut simplement figurer dans une liste figée.",
|
||||||
|
"Spots de décodes FlexRadio : avec deux instances WSJT-X sur deux slices, les décodes ne s'affichent plus sur le mauvais panadapter, et une station entendue sur les deux est désormais spottée sur les deux.",
|
||||||
|
"Cluster DX : un spot collé à l'invite de connexion n'est plus perdu. Les clusters qui affichent leur invite sans retour à la ligne coûtaient le premier spot après la connexion.",
|
||||||
|
"Aide → Journal de diagnostic : lire le journal en direct sans quitter OpsLog. Filtrage des lignes, et suivi de la fin qu'on peut relâcher pour remonter.",
|
||||||
|
"Statistiques d'entité : le lever et le coucher du soleil de la station DX (UTC) s'affichent à droite, à côté du Most Wanted. Soleil de minuit et nuit polaire sont nommés."
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"version": "0.23.1",
|
"version": "0.23.1",
|
||||||
"date": "",
|
"date": "",
|
||||||
|
|||||||
+120
-24
@@ -20,7 +20,7 @@ import {
|
|||||||
GetCATState, SetCATFrequency, SetCATMode, SwitchCATRig, FlexApplyBandAntenna, FlexApplyBandPower,
|
GetCATState, SetCATFrequency, SetCATMode, SwitchCATRig, FlexApplyBandAntenna, FlexApplyBandPower,
|
||||||
GetSecretStatus, UnlockSecrets,
|
GetSecretStatus, UnlockSecrets,
|
||||||
RefreshCtyDat, DownloadAllReferenceLists,
|
RefreshCtyDat, DownloadAllReferenceLists,
|
||||||
RotatorGoTo, RotatorStop, GetRotatorHeading,
|
RotatorGoTo, RotatorStop, GetRotatorHeading, SetActiveRotor,
|
||||||
GetDBConnectionInfo, GetLogbookRevision,
|
GetDBConnectionInfo, GetLogbookRevision,
|
||||||
GetUltrabeamStatus, SetUltrabeamDirection, UILog,
|
GetUltrabeamStatus, SetUltrabeamDirection, UILog,
|
||||||
GetAntGeniusStatus, GetAntGeniusSettings, AntGeniusActivate,
|
GetAntGeniusStatus, GetAntGeniusSettings, AntGeniusActivate,
|
||||||
@@ -29,7 +29,7 @@ import {
|
|||||||
OpenExternalURL,
|
OpenExternalURL,
|
||||||
ConnectAllClusters, DisconnectAllClusters, GetClusterStatus, SendClusterCommand,
|
ConnectAllClusters, DisconnectAllClusters, GetClusterStatus, SendClusterCommand,
|
||||||
ListClusterServers, ClusterSpotStatuses, SendClusterSpot,
|
ListClusterServers, ClusterSpotStatuses, SendClusterSpot,
|
||||||
GetCATSettings,
|
GetCATSettings, PTTHotkeyDown, PTTHotkeyUp,
|
||||||
GetSolarData,
|
GetSolarData,
|
||||||
GetQSORate,
|
GetQSORate,
|
||||||
LoTWUserInfo,
|
LoTWUserInfo,
|
||||||
@@ -39,6 +39,7 @@ import {
|
|||||||
GetWinkeyerSettings, SaveWinkeyerSettings, ListSerialPorts, GetWinkeyerStatus,
|
GetWinkeyerSettings, SaveWinkeyerSettings, ListSerialPorts, GetWinkeyerStatus,
|
||||||
WinkeyerConnect, WinkeyerDisconnect, WinkeyerSend, WinkeyerStop, WinkeyerSetSpeed, WinkeyerBackspace,
|
WinkeyerConnect, WinkeyerDisconnect, WinkeyerSend, WinkeyerStop, WinkeyerSetSpeed, WinkeyerBackspace,
|
||||||
IcomSendCW, YaesuSendCW, YaesuStopCW, SetYaesuKeySpeed, IcomStopCW, IcomSetKeySpeed, IcomSetBreakIn, GetIcomState,
|
IcomSendCW, YaesuSendCW, YaesuStopCW, SetYaesuKeySpeed, IcomStopCW, IcomSetKeySpeed, IcomSetBreakIn, GetIcomState,
|
||||||
|
KenwoodSendCW, KenwoodStopCW, SetKenwoodKeySpeed,
|
||||||
FlexSendCW, FlexStopCW, FlexSetKeySpeed, FlexBackspaceCW,
|
FlexSendCW, FlexStopCW, FlexSetKeySpeed, FlexBackspaceCW,
|
||||||
GetDVKMessages, GetDVKStatus, DVKPlay, DVKStop,
|
GetDVKMessages, GetDVKStatus, DVKPlay, DVKStop,
|
||||||
StartCWDecoder, StopCWDecoder, SetCWDecoderPitch,
|
StartCWDecoder, StopCWDecoder, SetCWDecoderPitch,
|
||||||
@@ -120,6 +121,7 @@ import {
|
|||||||
import { cn } from '@/lib/utils';
|
import { cn } from '@/lib/utils';
|
||||||
import { pathBetween, pathBetweenLatLon, gridToLatLon, latLonToGrid } from '@/lib/maidenhead';
|
import { pathBetween, pathBetweenLatLon, gridToLatLon, latLonToGrid } from '@/lib/maidenhead';
|
||||||
import { flagURL } from '@/lib/flags';
|
import { flagURL } from '@/lib/flags';
|
||||||
|
import { LogViewer } from '@/components/LogViewer';
|
||||||
|
|
||||||
type QSO = QSOForm;
|
type QSO = QSOForm;
|
||||||
type ImportResult = adifModels.ImportResult;
|
type ImportResult = adifModels.ImportResult;
|
||||||
@@ -547,7 +549,7 @@ export default function App() {
|
|||||||
}, []);
|
}, []);
|
||||||
// LoTW-user lookup for the entered callsign (from the cached ARRL activity list),
|
// LoTW-user lookup for the entered callsign (from the cached ARRL activity list),
|
||||||
// debounced. Drives a colour-coded LoTW badge by last-upload recency.
|
// debounced. Drives a colour-coded LoTW badge by last-upload recency.
|
||||||
const [lotwInfo, setLotwInfo] = useState<{ is_user: boolean; last_upload?: string; days_ago: number } | null>(null);
|
const [lotwInfo, setLotwInfo] = useState<{ is_user: boolean; last_upload?: string; days_ago: number; feed_date?: string; feed_stale?: boolean } | null>(null);
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const c = callsign.trim();
|
const c = callsign.trim();
|
||||||
if (!c) { setLotwInfo(null); return; }
|
if (!c) { setLotwInfo(null); return; }
|
||||||
@@ -627,6 +629,11 @@ export default function App() {
|
|||||||
// can't tell us if it's FT8 vs FT4 vs RTTY, so the user picks the default
|
// can't tell us if it's FT8 vs FT4 vs RTTY, so the user picks the default
|
||||||
// in Preferences > Hardware > CAT interface.
|
// in Preferences > Hardware > CAT interface.
|
||||||
const digitalDefaultRef = useRef<string>('FT8');
|
const digitalDefaultRef = useRef<string>('FT8');
|
||||||
|
// PTT hotkey config, refreshed by loadCATCfg. Held in a ref so the global
|
||||||
|
// key listener (registered once) always sees the current binding.
|
||||||
|
const pttHotkeyRef = useRef<{ enabled: boolean; code: string; toggle: boolean }>({ enabled: false, code: '', toggle: false });
|
||||||
|
const pttHeldRef = useRef(false); // hold-mode: PTT currently keyed by the hotkey
|
||||||
|
const pttToggledRef = useRef(false); // toggle-mode: latched TX state
|
||||||
// Don't override freq/band/mode the user JUST typed — track a small grace
|
// Don't override freq/band/mode the user JUST typed — track a small grace
|
||||||
// window after manual edits and skip CAT updates during it.
|
// window after manual edits and skip CAT updates during it.
|
||||||
const catFreezeUntilRef = useRef<number>(0);
|
const catFreezeUntilRef = useRef<number>(0);
|
||||||
@@ -1074,7 +1081,7 @@ export default function App() {
|
|||||||
// CI-V 0x17 (no extra hardware — sends over the CAT connection). Macros,
|
// CI-V 0x17 (no extra hardware — sends over the CAT connection). Macros,
|
||||||
// auto-call and <LOGQSO> are shared; only the transport differs.
|
// auto-call and <LOGQSO> are shared; only the transport differs.
|
||||||
const [wkEngine, setWkEngine] = useState<string>('winkeyer');
|
const [wkEngine, setWkEngine] = useState<string>('winkeyer');
|
||||||
const cwSource: 'winkeyer' | 'icom' | 'flex' | 'yaesu' = wkEngine === 'icom' ? 'icom' : wkEngine === 'flex' ? 'flex' : wkEngine === 'yaesu' ? 'yaesu' : 'winkeyer';
|
const cwSource: 'winkeyer' | 'icom' | 'flex' | 'yaesu' | 'kenwood' = wkEngine === 'icom' ? 'icom' : wkEngine === 'flex' ? 'flex' : wkEngine === 'yaesu' ? 'yaesu' : wkEngine === 'kenwood' ? 'kenwood' : 'winkeyer';
|
||||||
// Setting the CW speed has to reach the keyer that is ACTUALLY sending, and
|
// Setting the CW speed has to reach the keyer that is ACTUALLY sending, and
|
||||||
// both the CW panel and the Yaesu console can ask for it. With DTR/RTS line
|
// both the CW panel and the Yaesu console can ask for it. With DTR/RTS line
|
||||||
// keying the PC does the timing, so the rig's internal keyer speed changes
|
// keying the PC does the timing, so the rig's internal keyer speed changes
|
||||||
@@ -1087,6 +1094,7 @@ export default function App() {
|
|||||||
if (src === 'icom') IcomSetKeySpeed(w).catch(() => {});
|
if (src === 'icom') IcomSetKeySpeed(w).catch(() => {});
|
||||||
else if (src === 'flex') FlexSetKeySpeed(w).catch(() => {});
|
else if (src === 'flex') FlexSetKeySpeed(w).catch(() => {});
|
||||||
else if (src === 'yaesu') SetYaesuKeySpeed(w).catch(() => {});
|
else if (src === 'yaesu') SetYaesuKeySpeed(w).catch(() => {});
|
||||||
|
else if (src === 'kenwood') SetKenwoodKeySpeed(w).catch(() => {});
|
||||||
else WinkeyerSetSpeed(w).catch(() => {});
|
else WinkeyerSetSpeed(w).catch(() => {});
|
||||||
// The rig's own keyer follows too whenever a Yaesu is on CAT, even when it is
|
// The rig's own keyer follows too whenever a Yaesu is on CAT, even when it is
|
||||||
// not the sending engine: its front panel and OpsLog then agree.
|
// not the sending engine: its front panel and OpsLog then agree.
|
||||||
@@ -1130,6 +1138,7 @@ export default function App() {
|
|||||||
const connected = cwSource === 'icom' ? (catState.backend === 'icom' && catState.connected)
|
const connected = cwSource === 'icom' ? (catState.backend === 'icom' && catState.connected)
|
||||||
: cwSource === 'flex' ? (catState.backend === 'flex' && catState.connected)
|
: cwSource === 'flex' ? (catState.backend === 'flex' && catState.connected)
|
||||||
: cwSource === 'yaesu' ? (catState.backend === 'yaesu' && catState.connected)
|
: cwSource === 'yaesu' ? (catState.backend === 'yaesu' && catState.connected)
|
||||||
|
: cwSource === 'kenwood' ? (catState.backend === 'kenwood' && catState.connected)
|
||||||
: wkStatus.connected;
|
: wkStatus.connected;
|
||||||
wkActiveRef.current = wkEnabled && connected;
|
wkActiveRef.current = wkEnabled && connected;
|
||||||
}, [wkEnabled, wkStatus.connected, cwSource, catState.backend, catState.connected]);
|
}, [wkEnabled, wkStatus.connected, cwSource, catState.backend, catState.connected]);
|
||||||
@@ -1547,6 +1556,7 @@ export default function App() {
|
|||||||
const [showAbout, setShowAbout] = useState(false);
|
const [showAbout, setShowAbout] = useState(false);
|
||||||
// "What's new": the changelog for the version(s) since the operator last ran,
|
// "What's new": the changelog for the version(s) since the operator last ran,
|
||||||
// shown once on the first launch after an update (EN/FR per the UI language).
|
// shown once on the first launch after an update (EN/FR per the UI language).
|
||||||
|
const [showLogViewer, setShowLogViewer] = useState(false);
|
||||||
const [whatsNew, setWhatsNew] = useState<Array<{ version: string; date: string; en: string[]; fr: string[] }> | null>(null);
|
const [whatsNew, setWhatsNew] = useState<Array<{ version: string; date: string; en: string[]; fr: string[] }> | null>(null);
|
||||||
// Which language the What's-new modal shows — defaults to the UI language but
|
// Which language the What's-new modal shows — defaults to the UI language but
|
||||||
// toggleable, so a French operator running the English UI can still read it.
|
// toggleable, so a French operator running the English UI can still read it.
|
||||||
@@ -1762,23 +1772,28 @@ export default function App() {
|
|||||||
: null
|
: null
|
||||||
), [rotatorHeading.enabled, rotatorHeading.ok, rotatorHeading.azimuth]);
|
), [rotatorHeading.enabled, rotatorHeading.ok, rotatorHeading.azimuth]);
|
||||||
|
|
||||||
|
// Only the active rotor carrying the motorized antenna (Ultrabeam/SteppIR)
|
||||||
|
// shows the pattern paths; a plain rotor shows just its heading. The backend
|
||||||
|
// reports Motorized for the active rotor (true for a lone/standard rotor).
|
||||||
|
const activeRotorMotorized = (rotatorHeading as any).motorized !== false;
|
||||||
|
|
||||||
const beamHeadings = useMemo<number[]>(() => {
|
const beamHeadings = useMemo<number[]>(() => {
|
||||||
if (rotorAz == null) return [];
|
if (rotorAz == null) return [];
|
||||||
if (ubStatus.enabled && ubStatus.connected) {
|
if (activeRotorMotorized && ubStatus.enabled && ubStatus.connected) {
|
||||||
if (ubStatus.direction === 1) return [(rotorAz + 180) % 360];
|
if (ubStatus.direction === 1) return [(rotorAz + 180) % 360];
|
||||||
if (ubStatus.direction === 2) return [rotorAz, (rotorAz + 180) % 360];
|
if (ubStatus.direction === 2) return [rotorAz, (rotorAz + 180) % 360];
|
||||||
}
|
}
|
||||||
return [rotorAz];
|
return [rotorAz];
|
||||||
}, [rotorAz, ubStatus.enabled, ubStatus.connected, ubStatus.direction]);
|
}, [rotorAz, activeRotorMotorized, ubStatus.enabled, ubStatus.connected, ubStatus.direction]);
|
||||||
|
|
||||||
// Mechanical boom (rotor) heading + Ultrabeam pattern — so the compass/map can
|
// Mechanical boom (rotor) heading + Ultrabeam pattern — so the compass/map can
|
||||||
// show where the antenna physically points (boom) vs where it radiates when
|
// show where the antenna physically points (boom) vs where it radiates when
|
||||||
// the Ultrabeam is reversed/bidirectional.
|
// the Ultrabeam is reversed/bidirectional.
|
||||||
const boomHeading = rotorAz;
|
const boomHeading = rotorAz;
|
||||||
const ubPattern = useMemo<'normal' | 'reverse' | 'bi' | null>(() => {
|
const ubPattern = useMemo<'normal' | 'reverse' | 'bi' | null>(() => {
|
||||||
if (!(ubStatus.enabled && ubStatus.connected)) return null;
|
if (!activeRotorMotorized || !(ubStatus.enabled && ubStatus.connected)) return null;
|
||||||
return ubStatus.direction === 1 ? 'reverse' : ubStatus.direction === 2 ? 'bi' : 'normal';
|
return ubStatus.direction === 1 ? 'reverse' : ubStatus.direction === 2 ? 'bi' : 'normal';
|
||||||
}, [ubStatus.enabled, ubStatus.connected, ubStatus.direction]);
|
}, [activeRotorMotorized, ubStatus.enabled, ubStatus.connected, ubStatus.direction]);
|
||||||
|
|
||||||
// Portable UI toggles (mirrored to the DB via writeUiPref / syncPortablePrefs).
|
// Portable UI toggles (mirrored to the DB via writeUiPref / syncPortablePrefs).
|
||||||
const [showRotor, setShowRotor] = useState(() => localStorage.getItem('opslog.showRotor') !== '0');
|
const [showRotor, setShowRotor] = useState(() => localStorage.getItem('opslog.showRotor') !== '0');
|
||||||
@@ -1925,6 +1940,56 @@ export default function App() {
|
|||||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||||
}, [showToast]);
|
}, [showToast]);
|
||||||
|
|
||||||
|
// PTT hotkey: a keyboard key keys the rig while OpsLog is focused. Registered
|
||||||
|
// once; reads the live binding from pttHotkeyRef (kept current by loadCATCfg).
|
||||||
|
// Hold-to-talk by default; toggle mode latches. We swallow the key (so the
|
||||||
|
// dedicated PTT key doesn't type a character) and ignore auto-repeat.
|
||||||
|
useEffect(() => {
|
||||||
|
const down = (e: KeyboardEvent) => {
|
||||||
|
const cfg = pttHotkeyRef.current;
|
||||||
|
if (!cfg.enabled || !cfg.code || e.code !== cfg.code) return;
|
||||||
|
// Allow AltGr (Ctrl+Alt together) — French/other layouts need it to reach
|
||||||
|
// keys like "\" — but never hijack a real Ctrl- or Win-shortcut.
|
||||||
|
if (e.metaKey || (e.ctrlKey && !e.altKey)) return;
|
||||||
|
e.preventDefault();
|
||||||
|
if (e.repeat) return;
|
||||||
|
// Surface the result: this feature was impossible to diagnose because every
|
||||||
|
// error was swallowed. The line names the key, the action and any failure.
|
||||||
|
const fail = (err: any) => { UILog(`ptt hotkey: ${e.code} FAILED: ${err}`).catch(() => {}); };
|
||||||
|
if (cfg.toggle) {
|
||||||
|
pttToggledRef.current = !pttToggledRef.current;
|
||||||
|
const on = pttToggledRef.current;
|
||||||
|
UILog(`ptt hotkey: ${e.code} toggle → ${on ? 'KEY' : 'UNKEY'}`).catch(() => {});
|
||||||
|
(on ? PTTHotkeyDown() : PTTHotkeyUp())?.catch?.(fail);
|
||||||
|
} else if (!pttHeldRef.current) {
|
||||||
|
pttHeldRef.current = true;
|
||||||
|
UILog(`ptt hotkey: ${e.code} down → KEY`).catch(() => {});
|
||||||
|
PTTHotkeyDown().catch(fail);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
const up = (e: KeyboardEvent) => {
|
||||||
|
const cfg = pttHotkeyRef.current;
|
||||||
|
if (!cfg.enabled || !cfg.code || e.code !== cfg.code) return;
|
||||||
|
if (cfg.toggle) return; // toggle unkeys on the next press, not on release
|
||||||
|
if (pttHeldRef.current) {
|
||||||
|
pttHeldRef.current = false;
|
||||||
|
PTTHotkeyUp();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
// Losing focus mid-hold would never deliver keyup — release so TX can't stick.
|
||||||
|
const blur = () => {
|
||||||
|
if (pttHeldRef.current) { pttHeldRef.current = false; PTTHotkeyUp(); }
|
||||||
|
};
|
||||||
|
window.addEventListener('keydown', down, true);
|
||||||
|
window.addEventListener('keyup', up, true);
|
||||||
|
window.addEventListener('blur', blur);
|
||||||
|
return () => {
|
||||||
|
window.removeEventListener('keydown', down, true);
|
||||||
|
window.removeEventListener('keyup', up, true);
|
||||||
|
window.removeEventListener('blur', blur);
|
||||||
|
};
|
||||||
|
}, []);
|
||||||
|
|
||||||
// Poll PstRotator for the live antenna heading (status bar). Cheap when the
|
// Poll PstRotator for the live antenna heading (status bar). Cheap when the
|
||||||
// rotator is disabled (the backend just reads settings and returns).
|
// rotator is disabled (the backend just reads settings and returns).
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -2108,6 +2173,11 @@ export default function App() {
|
|||||||
try {
|
try {
|
||||||
const c = await GetCATSettings();
|
const c = await GetCATSettings();
|
||||||
if (c.digital_default) digitalDefaultRef.current = c.digital_default;
|
if (c.digital_default) digitalDefaultRef.current = c.digital_default;
|
||||||
|
pttHotkeyRef.current = {
|
||||||
|
enabled: !!(c as any).ptt_hotkey_enabled,
|
||||||
|
code: (c as any).ptt_hotkey ?? '',
|
||||||
|
toggle: !!(c as any).ptt_hotkey_toggle,
|
||||||
|
};
|
||||||
setCatBackend(c.backend ?? '');
|
setCatBackend(c.backend ?? '');
|
||||||
} catch {}
|
} catch {}
|
||||||
}, []);
|
}, []);
|
||||||
@@ -2569,6 +2639,11 @@ export default function App() {
|
|||||||
const call = String(p?.call ?? '');
|
const call = String(p?.call ?? '');
|
||||||
if (applyUdpCall(call, true)) restartRecordingForNewTarget(call);
|
if (applyUdpCall(call, true)) restartRecordingForNewTarget(call);
|
||||||
});
|
});
|
||||||
|
// Clicking a spot on the ExpertSDR (TCI) panorama fills the call, like Flex.
|
||||||
|
const unsubTciSpot = EventsOn('tci:spot_clicked', (p: any) => {
|
||||||
|
const call = String(p?.call ?? '');
|
||||||
|
if (applyUdpCall(call, true)) restartRecordingForNewTarget(call);
|
||||||
|
});
|
||||||
const unsubBulk = EventsOn('bulkupdate:progress', (p: any) => {
|
const unsubBulk = EventsOn('bulkupdate:progress', (p: any) => {
|
||||||
const total = Number(p?.total ?? 0);
|
const total = Number(p?.total ?? 0);
|
||||||
const processed = Number(p?.processed ?? 0);
|
const processed = Number(p?.processed ?? 0);
|
||||||
@@ -2603,7 +2678,7 @@ export default function App() {
|
|||||||
const file = String(p?.file ?? '').replace(/^.*[\\/]/, '');
|
const file = String(p?.file ?? '').replace(/^.*[\\/]/, '');
|
||||||
showToast(file ? t('adifmon.toastFrom', { n, file }) : t('adifmon.toast', { n }));
|
showToast(file ? t('adifmon.toastFrom', { n, file }) : t('adifmon.toast', { n }));
|
||||||
});
|
});
|
||||||
return () => { unsubDX?.(); unsubRC?.(); unsubClear?.(); unsubFlexSpot?.(); unsubProg?.(); unsubBulk?.(); unsubLog?.(); unsubAdifMon?.(); };
|
return () => { unsubDX?.(); unsubRC?.(); unsubClear?.(); unsubFlexSpot?.(); unsubTciSpot?.(); unsubProg?.(); unsubBulk?.(); unsubLog?.(); unsubAdifMon?.(); };
|
||||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
@@ -2758,7 +2833,7 @@ export default function App() {
|
|||||||
// segment AFTER the <LOGQSO> (which logs and clears the form) still expands its
|
// segment AFTER the <LOGQSO> (which logs and clears the form) still expands its
|
||||||
// variables correctly.
|
// variables correctly.
|
||||||
const parts = rawText.split(/<LOGQSO>/i).map((pt) => resolveCW(pt));
|
const parts = rawText.split(/<LOGQSO>/i).map((pt) => resolveCW(pt));
|
||||||
const isRig = cwSourceRef.current === 'icom' || cwSourceRef.current === 'flex' || cwSourceRef.current === 'yaesu';
|
const isRig = cwSourceRef.current === 'icom' || cwSourceRef.current === 'flex' || cwSourceRef.current === 'yaesu' || cwSourceRef.current === 'kenwood';
|
||||||
for (let p = 0; p < parts.length; p++) {
|
for (let p = 0; p < parts.length; p++) {
|
||||||
if (aborted()) return; // ESC / Stop before this segment → stop sending, don't log
|
if (aborted()) return; // ESC / Stop before this segment → stop sending, don't log
|
||||||
const resolved = parts[p];
|
const resolved = parts[p];
|
||||||
@@ -2770,15 +2845,14 @@ export default function App() {
|
|||||||
// current WPM, so it scales automatically.
|
// current WPM, so it scales automatically.
|
||||||
const keyed = resolved + ' ';
|
const keyed = resolved + ' ';
|
||||||
setWkSent(resolved);
|
setWkSent(resolved);
|
||||||
const sendFn = cwSourceRef.current === 'flex' ? FlexSendCW : cwSourceRef.current === 'icom' ? IcomSendCW : cwSourceRef.current === 'yaesu' ? YaesuSendCW : null;
|
const sendFn = cwSourceRef.current === 'flex' ? FlexSendCW : cwSourceRef.current === 'icom' ? IcomSendCW : cwSourceRef.current === 'yaesu' ? YaesuSendCW : cwSourceRef.current === 'kenwood' ? KenwoodSendCW : null;
|
||||||
if (sendFn) await sendFn(keyed).catch((e) => setError(String(e?.message ?? e)));
|
if (sendFn) await sendFn(keyed).catch((e) => setError(String(e?.message ?? e)));
|
||||||
else await WinkeyerSend(keyed).catch((e) => setError(String(e?.message ?? e)));
|
else await WinkeyerSend(keyed).catch((e) => setError(String(e?.message ?? e)));
|
||||||
// Only WAIT for the CW to finish on the FINAL segment — auto-call needs the
|
// WAIT for THIS segment's CW to finish before moving on — so a <LOGQSO>
|
||||||
// send done before its gap+resend. A segment a <LOGQSO> follows is NOT waited
|
// that follows logs AFTER the text before it (e.g. "TU") has actually been
|
||||||
// on: the keyer has already buffered the CW, so logging happens AT ONCE and
|
// sent, not the instant it's buffered into the keyer. Buffering then logging
|
||||||
// never interrupts what's being sent. (Gating the log on a CW-length ESTIMATE
|
// "at once" made a macro ending in "TU <LOGQSO>" log on the very first
|
||||||
// made <LOGQSO> log up to ~10s late when the estimate ran long.)
|
// letter. Auto-call also needs the send finished before its gap+resend.
|
||||||
if (isLast) {
|
|
||||||
if (isRig) {
|
if (isRig) {
|
||||||
await waitMs(Math.round(estimateCwMs(resolved, wkWpm)) + 600);
|
await waitMs(Math.round(estimateCwMs(resolved, wkWpm)) + 600);
|
||||||
} else {
|
} else {
|
||||||
@@ -2800,9 +2874,8 @@ export default function App() {
|
|||||||
while (wkBusyRef.current && !aborted() && Date.now() < deadline) await sleep(50);
|
while (wkBusyRef.current && !aborted() && Date.now() < deadline) await sleep(50);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
if (aborted()) return; // aborted while this segment was sending → don't log
|
if (aborted()) return; // aborted while this segment was sending → don't log
|
||||||
if (logAfter) void save(); // log NOW — the buffered CW keeps sending
|
if (logAfter) void save(); // the preceding CW has finished → log at the token's spot
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// stopAutoCall cancels any running auto-call loop.
|
// stopAutoCall cancels any running auto-call loop.
|
||||||
@@ -2814,6 +2887,7 @@ export default function App() {
|
|||||||
if (cwSourceRef.current === 'icom') IcomStopCW().catch(() => {});
|
if (cwSourceRef.current === 'icom') IcomStopCW().catch(() => {});
|
||||||
else if (cwSourceRef.current === 'flex') FlexStopCW().catch(() => {});
|
else if (cwSourceRef.current === 'flex') FlexStopCW().catch(() => {});
|
||||||
else if (cwSourceRef.current === 'yaesu') YaesuStopCW().catch(() => {});
|
else if (cwSourceRef.current === 'yaesu') YaesuStopCW().catch(() => {});
|
||||||
|
else if (cwSourceRef.current === 'kenwood') KenwoodStopCW().catch(() => {});
|
||||||
else WinkeyerStop().catch(() => {});
|
else WinkeyerStop().catch(() => {});
|
||||||
}
|
}
|
||||||
// runAutoCall sends macro i, waits for the keyer to finish, waits the chosen
|
// runAutoCall sends macro i, waits for the keyer to finish, waits the chosen
|
||||||
@@ -3293,10 +3367,16 @@ export default function App() {
|
|||||||
if (!ue.has('name') && empty(r?.name) && last.name) setName(last.name);
|
if (!ue.has('name') && empty(r?.name) && last.name) setName(last.name);
|
||||||
if (!ue.has('qth') && empty(r?.qth) && last.qth) setQth(last.qth);
|
if (!ue.has('qth') && empty(r?.qth) && last.qth) setQth(last.qth);
|
||||||
if (!ue.has('country') && empty(r?.country) && last.country) setCountry(last.country);
|
if (!ue.has('country') && empty(r?.country) && last.country) setCountry(last.country);
|
||||||
// Grid: a REAL provider grid always wins. Otherwise the last QSO's precise
|
// Grid: the provider (QRZ / HamQTH) leads, but only while it is at least as
|
||||||
// locator beats the coarse cty.dat entity centroid the provider block set — so
|
// PRECISE as what we already worked. It used to lead whenever it answered at
|
||||||
// a French call resolves to its real JNxx, not the country's JN16 centroid.
|
// all, so a 4-character square — which is what a provider returns when the
|
||||||
const adoptLastGrid = !ue.has('grid') && empty(r?.grid) && !!last.grid;
|
// station only published a rough locator, and what the cty.dat entity
|
||||||
|
// centroid gives — overwrote the full 6-character locator confirmed on a
|
||||||
|
// previous contact. Comparing lengths keeps the finer of the two, whichever
|
||||||
|
// side it came from.
|
||||||
|
const provGrid = String(r?.grid ?? '').trim();
|
||||||
|
const lastGrid = String(last.grid ?? '').trim();
|
||||||
|
const adoptLastGrid = !ue.has('grid') && !!lastGrid && lastGrid.length > provGrid.length;
|
||||||
if (adoptLastGrid) setGrid(last.grid);
|
if (adoptLastGrid) setGrid(last.grid);
|
||||||
setDetails((d) => {
|
setDetails((d) => {
|
||||||
// When we adopt the last QSO's locator, take its coordinates too (derive them
|
// When we adopt the last QSO's locator, take its coordinates too (derive them
|
||||||
@@ -3618,6 +3698,8 @@ export default function App() {
|
|||||||
{ type: 'item' as const, label: sendingLog ? t('help.sendLogBusy') : t('help.sendLog'), action: 'help.sendlog', disabled: sendingLog },
|
{ type: 'item' as const, label: sendingLog ? t('help.sendLogBusy') : t('help.sendLog'), action: 'help.sendlog', disabled: sendingLog },
|
||||||
] : []),
|
] : []),
|
||||||
{ type: 'separator' },
|
{ type: 'separator' },
|
||||||
|
{ type: 'item', label: t('logview.title'), action: 'help.log' },
|
||||||
|
{ type: 'separator' },
|
||||||
{ type: 'item', label: t('help.donate'), action: 'help.donate', accent: true },
|
{ type: 'item', label: t('help.donate'), action: 'help.donate', accent: true },
|
||||||
{ type: 'separator' },
|
{ type: 'separator' },
|
||||||
{ type: 'item', label: t('help.about'), action: 'help.about' },
|
{ type: 'item', label: t('help.about'), action: 'help.about' },
|
||||||
@@ -3651,6 +3733,7 @@ export default function App() {
|
|||||||
case 'tools.refreshCty': refreshCtyDat(); break;
|
case 'tools.refreshCty': refreshCtyDat(); break;
|
||||||
case 'tools.downloadRefs': downloadRefs(); break;
|
case 'tools.downloadRefs': downloadRefs(); break;
|
||||||
case 'help.about': setShowAbout(true); checkUpdateNow(); break;
|
case 'help.about': setShowAbout(true); checkUpdateNow(); break;
|
||||||
|
case 'help.log': setShowLogViewer(true); break;
|
||||||
case 'help.whatsnew': GetChangelog().then((e: any) => { if (Array.isArray(e) && e.length) setWhatsNew(e); else showToast(t('whatsnew.none')); }).catch(() => {}); break;
|
case 'help.whatsnew': GetChangelog().then((e: any) => { if (Array.isArray(e) && e.length) setWhatsNew(e); else showToast(t('whatsnew.none')); }).catch(() => {}); break;
|
||||||
case 'help.sendlog': sendLogToDeveloper(); break;
|
case 'help.sendlog': sendLogToDeveloper(); break;
|
||||||
// Opens in the system browser, NOT the app WebView: a payment page must show
|
// Opens in the system browser, NOT the app WebView: a payment page must show
|
||||||
@@ -3732,6 +3815,7 @@ export default function App() {
|
|||||||
if (cwSourceRef.current === 'icom') IcomStopCW().catch(() => {});
|
if (cwSourceRef.current === 'icom') IcomStopCW().catch(() => {});
|
||||||
else if (cwSourceRef.current === 'yaesu') YaesuStopCW().catch(() => {});
|
else if (cwSourceRef.current === 'yaesu') YaesuStopCW().catch(() => {});
|
||||||
else if (cwSourceRef.current === 'flex') FlexStopCW().catch(() => {});
|
else if (cwSourceRef.current === 'flex') FlexStopCW().catch(() => {});
|
||||||
|
else if (cwSourceRef.current === 'kenwood') KenwoodStopCW().catch(() => {});
|
||||||
else WinkeyerStop().catch(() => {});
|
else WinkeyerStop().catch(() => {});
|
||||||
}
|
}
|
||||||
if (!keyerLive || wkEscClearsRef.current) {
|
if (!keyerLive || wkEscClearsRef.current) {
|
||||||
@@ -4059,8 +4143,14 @@ export default function App() {
|
|||||||
const cls = d >= 0 && d < 7 ? 'border-success text-success bg-success/15'
|
const cls = d >= 0 && d < 7 ? 'border-success text-success bg-success/15'
|
||||||
: d < 30 ? 'border-warning text-warning bg-warning/15'
|
: d < 30 ? 'border-warning text-warning bg-warning/15'
|
||||||
: 'border-danger text-danger bg-danger/15';
|
: 'border-danger text-danger bg-danger/15';
|
||||||
|
// ARRL regenerates lotw-user-activity.csv on its own schedule and has been
|
||||||
|
// seen frozen for a week (2026-08-02: newest line 2026-07-27). "Uploaded 7
|
||||||
|
// days ago" then says nothing about the station, so the tooltip names the
|
||||||
|
// day the feed itself was built whenever that day is not recent.
|
||||||
|
const tip = t('lotw.userTip', { date: lotwInfo.last_upload || '?', days: d })
|
||||||
|
+ (lotwInfo.feed_stale && lotwInfo.feed_date ? ' — ' + t('lotw.feedStale', { date: lotwInfo.feed_date }) : '');
|
||||||
return (
|
return (
|
||||||
<div className="shrink-0" title={t('lotw.userTip', { date: lotwInfo.last_upload || '?', days: d })}>
|
<div className="shrink-0" title={tip}>
|
||||||
<span className={cn('inline-flex items-center rounded-md border px-1.5 py-1 text-[9px] font-extrabold tracking-wide leading-none', cls)}>
|
<span className={cn('inline-flex items-center rounded-md border px-1.5 py-1 text-[9px] font-extrabold tracking-wide leading-none', cls)}>
|
||||||
LoTW
|
LoTW
|
||||||
</span>
|
</span>
|
||||||
@@ -5248,6 +5338,9 @@ export default function App() {
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
{/* Live diagnostic log (Help → …). Polls only while open. */}
|
||||||
|
<LogViewer open={showLogViewer} onOpenChange={setShowLogViewer} />
|
||||||
|
|
||||||
{/* What's new — shown once on the first launch after an update. */}
|
{/* What's new — shown once on the first launch after an update. */}
|
||||||
{whatsNew && (
|
{whatsNew && (
|
||||||
<div className="fixed inset-0 z-[200] flex items-center justify-center bg-black/40 backdrop-blur-sm p-4" onClick={() => setWhatsNew(null)}>
|
<div className="fixed inset-0 z-[200] flex items-center justify-center bg-black/40 backdrop-blur-sm p-4" onClick={() => setWhatsNew(null)}>
|
||||||
@@ -5532,6 +5625,9 @@ export default function App() {
|
|||||||
centerLat={gridToLatLon(station.my_grid)?.lat ?? null}
|
centerLat={gridToLatLon(station.my_grid)?.lat ?? null}
|
||||||
centerLon={gridToLatLon(station.my_grid)?.lon ?? null}
|
centerLon={gridToLatLon(station.my_grid)?.lon ?? null}
|
||||||
rotorEnabled={rotatorHeading.enabled && rotatorHeading.ok}
|
rotorEnabled={rotatorHeading.enabled && rotatorHeading.ok}
|
||||||
|
rotors={(rotatorHeading as any).rotors}
|
||||||
|
activeRotor={(rotatorHeading as any).active}
|
||||||
|
onSelectRotor={(i) => { SetActiveRotor(i).then(() => GetRotatorHeading()).then((h: any) => setRotatorHeading(h)).catch((err) => setError(String(err?.message ?? err))); }}
|
||||||
onGoto={(az) => RotatorGoTo(Math.round(az), -1).catch((err) => setError(String(err?.message ?? err)))}
|
onGoto={(az) => RotatorGoTo(Math.round(az), -1).catch((err) => setError(String(err?.message ?? err)))}
|
||||||
onClose={() => { setShowRotor(false); writeUiPref('opslog.showRotor', '0'); }}
|
onClose={() => { setShowRotor(false); writeUiPref('opslog.showRotor', '0'); }}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -189,13 +189,20 @@ function AmpBlock({ amp, flex, showName, t }: {
|
|||||||
const txing = typeof flex?.transmitting === 'boolean'
|
const txing = typeof flex?.transmitting === 'boolean'
|
||||||
? flex.transmitting
|
? flex.transmitting
|
||||||
: fwd ? flexW >= 1 : /TRANSMIT/i.test(pg.state || '');
|
: fwd ? flexW >= 1 : /TRANSMIT/i.test(pg.state || '');
|
||||||
|
// Prefer the radio's VITA meter stream when it is actually flowing (local or
|
||||||
|
// over a VPN) — it is fast and matches SmartSDR. Fall back to the amp's OWN
|
||||||
|
// link only when the radio isn't streaming its meters (a remote link without
|
||||||
|
// the VITA path), so the reading survives but is naturally slower.
|
||||||
const liveW = flexW > 0 ? flexW : (pg.connected ? Number(pg.fwd_w) || 0 : 0);
|
const liveW = flexW > 0 ? flexW : (pg.connected ? Number(pg.fwd_w) || 0 : 0);
|
||||||
const fwdW = hold('fwd', txing ? liveW : 0, txing);
|
const fwdW = hold('fwd', txing ? liveW : 0, txing);
|
||||||
const id = meter(/^ID$|current/i);
|
const id = meter(/^ID$|current/i);
|
||||||
// Live drain current, for the same reason: peak_id latches like peak_w.
|
// Live drain current, same source preference. peak_id latches like peak_w, so
|
||||||
|
// use the instantaneous 'id' and gate it on the radio's transmit flag.
|
||||||
const idA = id ? Number(id.value) : (txing ? Number(pg.id) || undefined : 0);
|
const idA = id ? Number(id.value) : (txing ? Number(pg.id) || undefined : 0);
|
||||||
const temp = meter(/temp/i);
|
const temp = meter(/temp/i);
|
||||||
const tempC = pg.temperature > 0 ? pg.temperature : (temp ? temp.value : undefined);
|
// VITA temp matches SmartSDR (the amp's direct link exposes a different sensor
|
||||||
|
// that can read ~10°C higher); fall back to the direct temp when no VITA.
|
||||||
|
const tempC = temp ? temp.value : (pg.temperature > 0 ? pg.temperature : undefined);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="h-full flex flex-col gap-1.5">
|
<div className="h-full flex flex-col gap-1.5">
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
import { useMemo } from 'react';
|
import { useMemo } from 'react';
|
||||||
import { Star, Radio } from 'lucide-react';
|
import { Star, Radio, Sunrise, Sunset } from 'lucide-react';
|
||||||
import { Badge } from '@/components/ui/badge';
|
import { Badge } from '@/components/ui/badge';
|
||||||
import { cn } from '@/lib/utils';
|
import { cn } from '@/lib/utils';
|
||||||
|
import { sunTimes } from '@/lib/sun';
|
||||||
import type { WorkedBeforeView } from '@/types';
|
import type { WorkedBeforeView } from '@/types';
|
||||||
|
|
||||||
type WorkedBefore = WorkedBeforeView;
|
type WorkedBefore = WorkedBeforeView;
|
||||||
@@ -13,6 +14,10 @@ interface Props {
|
|||||||
currentMode: string;
|
currentMode: string;
|
||||||
bands?: string[]; // operator's configured bands; falls back to DEFAULT_BANDS
|
bands?: string[]; // operator's configured bands; falls back to DEFAULT_BANDS
|
||||||
hasCall?: boolean; // a callsign is being entered — only then highlight the "current entry" cell
|
hasCall?: boolean; // a callsign is being entered — only then highlight the "current entry" cell
|
||||||
|
// DX station coordinates, for its sunrise/sunset. Optional: many spots resolve
|
||||||
|
// to an entity with no position at all, and the block simply does not appear.
|
||||||
|
lat?: number;
|
||||||
|
lon?: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Compact column label for a band tag: keep the classic V/U for 2m/70cm,
|
// Compact column label for a band tag: keep the classic V/U for 2m/70cm,
|
||||||
@@ -84,7 +89,7 @@ function cellTitle(band: string, cls: string, status: string, current: boolean):
|
|||||||
return `${band} ${cls}: ${desc}${current ? ' — current entry' : ''}`;
|
return `${band} ${cls}: ${desc}${current ? ' — current entry' : ''}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function BandSlotGrid({ wb, busy, currentBand, currentMode, bands, hasCall = true }: Props) {
|
export function BandSlotGrid({ wb, busy, currentBand, currentMode, bands, hasCall = true, lat, lon }: Props) {
|
||||||
// Columns from the operator's configured bands (so the matrix shows only the
|
// Columns from the operator's configured bands (so the matrix shows only the
|
||||||
// bands they actually use), falling back to the built-in default set.
|
// bands they actually use), falling back to the built-in default set.
|
||||||
const cols = useMemo(
|
const cols = useMemo(
|
||||||
@@ -151,6 +156,36 @@ export function BandSlotGrid({ wb, busy, currentBand, currentMode, bands, hasCal
|
|||||||
</Badge>
|
</Badge>
|
||||||
) : null;
|
) : null;
|
||||||
|
|
||||||
|
// Sunrise / sunset AT THE DX, in UTC. A glance tells you whether the path is
|
||||||
|
// about to open or close on their side, which is the reason to look at a DX
|
||||||
|
// station's grey line at all. Recomputed only when the position changes.
|
||||||
|
const sun = useMemo(
|
||||||
|
() => (lat == null || lon == null ? null : sunTimes(new Date(), lat, lon)),
|
||||||
|
[lat, lon],
|
||||||
|
);
|
||||||
|
const sunBlock = sun ? (
|
||||||
|
<div className="ml-auto flex items-center gap-3 text-xs shrink-0"
|
||||||
|
title="Sunrise / sunset at the DX station (UTC)">
|
||||||
|
{sun.polarDay ? (
|
||||||
|
<span className="font-semibold text-warning">midnight sun</span>
|
||||||
|
) : sun.polarNight ? (
|
||||||
|
<span className="font-semibold text-info">polar night</span>
|
||||||
|
) : (
|
||||||
|
<>
|
||||||
|
<span className="flex items-center gap-1">
|
||||||
|
<Sunrise className="size-3.5 text-warning" />
|
||||||
|
<span className="font-mono tabular-nums">{sun.rise || '—'}</span>
|
||||||
|
</span>
|
||||||
|
<span className="flex items-center gap-1">
|
||||||
|
<Sunset className="size-3.5 text-info" />
|
||||||
|
<span className="font-mono tabular-nums">{sun.set || '—'}</span>
|
||||||
|
</span>
|
||||||
|
<span className="text-muted-foreground">UTC</span>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
) : null;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<section
|
<section
|
||||||
className={cn(
|
className={cn(
|
||||||
@@ -158,7 +193,7 @@ export function BandSlotGrid({ wb, busy, currentBand, currentMode, bands, hasCal
|
|||||||
newOne && 'bg-gradient-to-br from-warning-muted to-warning-muted rounded-lg',
|
newOne && 'bg-gradient-to-br from-warning-muted to-warning-muted rounded-lg',
|
||||||
)}
|
)}
|
||||||
>
|
>
|
||||||
<div className="flex items-center gap-2 min-w-[220px]">
|
<div className="flex items-center gap-2 min-w-[220px] flex-1">
|
||||||
{newOne ? (
|
{newOne ? (
|
||||||
<>
|
<>
|
||||||
<Badge className="bg-warning text-warning-foreground gap-1 px-3 py-1 text-[11px]">
|
<Badge className="bg-warning text-warning-foreground gap-1 px-3 py-1 text-[11px]">
|
||||||
@@ -207,6 +242,7 @@ export function BandSlotGrid({ wb, busy, currentBand, currentMode, bands, hasCal
|
|||||||
Type a callsign to see entity stats
|
Type a callsign to see entity stats
|
||||||
</span>
|
</span>
|
||||||
)}
|
)}
|
||||||
|
{sunBlock}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="flex flex-col gap-2">
|
<div className="flex flex-col gap-2">
|
||||||
|
|||||||
@@ -215,6 +215,15 @@ export function DetailsPanel({ callsign, prefix, operatorGrid, remoteGrid, qth,
|
|||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}, [operatorGrid, remoteGrid, details.lat, details.lon]);
|
}, [operatorGrid, remoteGrid, details.lat, details.lon]);
|
||||||
|
// Where the DX actually is, for its sunrise/sunset. The locator wins when we
|
||||||
|
// have one — it is what the operator can see and check — and the provider's
|
||||||
|
// raw coordinates cover entities that resolve through cty.dat with no grid.
|
||||||
|
const dxLL = useMemo(() => {
|
||||||
|
const byGrid = gridToLatLon(remoteGrid);
|
||||||
|
if (byGrid) return byGrid;
|
||||||
|
if (details.lat != null && details.lon != null) return { lat: details.lat, lon: details.lon };
|
||||||
|
return null;
|
||||||
|
}, [remoteGrid, details.lat, details.lon]);
|
||||||
const fmtDeg = (n: number) => `${Math.round(n)}°`;
|
const fmtDeg = (n: number) => `${Math.round(n)}°`;
|
||||||
const fmtKm = (n: number) => `${Math.round(n).toLocaleString()} km`;
|
const fmtKm = (n: number) => `${Math.round(n).toLocaleString()} km`;
|
||||||
|
|
||||||
@@ -263,7 +272,8 @@ export function DetailsPanel({ callsign, prefix, operatorGrid, remoteGrid, qth,
|
|||||||
<div className={cn('flex-1 min-h-0', open === 'stats' ? 'overflow-hidden' : 'overflow-y-auto')}>
|
<div className={cn('flex-1 min-h-0', open === 'stats' ? 'overflow-hidden' : 'overflow-y-auto')}>
|
||||||
{open === 'stats' && (
|
{open === 'stats' && (
|
||||||
<div className="px-3 py-2.5">
|
<div className="px-3 py-2.5">
|
||||||
<BandSlotGrid wb={wb} busy={!!wbBusy} currentBand={band} currentMode={mode} bands={bands} hasCall={callsign.trim() !== ''} />
|
<BandSlotGrid wb={wb} busy={!!wbBusy} currentBand={band} currentMode={mode} bands={bands} hasCall={callsign.trim() !== ''}
|
||||||
|
lat={dxLL?.lat} lon={dxLL?.lon} />
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
|||||||
@@ -234,7 +234,14 @@ export function FilterBuilder({ open, initial, onApply, onClose }: Props) {
|
|||||||
<SelectItem key={n} value={n}>
|
<SelectItem key={n} value={n}>
|
||||||
<span className="inline-flex items-center gap-2">
|
<span className="inline-flex items-center gap-2">
|
||||||
{n}
|
{n}
|
||||||
<Trash2 className="size-3 text-muted-foreground hover:text-destructive" onClick={(e) => { e.stopPropagation(); deletePreset(n); }} />
|
{/* Radix SelectItem selects on pointer-up, so an onClick here
|
||||||
|
fires too late — the menu has already loaded the preset and
|
||||||
|
closed. Intercept pointer-down (preventDefault stops Radix
|
||||||
|
claiming it) and delete there instead. */}
|
||||||
|
<Trash2
|
||||||
|
className="size-3 text-muted-foreground hover:text-destructive"
|
||||||
|
onPointerDown={(e) => { e.preventDefault(); e.stopPropagation(); deletePreset(n); }}
|
||||||
|
/>
|
||||||
</span>
|
</span>
|
||||||
</SelectItem>
|
</SelectItem>
|
||||||
))}
|
))}
|
||||||
|
|||||||
@@ -328,7 +328,10 @@ export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number
|
|||||||
// longer and the meters visibly trail the end of a transmission, which reads
|
// longer and the meters visibly trail the end of a transmission, which reads
|
||||||
// as the app lagging rather than as a peak being held.
|
// as the app lagging rather than as a peak being held.
|
||||||
const peak = useRef<Record<string, { v: number; t: number }>>({});
|
const peak = useRef<Record<string, { v: number; t: number }>>({});
|
||||||
const peakHold = (key: string, val: number, windowMs = 1000) => {
|
const peakHold = (key: string, val: number, windowMs = 1000, live = true) => {
|
||||||
|
// live=false throws the held value away at once (e.g. the carrier dropped),
|
||||||
|
// so the meter falls immediately instead of coasting for the window.
|
||||||
|
if (!live) { delete peak.current[key]; return val; }
|
||||||
const now = Date.now();
|
const now = Date.now();
|
||||||
const p = peak.current[key];
|
const p = peak.current[key];
|
||||||
if (!p || val >= p.v || now - p.t > windowMs) { peak.current[key] = { v: val, t: now }; return val; }
|
if (!p || val >= p.v || now - p.t > windowMs) { peak.current[key] = { v: val, t: now }; return val; }
|
||||||
@@ -362,7 +365,7 @@ export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number
|
|||||||
let alive = true;
|
let alive = true;
|
||||||
const tick = async () => { try { const s: any = await GetPGXLStatus(); if (alive) setPg(s || { connected: false }); } catch {} };
|
const tick = async () => { try { const s: any = await GetPGXLStatus(); if (alive) setPg(s || { connected: false }); } catch {} };
|
||||||
tick();
|
tick();
|
||||||
const id = window.setInterval(tick, 2000);
|
const id = window.setInterval(tick, 250); // match the amp's 250 ms poll so the card catches every envelope peak
|
||||||
return () => { alive = false; window.clearInterval(id); };
|
return () => { alive = false; window.clearInterval(id); };
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
@@ -1114,11 +1117,32 @@ export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number
|
|||||||
{/* Amplifier meters (FWD / ID / TEMP) — moved here from the Meters card
|
{/* Amplifier meters (FWD / ID / TEMP) — moved here from the Meters card
|
||||||
and shown compact so they sit with the amp controls. */}
|
and shown compact so they sit with the amp controls. */}
|
||||||
{(() => {
|
{(() => {
|
||||||
|
// Prefer the radio's VITA amp meters when they are flowing (local or
|
||||||
|
// over a VPN) — fast, and the same values SmartSDR shows (incl. the
|
||||||
|
// right temperature sensor). Fall back to the amp's OWN link only when
|
||||||
|
// the radio isn't streaming them (a remote link without VITA).
|
||||||
const meters = st.meters || [];
|
const meters = st.meters || [];
|
||||||
const dbmToW = (d: number) => Math.pow(10, (d - 30) / 10);
|
const dbmToW = (d: number) => Math.pow(10, (d - 30) / 10);
|
||||||
const amp = meters.filter((m) => (m.src || '').toUpperCase().includes('AMP')
|
const amp = meters.filter((m) => (m.src || '').toUpperCase().includes('AMP')
|
||||||
&& !/^(RL|DRV)$/i.test((m.name || '').trim()));
|
&& !/^(RL|DRV)$/i.test((m.name || '').trim()));
|
||||||
if (off || amp.length === 0) return null;
|
if (off || amp.length === 0) {
|
||||||
|
const P = pg as any;
|
||||||
|
if (!P.connected) return null;
|
||||||
|
// Direct-link fallback: a 500 ms poll samples the SSB envelope at
|
||||||
|
// random points, so peak-hold it (live=txing drops it the instant
|
||||||
|
// PTT releases). The LDMOS pair can pull well past 25 A → 50 A scale.
|
||||||
|
const txing = typeof st.transmitting === 'boolean' ? st.transmitting : /TRANSMIT/i.test(P.state || '');
|
||||||
|
const w = txing ? Math.round(Number(P.fwd_w) || 0) : 0;
|
||||||
|
const idA = txing ? Number(P.id) || 0 : 0;
|
||||||
|
const temp = Number(P.temperature) || 0;
|
||||||
|
return (
|
||||||
|
<div className="grid grid-cols-2 sm:grid-cols-3 gap-2 mt-2 pt-2 border-t border-border/50">
|
||||||
|
<MeterBar label={t('ampw.pwr')} value={peakHold('pgw', w, 2500, txing)} unit="W" lo={0} hi={2000} accent="#dc2626" />
|
||||||
|
<MeterBar label={t('ampw.id')} value={peakHold('pgid', idA, 2500, txing)} unit="A" lo={0} hi={50} accent="#16a34a" />
|
||||||
|
<MeterBar label={t('ampw.temp')} value={temp} unit="°C" lo={0} hi={80} accent="#ea580c" />
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
// Power comes from the radio's meter stream and nothing else. The
|
// Power comes from the radio's meter stream and nothing else. The
|
||||||
// amplifier also reports a "peakfwd", and using it was a mistake
|
// amplifier also reports a "peakfwd", and using it was a mistake
|
||||||
// twice over: it is a latched maximum that is never reset, and it
|
// twice over: it is a latched maximum that is never reset, and it
|
||||||
@@ -1133,14 +1157,13 @@ export function FlexPanel({ onCWSpeed, onReportRST }: { onCWSpeed?: (wpm: number
|
|||||||
}
|
}
|
||||||
const acc = /temp|degc|degf/i.test(`${m.unit}${m.name}`) ? '#ea580c' : /volt/i.test(m.unit || '') ? '#2563eb' : '#16a34a';
|
const acc = /temp|degc|degf/i.test(`${m.unit}${m.name}`) ? '#ea580c' : /volt/i.test(m.unit || '') ? '#2563eb' : '#16a34a';
|
||||||
// Drain current (ID): the PGXL reports a full-scale far too small
|
// Drain current (ID): the PGXL reports a full-scale far too small
|
||||||
// for this meter (~3 A), so 1.5 A pinned the bar near half. The
|
// for this meter, so it pinned the bar. Give it a fixed 50 A scale
|
||||||
// value itself is fine — only the bar's range was wrong. Give it a
|
// (the LDMOS pair can pull ~45-50 A near full output), overriding an
|
||||||
// fixed 25 A scale (the PGXL's LDMOS pair tops out around 20 A), and
|
// unusable reported range but keeping a sane one.
|
||||||
// only override an unusable reported range, not a sane one.
|
|
||||||
let lo = m.lo, hi = m.hi;
|
let lo = m.lo, hi = m.hi;
|
||||||
if (/amp/i.test(m.unit || '') || /^ID$|current/i.test(m.name || '')) {
|
if (/amp/i.test(m.unit || '') || /^ID$|current/i.test(m.name || '')) {
|
||||||
lo = 0;
|
lo = 0;
|
||||||
hi = m.hi >= 25 ? m.hi : 25;
|
hi = m.hi >= 50 ? m.hi : 50;
|
||||||
}
|
}
|
||||||
return <MeterBar key={m.id} label={m.name || `AMP ${m.id}`} value={peakHold(`amp${m.id}`, m.value)} unit={m.unit} lo={lo} hi={hi} accent={acc} />;
|
return <MeterBar key={m.id} label={m.name || `AMP ${m.id}`} value={peakHold(`amp${m.id}`, m.value)} unit={m.unit} lo={lo} hi={hi} accent={acc} />;
|
||||||
})}
|
})}
|
||||||
|
|||||||
@@ -0,0 +1,137 @@
|
|||||||
|
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
||||||
|
import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogDescription } from '@/components/ui/dialog';
|
||||||
|
import { Button } from '@/components/ui/button';
|
||||||
|
import { Input } from '@/components/ui/input';
|
||||||
|
import { Checkbox } from '@/components/ui/checkbox';
|
||||||
|
import { useI18n } from '@/lib/i18n';
|
||||||
|
import { TailLogFile, GetLogFilePath } from '../../wailsjs/go/main/App';
|
||||||
|
|
||||||
|
// LogViewer shows the tail of opslog.log and keeps it current while open.
|
||||||
|
//
|
||||||
|
// This exists because diagnosing a problem used to mean asking the operator to
|
||||||
|
// find a file in their data directory, open it in a text editor, and re-open it
|
||||||
|
// after every attempt. Half the round-trips in a bug report were spent on that.
|
||||||
|
//
|
||||||
|
// Three behaviours matter more than they look:
|
||||||
|
// • Auto-scroll is a checkbox the operator owns, AND it releases itself the
|
||||||
|
// moment they scroll up — otherwise the line they are reading is yanked away
|
||||||
|
// a second later, which defeats the one thing this window is for. Scrolling
|
||||||
|
// back to the bottom re-arms it, so following is never a dead end.
|
||||||
|
// • The filter keeps only matching LINES rather than highlighting inside a
|
||||||
|
// 256 KB blob: with "cluster" or "acom" typed in, the window becomes exactly
|
||||||
|
// the subsystem trace you would have grepped for.
|
||||||
|
// • It polls only while open. A closed dialog costs nothing.
|
||||||
|
const TAIL_BYTES = 256 * 1024;
|
||||||
|
const POLL_MS = 1000;
|
||||||
|
|
||||||
|
export function LogViewer({ open, onOpenChange }: { open: boolean; onOpenChange: (v: boolean) => void }) {
|
||||||
|
const { t } = useI18n();
|
||||||
|
const [text, setText] = useState('');
|
||||||
|
const [path, setPath] = useState('');
|
||||||
|
const [query, setQuery] = useState('');
|
||||||
|
const [autoScroll, setAutoScroll] = useState(true);
|
||||||
|
// Shown next to the checkbox so a QUIET log still proves it is being polled —
|
||||||
|
// without it there is no way to tell 'nothing new' from 'window is dead'.
|
||||||
|
const [lastPull, setLastPull] = useState('');
|
||||||
|
const boxRef = useRef<HTMLPreElement>(null);
|
||||||
|
const autoRef = useRef(true);
|
||||||
|
useEffect(() => { autoRef.current = autoScroll; }, [autoScroll]);
|
||||||
|
|
||||||
|
// stick pins the view to the bottom on the NEXT frame. Setting scrollTop
|
||||||
|
// straight away is not enough while the dialog is still animating in: the box
|
||||||
|
// has no height yet, scrollHeight is wrong, and the scroll silently does
|
||||||
|
// nothing — leaving the operator staring at the top of a 256 KB buffer, i.e.
|
||||||
|
// at lines from hours ago, which looks exactly like a frozen window.
|
||||||
|
const stick = useCallback(() => {
|
||||||
|
if (!autoRef.current) return;
|
||||||
|
requestAnimationFrame(() => {
|
||||||
|
const el = boxRef.current;
|
||||||
|
if (el) el.scrollTop = el.scrollHeight;
|
||||||
|
});
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const pull = useCallback(() => {
|
||||||
|
TailLogFile(TAIL_BYTES).then((s: any) => {
|
||||||
|
setText(String(s ?? ''));
|
||||||
|
setLastPull(new Date().toLocaleTimeString());
|
||||||
|
}).catch(() => {});
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!open) return;
|
||||||
|
setAutoScroll(true);
|
||||||
|
autoRef.current = true;
|
||||||
|
GetLogFilePath().then((p: any) => setPath(String(p ?? ''))).catch(() => {});
|
||||||
|
pull();
|
||||||
|
// Re-assert the bottom after the open animation has settled. A quiet log
|
||||||
|
// never changes, so the content-driven scroll below would never fire again
|
||||||
|
// and the first attempt would be the only one.
|
||||||
|
const t1 = window.setTimeout(stick, 120);
|
||||||
|
const t2 = window.setTimeout(stick, 450);
|
||||||
|
const id = window.setInterval(pull, POLL_MS);
|
||||||
|
return () => { window.clearInterval(id); window.clearTimeout(t1); window.clearTimeout(t2); };
|
||||||
|
}, [open, pull, stick]);
|
||||||
|
|
||||||
|
const all = useMemo(() => text.split('\n'), [text]);
|
||||||
|
const shown = useMemo(() => {
|
||||||
|
const q = query.trim().toLowerCase();
|
||||||
|
if (!q) return all;
|
||||||
|
return all.filter((l) => l.toLowerCase().includes(q));
|
||||||
|
}, [all, query]);
|
||||||
|
|
||||||
|
// Stick to the bottom after each refresh, but only while auto-scroll is on.
|
||||||
|
useEffect(() => { if (open) stick(); }, [shown, open, stick]);
|
||||||
|
|
||||||
|
// Scrolling away from the bottom releases auto-scroll; coming back re-arms it.
|
||||||
|
function onScroll() {
|
||||||
|
const el = boxRef.current;
|
||||||
|
if (!el) return;
|
||||||
|
setAutoScroll(el.scrollHeight - el.scrollTop - el.clientHeight < 24);
|
||||||
|
}
|
||||||
|
|
||||||
|
const body = shown.join('\n');
|
||||||
|
return (
|
||||||
|
<Dialog open={open} onOpenChange={onOpenChange}>
|
||||||
|
<DialogContent className="max-w-5xl">
|
||||||
|
<DialogHeader>
|
||||||
|
<DialogTitle>{t('logview.title')}</DialogTitle>
|
||||||
|
<DialogDescription className="font-mono text-[11px] break-all">{path}</DialogDescription>
|
||||||
|
</DialogHeader>
|
||||||
|
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<Input className="h-8 flex-1 font-mono text-xs" value={query} placeholder={t('logview.searchPh')}
|
||||||
|
onChange={(e) => setQuery(e.target.value)} />
|
||||||
|
{query.trim() !== '' && (
|
||||||
|
<span className="text-xs text-muted-foreground tabular-nums whitespace-nowrap">
|
||||||
|
{t('logview.matches', { n: shown.length, total: all.length })}
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<pre ref={boxRef} onScroll={onScroll}
|
||||||
|
className="h-[60vh] overflow-auto rounded-md border border-border bg-muted/30 p-2 text-[11px] leading-snug font-mono whitespace-pre-wrap break-all">
|
||||||
|
{body.trim() === '' ? t('logview.empty') : body}
|
||||||
|
</pre>
|
||||||
|
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<label className="flex items-center gap-2 text-xs cursor-pointer">
|
||||||
|
<Checkbox checked={autoScroll} onCheckedChange={(c) => {
|
||||||
|
const on = !!c;
|
||||||
|
setAutoScroll(on);
|
||||||
|
if (on) { const el = boxRef.current; if (el) el.scrollTop = el.scrollHeight; }
|
||||||
|
}} />
|
||||||
|
{t('logview.autoScroll')}
|
||||||
|
</label>
|
||||||
|
{lastPull && <span className="text-xs text-muted-foreground tabular-nums">{t('logview.updated', { time: lastPull })}</span>}
|
||||||
|
<div className="flex-1" />
|
||||||
|
<Button variant="outline" size="sm" onClick={() => navigator.clipboard?.writeText(body)}>
|
||||||
|
{t('logview.copy')}
|
||||||
|
</Button>
|
||||||
|
<Button variant="outline" size="sm" onClick={() => { setQuery(''); setAutoScroll(true); pull(); }}>
|
||||||
|
{t('logview.toEnd')}
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</DialogContent>
|
||||||
|
</Dialog>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -24,6 +24,9 @@ interface Props {
|
|||||||
centerLat?: number | null; // operator latitude (projection centre)
|
centerLat?: number | null; // operator latitude (projection centre)
|
||||||
centerLon?: number | null; // operator longitude
|
centerLon?: number | null; // operator longitude
|
||||||
rotorEnabled?: boolean;
|
rotorEnabled?: boolean;
|
||||||
|
rotors?: string[]; // logical rotor names; >1 → show a selector
|
||||||
|
activeRotor?: number; // index of the selected rotor (0-based)
|
||||||
|
onSelectRotor?: (i: number) => void; // switch the active rotor
|
||||||
onGoto?: (az: number) => void; // click-to-turn
|
onGoto?: (az: number) => void; // click-to-turn
|
||||||
onClose?: () => void;
|
onClose?: () => void;
|
||||||
}
|
}
|
||||||
@@ -38,7 +41,7 @@ function pt(az: number, radius: number): [number, number] {
|
|||||||
return [C + radius * Math.cos(a), C + radius * Math.sin(a)];
|
return [C + radius * Math.cos(a), C + radius * Math.sin(a)];
|
||||||
}
|
}
|
||||||
|
|
||||||
export function RotorCompass({ bearing, headings, boomHeading, pattern, centerLat, centerLon, rotorEnabled, onGoto, onClose }: Props) {
|
export function RotorCompass({ bearing, headings, boomHeading, pattern, centerLat, centerLon, rotorEnabled, rotors, activeRotor, onSelectRotor, onGoto, onClose }: Props) {
|
||||||
const cardinals = useMemo(
|
const cardinals = useMemo(
|
||||||
() => [ { d: 0, l: 'N' }, { d: 45, l: 'NE' }, { d: 90, l: 'E' }, { d: 135, l: 'SE' },
|
() => [ { d: 0, l: 'N' }, { d: 45, l: 'NE' }, { d: 90, l: 'E' }, { d: 135, l: 'SE' },
|
||||||
{ d: 180, l: 'S' }, { d: 225, l: 'SW' }, { d: 270, l: 'W' }, { d: 315, l: 'NW' } ],
|
{ d: 180, l: 'S' }, { d: 225, l: 'SW' }, { d: 270, l: 'W' }, { d: 315, l: 'NW' } ],
|
||||||
@@ -100,6 +103,31 @@ export function RotorCompass({ bearing, headings, boomHeading, pattern, centerLa
|
|||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{/* Multiple rotors — pick which one the dial shows and turns. */}
|
||||||
|
{rotors && rotors.length > 1 && (
|
||||||
|
<div className="flex flex-wrap gap-1 px-2 pt-1.5">
|
||||||
|
{rotors.map((nm, i) => {
|
||||||
|
const active = (activeRotor ?? 0) === i;
|
||||||
|
const label = nm?.trim() || `Rotor ${i + 1}`;
|
||||||
|
return (
|
||||||
|
<button
|
||||||
|
key={i}
|
||||||
|
onClick={() => onSelectRotor?.(i)}
|
||||||
|
className={cn(
|
||||||
|
'flex-1 min-w-[48px] px-1.5 py-0.5 rounded text-[10px] font-semibold truncate transition-colors',
|
||||||
|
active
|
||||||
|
? 'bg-success text-success-foreground'
|
||||||
|
: 'bg-muted text-muted-foreground hover:bg-muted/70',
|
||||||
|
)}
|
||||||
|
title={label}
|
||||||
|
>
|
||||||
|
{label}
|
||||||
|
</button>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
<div className="flex items-center justify-center p-2 min-h-0">
|
<div className="flex items-center justify-center p-2 min-h-0">
|
||||||
<svg
|
<svg
|
||||||
viewBox={`0 0 ${SIZE} ${SIZE}`}
|
viewBox={`0 0 ${SIZE} ${SIZE}`}
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import {
|
|||||||
GetListsSettings, SaveListsSettings,
|
GetListsSettings, SaveListsSettings,
|
||||||
GetCATSettings, SaveCATSettings, DiscoverFlexRadios,
|
GetCATSettings, SaveCATSettings, DiscoverFlexRadios,
|
||||||
ListProfiles, GetActiveProfile, SaveProfile, DeleteProfile, ActivateProfile, DuplicateProfile,
|
ListProfiles, GetActiveProfile, SaveProfile, DeleteProfile, ActivateProfile, DuplicateProfile,
|
||||||
GetRotatorSettings, SaveRotatorSettings, TestRotator, RotatorPark, RotatorStop,
|
GetRotators, SaveRotators, TestRotatorDevice, RotatorPark, RotatorStop,
|
||||||
GetUltrabeamSettings, SaveUltrabeamSettings, TestUltrabeam,
|
GetUltrabeamSettings, SaveUltrabeamSettings, TestUltrabeam,
|
||||||
GetAntGeniusSettings, SaveAntGeniusSettings,
|
GetAntGeniusSettings, SaveAntGeniusSettings,
|
||||||
GetTunerGeniusSettings, SaveTunerGeniusSettings,
|
GetTunerGeniusSettings, SaveTunerGeniusSettings,
|
||||||
@@ -80,7 +80,7 @@ type StationSettings = StationSettingsForm;
|
|||||||
type ListsSettings = ListsSettingsForm;
|
type ListsSettings = ListsSettingsForm;
|
||||||
type ModePreset = ModePresetForm;
|
type ModePreset = ModePresetForm;
|
||||||
type CATSettings = Omit<mainModels.CATSettings, 'convertValues'>;
|
type CATSettings = Omit<mainModels.CATSettings, 'convertValues'>;
|
||||||
type RotatorSettings = Omit<mainModels.RotatorSettings, 'convertValues'>;
|
type RotatorDevice = Omit<mainModels.RotatorDevice, 'convertValues'>;
|
||||||
type ClusterServer = Omit<clusterModels.ServerConfig, 'convertValues'>;
|
type ClusterServer = Omit<clusterModels.ServerConfig, 'convertValues'>;
|
||||||
type ClusterServerStatus = Omit<clusterModels.ServerStatus, 'convertValues'>;
|
type ClusterServerStatus = Omit<clusterModels.ServerStatus, 'convertValues'>;
|
||||||
type Profile = Omit<profileModels.Profile, 'convertValues'>;
|
type Profile = Omit<profileModels.Profile, 'convertValues'>;
|
||||||
@@ -1140,10 +1140,11 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
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,
|
tci_host: '', tci_port: 40001, tci_spots: false, poll_ms: 250, delay_ms: 0,
|
||||||
digital_default: 'FT8', share_enabled: false, share_port: 4532,
|
digital_default: 'FT8', share_enabled: false, share_port: 4532,
|
||||||
|
ptt_hotkey_enabled: false, ptt_hotkey: '', ptt_hotkey_toggle: false,
|
||||||
});
|
});
|
||||||
const [rotator, setRotator] = useState<RotatorSettings>({
|
// While true, the next key press is captured as the PTT hotkey.
|
||||||
enabled: false, type: 'pst', host: '127.0.0.1', port: 12000, has_elevation: false, rotator_num: 1,
|
const [capturingPtt, setCapturingPtt] = useState(false);
|
||||||
} as any);
|
const [rotors, setRotors] = useState<RotatorDevice[]>([]);
|
||||||
const [rotatorTesting, setRotatorTesting] = useState(false);
|
const [rotatorTesting, setRotatorTesting] = useState(false);
|
||||||
const [rotatorTest, setRotatorTest] = useState<{ ok: boolean; msg: string } | null>(null);
|
const [rotatorTest, setRotatorTest] = useState<{ ok: boolean; msg: string } | null>(null);
|
||||||
|
|
||||||
@@ -1498,7 +1499,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
try {
|
try {
|
||||||
const [l, ls, c, ap, r, b, qd, es] = await Promise.all([
|
const [l, ls, c, ap, r, b, qd, es] = await Promise.all([
|
||||||
GetLookupSettings(), GetListsSettings(), GetCATSettings(), GetActiveProfile(),
|
GetLookupSettings(), GetListsSettings(), GetCATSettings(), GetActiveProfile(),
|
||||||
GetRotatorSettings(), GetBackupSettings(), GetQSLDefaults(), GetExternalServices(),
|
GetRotators(), GetBackupSettings(), GetQSLDefaults(), GetExternalServices(),
|
||||||
]);
|
]);
|
||||||
setLookup(l);
|
setLookup(l);
|
||||||
setActiveProfile(ap as Profile);
|
setActiveProfile(ap as Profile);
|
||||||
@@ -1511,7 +1512,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
await reloadProfiles();
|
await reloadProfiles();
|
||||||
await reloadClusterServers();
|
await reloadClusterServers();
|
||||||
setCatCfg(c);
|
setCatCfg(c);
|
||||||
setRotator(r);
|
setRotors((r ?? []) as any);
|
||||||
try { setUltrabeam(await GetUltrabeamSettings() as any); } catch {}
|
try { setUltrabeam(await GetUltrabeamSettings() as any); } catch {}
|
||||||
try { setAntgenius(await GetAntGeniusSettings() as any); } catch {}
|
try { setAntgenius(await GetAntGeniusSettings() as any); } catch {}
|
||||||
try { setTunergenius(await GetTunerGeniusSettings() as any); } catch {}
|
try { setTunergenius(await GetTunerGeniusSettings() as any); } catch {}
|
||||||
@@ -1552,7 +1553,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
try { setActiveProfile(await GetActiveProfile() as Profile); } catch {}
|
try { setActiveProfile(await GetActiveProfile() as Profile); } catch {}
|
||||||
try { setLookup(await GetLookupSettings() as any); } catch {}
|
try { setLookup(await GetLookupSettings() as any); } catch {}
|
||||||
try { setCatCfg(await GetCATSettings() as any); } catch {}
|
try { setCatCfg(await GetCATSettings() as any); } catch {}
|
||||||
try { setRotator(await GetRotatorSettings() as any); } catch {}
|
try { setRotors(((await GetRotators()) ?? []) as any); } catch {}
|
||||||
try { setUltrabeam(await GetUltrabeamSettings() as any); } catch {}
|
try { setUltrabeam(await GetUltrabeamSettings() as any); } catch {}
|
||||||
try { setAntgenius(await GetAntGeniusSettings() as any); } catch {}
|
try { setAntgenius(await GetAntGeniusSettings() as any); } catch {}
|
||||||
try { setTunergenius(await GetTunerGeniusSettings() as any); } catch {}
|
try { setTunergenius(await GetTunerGeniusSettings() as any); } catch {}
|
||||||
@@ -1744,7 +1745,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
}
|
}
|
||||||
await SaveLookupSettings(lookup as any);
|
await SaveLookupSettings(lookup as any);
|
||||||
await SaveCATSettings(catCfg as any);
|
await SaveCATSettings(catCfg as any);
|
||||||
await SaveRotatorSettings(rotator as any);
|
await SaveRotators(rotors as any);
|
||||||
await SaveUltrabeamSettings(ultrabeam as any);
|
await SaveUltrabeamSettings(ultrabeam as any);
|
||||||
await SaveAntGeniusSettings(antgenius as any);
|
await SaveAntGeniusSettings(antgenius as any);
|
||||||
await SaveTunerGeniusSettings(tunergenius as any);
|
await SaveTunerGeniusSettings(tunergenius as any);
|
||||||
@@ -2811,6 +2812,54 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
{/* PTT hotkey — a keyboard key that keys the rig while OpsLog is focused.
|
||||||
|
Uses the Audio → PTT method (CAT / RTS / DTR), falling back to CAT. */}
|
||||||
|
<div className="border-t border-border/60 pt-3 space-y-2">
|
||||||
|
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
||||||
|
<Checkbox
|
||||||
|
checked={!!(catCfg as any).ptt_hotkey_enabled}
|
||||||
|
onCheckedChange={(c) => setCatCfg((s) => ({ ...s, ptt_hotkey_enabled: !!c } as any))}
|
||||||
|
/>
|
||||||
|
{t('cat.pttKey')}
|
||||||
|
</label>
|
||||||
|
{(catCfg as any).ptt_hotkey_enabled && (
|
||||||
|
<>
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onKeyDown={(e) => {
|
||||||
|
if (!capturingPtt) return;
|
||||||
|
e.preventDefault();
|
||||||
|
if (e.code === 'Escape') { setCapturingPtt(false); return; }
|
||||||
|
setCatCfg((s) => ({ ...s, ptt_hotkey: e.code } as any));
|
||||||
|
setCapturingPtt(false);
|
||||||
|
}}
|
||||||
|
onClick={() => setCapturingPtt(true)}
|
||||||
|
className="min-w-[140px] rounded-md border border-border bg-muted/40 px-3 py-1.5 text-sm font-mono hover:bg-muted focus:outline-none focus:ring-2 focus:ring-primary"
|
||||||
|
>
|
||||||
|
{capturingPtt ? t('cat.pttKeyPress') : ((catCfg as any).ptt_hotkey || t('cat.pttKeyNone'))}
|
||||||
|
</button>
|
||||||
|
{(catCfg as any).ptt_hotkey && !capturingPtt && (
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={() => setCatCfg((s) => ({ ...s, ptt_hotkey: '' } as any))}
|
||||||
|
className="text-xs text-muted-foreground hover:text-foreground"
|
||||||
|
>
|
||||||
|
{t('cat.pttKeyClear')}
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
||||||
|
<Checkbox
|
||||||
|
checked={!!(catCfg as any).ptt_hotkey_toggle}
|
||||||
|
onCheckedChange={(c) => setCatCfg((s) => ({ ...s, ptt_hotkey_toggle: !!c } as any))}
|
||||||
|
/>
|
||||||
|
{t('cat.pttKeyToggle')}
|
||||||
|
</label>
|
||||||
|
<p className="text-[11px] text-muted-foreground">{t('cat.pttKeyHint')}</p>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
{catCfg.backend === 'omnirig' && (
|
{catCfg.backend === 'omnirig' && (
|
||||||
<>
|
<>
|
||||||
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
||||||
@@ -2830,12 +2879,12 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
async function testRotator() {
|
async function testRotator(dev: RotatorDevice, sub = 1) {
|
||||||
setRotatorTesting(true);
|
setRotatorTesting(true);
|
||||||
setRotatorTest(null);
|
setRotatorTest(null);
|
||||||
try {
|
try {
|
||||||
await TestRotator(rotator as any);
|
await TestRotatorDevice(dev as any, sub);
|
||||||
setRotatorTest({ ok: true, msg: (rotator as any).type === 'rotgenius' ? t('rot.testOkRG') : t('cat.rotatorOk') });
|
setRotatorTest({ ok: true, msg: (dev as any).type === 'rotgenius' ? t('rot.testOkRG') : t('cat.rotatorOk') });
|
||||||
} catch (e: any) {
|
} catch (e: any) {
|
||||||
setRotatorTest({ ok: false, msg: String(e?.message ?? e) });
|
setRotatorTest({ ok: false, msg: String(e?.message ?? e) });
|
||||||
} finally {
|
} finally {
|
||||||
@@ -3224,6 +3273,18 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
{/* PowerGenius XL asks for a remote-access code when reached from
|
||||||
|
outside the LAN (banner "V… AUTH"), like the Tuner/Antenna Genius.
|
||||||
|
Blank on the LAN. */}
|
||||||
|
{isPGXL && (
|
||||||
|
<div className="space-y-1 max-w-xs">
|
||||||
|
<Label>{t('amp.password')}</Label>
|
||||||
|
<Input type="password" value={(amp as any).password ?? ''}
|
||||||
|
onChange={(e) => patchAmp(i, { password: e.target.value } as any)}
|
||||||
|
placeholder={t('amp.passwordPh')} className="font-mono" />
|
||||||
|
<p className="text-[11px] text-muted-foreground">{t('amp.passwordHint')}</p>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
{/* Band-follow, for any amp that takes its band from a transceiver
|
{/* Band-follow, for any amp that takes its band from a transceiver
|
||||||
CAT link (ACOM and SPE both do) — never PowerGenius, which is
|
CAT link (ACOM and SPE both do) — never PowerGenius, which is
|
||||||
@@ -3305,26 +3366,46 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
}
|
}
|
||||||
|
|
||||||
function RotatorPanel() {
|
function RotatorPanel() {
|
||||||
const isRG = (rotator as any).type === 'rotgenius';
|
// Rotors are a list, like amplifiers: add with +, remove with the trash icon.
|
||||||
const isARCO = (rotator as any).type === 'arco';
|
// A Rotator Genius with "two rotors" contributes 2 addressable rotors.
|
||||||
|
const patch = (i: number, p: Partial<RotatorDevice>) => setRotors((l) => l.map((d, j) => (j === i ? { ...d, ...p } : d)) as any);
|
||||||
|
const addRotor = () => setRotors((l) => [...l, {
|
||||||
|
id: '', name: '', type: 'pst', host: '127.0.0.1', port: 12000, has_elevation: false,
|
||||||
|
rotator_num: 1, dual: false, motorized: true, name2: '', motorized2: false,
|
||||||
|
transport: 'tcp', com_port: '', baud: 9600,
|
||||||
|
} as any]);
|
||||||
|
const removeRotor = (i: number) => setRotors((l) => l.filter((_, j) => j !== i));
|
||||||
|
const anyPst = rotors.some((d) => ((d as any).type ?? 'pst') === 'pst');
|
||||||
|
// The motorized-antenna choice only matters once more than one rotor exists.
|
||||||
|
const multi = rotors.length > 1 || rotors.some((d) => (d as any).type === 'rotgenius' && (d as any).dual);
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<SectionHeader
|
<SectionHeader title="Rotator" hint={anyPst ? t('rot.hint') : undefined} />
|
||||||
title="Rotator"
|
|
||||||
hint={isRG || isARCO ? undefined : t('rot.hint')}
|
|
||||||
/>
|
|
||||||
<div className="space-y-4 max-w-xl">
|
<div className="space-y-4 max-w-xl">
|
||||||
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
{rotors.length === 0 && <p className="text-sm text-muted-foreground">{t('rot.none')}</p>}
|
||||||
<Checkbox checked={rotator.enabled} onCheckedChange={(c) => setRotator((s) => ({ ...s, enabled: !!c }))} />
|
{rotors.map((d, i) => {
|
||||||
{t('rot.enable')}
|
const dev = d as any;
|
||||||
</label>
|
const isRG = dev.type === 'rotgenius';
|
||||||
|
const isARCO = dev.type === 'arco';
|
||||||
|
const transport = dev.transport ?? 'tcp';
|
||||||
|
return (
|
||||||
|
<div key={dev.id || i} className="rounded-xl border border-border bg-card/40 p-3 space-y-3">
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<Compass className="size-4 text-primary shrink-0" />
|
||||||
|
<Input className="h-8 flex-1" value={dev.name ?? ''} placeholder={`Rotor ${i + 1}`}
|
||||||
|
onChange={(e) => patch(i, { name: e.target.value })} />
|
||||||
|
<Button size="icon" variant="ghost" className="size-8 text-muted-foreground hover:text-destructive"
|
||||||
|
onClick={() => removeRotor(i)} title={t('rot.remove')}>
|
||||||
|
<Trash2 className="size-4" />
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
<div className="grid grid-cols-2 gap-3">
|
<div className="grid grid-cols-2 gap-3">
|
||||||
<div className="space-y-1">
|
<div className="space-y-1">
|
||||||
<Label>{t('rot.type')}</Label>
|
<Label>{t('rot.type')}</Label>
|
||||||
{/* Each backend gets its default port: Rotator Genius 9006, ARCO 4001
|
{/* Each backend gets its default port: Rotator Genius 9006, ARCO 4001
|
||||||
(placeholder — must match the ARCO's LAN menu), PstRotator 12000. */}
|
(placeholder — must match the ARCO's LAN menu), PstRotator 12000. */}
|
||||||
<Select value={(rotator as any).type ?? 'pst'}
|
<Select value={dev.type ?? 'pst'}
|
||||||
onValueChange={(v) => setRotator((s) => ({ ...s, type: v, port: v === 'rotgenius' ? 9006 : v === 'arco' ? 4001 : 12000 } as any))}>
|
onValueChange={(v) => patch(i, { type: v as any, port: v === 'rotgenius' ? 9006 : v === 'arco' ? 4001 : 12000 })}>
|
||||||
<SelectTrigger className="h-9"><SelectValue /></SelectTrigger>
|
<SelectTrigger className="h-9"><SelectValue /></SelectTrigger>
|
||||||
<SelectContent>
|
<SelectContent>
|
||||||
<SelectItem value="pst">PstRotator (UDP)</SelectItem>
|
<SelectItem value="pst">PstRotator (UDP)</SelectItem>
|
||||||
@@ -3333,11 +3414,11 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
</SelectContent>
|
</SelectContent>
|
||||||
</Select>
|
</Select>
|
||||||
</div>
|
</div>
|
||||||
{isRG && (
|
{isRG && !dev.dual && (
|
||||||
<div className="space-y-1">
|
<div className="space-y-1">
|
||||||
<Label>{t('rot.rotatorNum')}</Label>
|
<Label>{t('rot.rotatorNum')}</Label>
|
||||||
<Select value={String((rotator as any).rotator_num ?? 1)}
|
<Select value={String(dev.rotator_num ?? 1)}
|
||||||
onValueChange={(v) => setRotator((s) => ({ ...s, rotator_num: parseInt(v, 10) || 1 } as any))}>
|
onValueChange={(v) => patch(i, { rotator_num: parseInt(v, 10) || 1 })}>
|
||||||
<SelectTrigger className="h-9"><SelectValue /></SelectTrigger>
|
<SelectTrigger className="h-9"><SelectValue /></SelectTrigger>
|
||||||
<SelectContent>
|
<SelectContent>
|
||||||
<SelectItem value="1">1</SelectItem>
|
<SelectItem value="1">1</SelectItem>
|
||||||
@@ -3350,8 +3431,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
{isARCO && (
|
{isARCO && (
|
||||||
<div className="space-y-1">
|
<div className="space-y-1">
|
||||||
<Label>Connection</Label>
|
<Label>Connection</Label>
|
||||||
<Select value={(rotator as any).transport ?? 'tcp'}
|
<Select value={transport} onValueChange={(v) => patch(i, { transport: v as any })}>
|
||||||
onValueChange={(v) => setRotator((s) => ({ ...s, transport: v } as any))}>
|
|
||||||
<SelectTrigger className="h-9"><SelectValue /></SelectTrigger>
|
<SelectTrigger className="h-9"><SelectValue /></SelectTrigger>
|
||||||
<SelectContent>
|
<SelectContent>
|
||||||
<SelectItem value="tcp">Network (LAN)</SelectItem>
|
<SelectItem value="tcp">Network (LAN)</SelectItem>
|
||||||
@@ -3361,12 +3441,18 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
{isARCO && (rotator as any).transport === 'serial' ? (
|
{/* Rotator Genius drives both its ports — one entry = two rotors. */}
|
||||||
|
{isRG && (
|
||||||
|
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
||||||
|
<Checkbox checked={!!dev.dual} onCheckedChange={(c) => patch(i, { dual: !!c })} />
|
||||||
|
{t('rot.rgDual')}
|
||||||
|
</label>
|
||||||
|
)}
|
||||||
|
{isARCO && transport === 'serial' ? (
|
||||||
<div className="space-y-1 max-w-xs">
|
<div className="space-y-1 max-w-xs">
|
||||||
<Label>COM port</Label>
|
<Label>COM port</Label>
|
||||||
<div className="flex items-center gap-2">
|
<div className="flex items-center gap-2">
|
||||||
<Select value={(rotator as any).com_port || '_'}
|
<Select value={dev.com_port || '_'} onValueChange={(v) => patch(i, { com_port: v === '_' ? '' : v })}>
|
||||||
onValueChange={(v) => setRotator((s) => ({ ...s, com_port: v === '_' ? '' : v } as any))}>
|
|
||||||
<SelectTrigger className="h-9 flex-1"><SelectValue placeholder="— COM —" /></SelectTrigger>
|
<SelectTrigger className="h-9 flex-1"><SelectValue placeholder="— COM —" /></SelectTrigger>
|
||||||
<SelectContent>
|
<SelectContent>
|
||||||
{wkPorts.length === 0 && <SelectItem value="_" disabled>No ports found</SelectItem>}
|
{wkPorts.length === 0 && <SelectItem value="_" disabled>No ports found</SelectItem>}
|
||||||
@@ -3376,8 +3462,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
<Button size="sm" variant="outline" className="h-9" onClick={() => ListSerialPorts().then((p) => setWkPorts((p ?? []) as string[])).catch(() => {})}>
|
<Button size="sm" variant="outline" className="h-9" onClick={() => ListSerialPorts().then((p) => setWkPorts((p ?? []) as string[])).catch(() => {})}>
|
||||||
<ArrowDown className="size-3.5 rotate-90" />
|
<ArrowDown className="size-3.5 rotate-90" />
|
||||||
</Button>
|
</Button>
|
||||||
<Select value={String((rotator as any).baud || 9600)}
|
<Select value={String(dev.baud || 9600)} onValueChange={(v) => patch(i, { baud: Number(v) })}>
|
||||||
onValueChange={(v) => setRotator((s) => ({ ...s, baud: Number(v) } as any))}>
|
|
||||||
<SelectTrigger className="h-9 w-28"><SelectValue /></SelectTrigger>
|
<SelectTrigger className="h-9 w-28"><SelectValue /></SelectTrigger>
|
||||||
<SelectContent>
|
<SelectContent>
|
||||||
{[4800, 9600, 19200, 38400, 57600].map((b) => (
|
{[4800, 9600, 19200, 38400, 57600].map((b) => (
|
||||||
@@ -3391,44 +3476,85 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
<div className="grid grid-cols-3 gap-3">
|
<div className="grid grid-cols-3 gap-3">
|
||||||
<div className="space-y-1 col-span-2">
|
<div className="space-y-1 col-span-2">
|
||||||
<Label>Host / IP</Label>
|
<Label>Host / IP</Label>
|
||||||
<Input
|
<Input value={dev.host ?? ''} onChange={(e) => patch(i, { host: e.target.value })}
|
||||||
value={rotator.host ?? ''}
|
placeholder={isRG || isARCO ? '192.168.1.60' : '127.0.0.1'} className="font-mono" />
|
||||||
onChange={(e) => setRotator((s) => ({ ...s, host: e.target.value }))}
|
|
||||||
placeholder={isRG || isARCO ? '192.168.1.60' : '127.0.0.1'}
|
|
||||||
className="font-mono"
|
|
||||||
/>
|
|
||||||
</div>
|
</div>
|
||||||
<div className="space-y-1">
|
<div className="space-y-1">
|
||||||
<Label>{isRG || isARCO ? 'TCP port' : 'UDP port'}</Label>
|
<Label>{isRG || isARCO ? 'TCP port' : 'UDP port'}</Label>
|
||||||
<PortInput
|
<PortInput value={dev.port} onChange={(n) => patch(i, { port: n })}
|
||||||
value={rotator.port}
|
fallback={isRG ? 9006 : isARCO ? 4001 : 12000} className="font-mono" />
|
||||||
onChange={(n) => setRotator((s) => ({ ...s, port: n }))} fallback={isRG ? 9006 : isARCO ? 4001 : 12000}
|
|
||||||
className="font-mono"
|
|
||||||
/>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
{!isRG && !isARCO && (
|
{!isRG && !isARCO && (
|
||||||
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
||||||
<Checkbox checked={rotator.has_elevation} onCheckedChange={(c) => setRotator((s) => ({ ...s, has_elevation: !!c }))} />
|
<Checkbox checked={!!dev.has_elevation} onCheckedChange={(c) => patch(i, { has_elevation: !!c })} />
|
||||||
This rotator supports elevation (VHF / satellite)
|
This rotator supports elevation (VHF / satellite)
|
||||||
</label>
|
</label>
|
||||||
)}
|
)}
|
||||||
{isRG && <p className="text-xs text-muted-foreground">{t('rot.rgHint')}</p>}
|
{isRG && <p className="text-xs text-muted-foreground">{t('rot.rgHint')}</p>}
|
||||||
{isARCO && <p className="text-xs text-muted-foreground">{t('rot.arcoHint')}</p>}
|
{isARCO && <p className="text-xs text-muted-foreground">{t('rot.arcoHint')}</p>}
|
||||||
<div className="flex items-center gap-2 pt-2">
|
{/* Which antenna this rotor carries — only relevant with >1 rotor. */}
|
||||||
<Button variant="outline" size="sm" onClick={testRotator} disabled={rotatorTesting}>
|
{multi && (
|
||||||
{rotatorTesting ? t('hw.sending') : t('hw.testRotator')}
|
<div className="space-y-1 max-w-xs">
|
||||||
|
<Label>{isRG && dev.dual ? t('rot.antenna1') : t('rot.antenna')}</Label>
|
||||||
|
<Select value={dev.motorized ? 'motor' : 'std'} onValueChange={(v) => patch(i, { motorized: v === 'motor' })}>
|
||||||
|
<SelectTrigger className="h-9"><SelectValue /></SelectTrigger>
|
||||||
|
<SelectContent>
|
||||||
|
<SelectItem value="std">{t('rot.antStd')}</SelectItem>
|
||||||
|
<SelectItem value="motor">{t('rot.antMotor')}</SelectItem>
|
||||||
|
</SelectContent>
|
||||||
|
</Select>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
{/* Second logical rotor of a dual Rotator Genius: its own name + antenna. */}
|
||||||
|
{isRG && dev.dual && (
|
||||||
|
<div className="grid grid-cols-2 gap-3">
|
||||||
|
<div className="space-y-1">
|
||||||
|
<Label>{t('rot.name2')}</Label>
|
||||||
|
<Input value={dev.name2 ?? ''} placeholder={`${dev.name || 'Rotor'} 2`}
|
||||||
|
onChange={(e) => patch(i, { name2: e.target.value })} />
|
||||||
|
</div>
|
||||||
|
<div className="space-y-1">
|
||||||
|
<Label>{t('rot.antenna2')}</Label>
|
||||||
|
<Select value={dev.motorized2 ? 'motor' : 'std'} onValueChange={(v) => patch(i, { motorized2: v === 'motor' })}>
|
||||||
|
<SelectTrigger className="h-9"><SelectValue /></SelectTrigger>
|
||||||
|
<SelectContent>
|
||||||
|
<SelectItem value="std">{t('rot.antStd')}</SelectItem>
|
||||||
|
<SelectItem value="motor">{t('rot.antMotor')}</SelectItem>
|
||||||
|
</SelectContent>
|
||||||
|
</Select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<Button variant="outline" size="sm" onClick={() => testRotator(d, 1)} disabled={rotatorTesting}>
|
||||||
|
{rotatorTesting ? t('hw.sending') : (isRG && dev.dual ? t('rot.testRotor1') : t('hw.testRotator'))}
|
||||||
</Button>
|
</Button>
|
||||||
<Button variant="outline" size="sm" onClick={() => RotatorStop().catch((e) => setErr(String(e?.message ?? e)))} disabled={!rotator.enabled}>
|
{isRG && dev.dual && (
|
||||||
|
<Button variant="outline" size="sm" onClick={() => testRotator(d, 2)} disabled={rotatorTesting}>
|
||||||
|
{t('rot.testRotor2')}
|
||||||
|
</Button>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
<Button variant="outline" size="sm" onClick={addRotor}>
|
||||||
|
<Plus className="size-3.5 mr-1" /> {t('rot.add')}
|
||||||
|
</Button>
|
||||||
|
{rotors.length > 0 && (
|
||||||
|
<div className="flex items-center gap-2 pt-2">
|
||||||
|
<Button variant="outline" size="sm" onClick={() => RotatorStop().catch((e) => setErr(String(e?.message ?? e)))}>
|
||||||
Stop
|
Stop
|
||||||
</Button>
|
</Button>
|
||||||
{!isRG && (
|
{anyPst && (
|
||||||
<Button variant="outline" size="sm" onClick={() => RotatorPark().catch((e) => setErr(String(e?.message ?? e)))} disabled={!rotator.enabled}>
|
<Button variant="outline" size="sm" onClick={() => RotatorPark().catch((e) => setErr(String(e?.message ?? e)))}>
|
||||||
Park
|
Park
|
||||||
</Button>
|
</Button>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
)}
|
||||||
{rotatorTest && (
|
{rotatorTest && (
|
||||||
<div className={cn(
|
<div className={cn(
|
||||||
'text-xs rounded-md p-2.5 border',
|
'text-xs rounded-md p-2.5 border',
|
||||||
@@ -3440,8 +3566,9 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
<p className="text-xs text-muted-foreground">
|
<p className="text-xs text-muted-foreground">
|
||||||
From the main entry strip, click the bearing pill to rotate to the short-path azimuth.
|
From the main entry strip, click the bearing pill to rotate the active rotor to the short-path
|
||||||
Shift+click for long-path, Ctrl+click to stop.
|
azimuth. Shift+click for long-path, Ctrl+click to stop. With several rotors, pick the active one
|
||||||
|
on the compass widget.
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</>
|
</>
|
||||||
@@ -3479,6 +3606,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
<SelectItem value="serial">{t('wk.engSerial')}</SelectItem>
|
<SelectItem value="serial">{t('wk.engSerial')}</SelectItem>
|
||||||
<SelectItem value="icom">{t('wk.engIcom')}</SelectItem>
|
<SelectItem value="icom">{t('wk.engIcom')}</SelectItem>
|
||||||
<SelectItem value="yaesu">{t('wk.engYaesu')}</SelectItem>
|
<SelectItem value="yaesu">{t('wk.engYaesu')}</SelectItem>
|
||||||
|
<SelectItem value="kenwood">{t('wk.engKenwood')}</SelectItem>
|
||||||
<SelectItem value="flex">{t('wk.engFlex')}</SelectItem>
|
<SelectItem value="flex">{t('wk.engFlex')}</SelectItem>
|
||||||
<SelectItem value="tci" disabled>{t('wk.engTci')}</SelectItem>
|
<SelectItem value="tci" disabled>{t('wk.engTci')}</SelectItem>
|
||||||
</SelectContent>
|
</SelectContent>
|
||||||
@@ -3525,6 +3653,22 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</>
|
</>
|
||||||
|
) : wk.engine === 'kenwood' ? (
|
||||||
|
<>
|
||||||
|
{(!catCfg.enabled || catCfg.backend !== 'kenwood') && (
|
||||||
|
<p className="text-xs font-medium text-warning -mt-1 flex items-start gap-1.5">
|
||||||
|
<span aria-hidden>⚠</span>
|
||||||
|
<span>{t('wk.catWarnKenwood', { backend: catCfg.enabled ? (catCfg.backend || 'none') : 'disabled' })}</span>
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
<p className="text-xs text-muted-foreground -mt-1">{t('wk.kenwoodHint')}</p>
|
||||||
|
<div className="grid grid-cols-4 gap-3">
|
||||||
|
<div className="space-y-1">
|
||||||
|
<Label>{t('wk.speed')}</Label>
|
||||||
|
<Input type="number" min={4} max={60} value={wk.wpm} onChange={(e) => setWkField({ wpm: num(e.target.value, 25) })} className="font-mono" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
) : wk.engine === 'flex' ? (
|
) : wk.engine === 'flex' ? (
|
||||||
<>
|
<>
|
||||||
{(!catCfg.enabled || catCfg.backend !== 'flex') && (
|
{(!catCfg.enabled || catCfg.backend !== 'flex') && (
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ import { TunerCard } from '@/components/TunerCard';
|
|||||||
import type { TGStatus } from '@/components/TunerGeniusPanel';
|
import type { TGStatus } from '@/components/TunerGeniusPanel';
|
||||||
import {
|
import {
|
||||||
GetStationDevices, SaveStationDevices, GetStationStatus, StationSetRelay,
|
GetStationDevices, SaveStationDevices, GetStationStatus, StationSetRelay,
|
||||||
GetRotatorHeading, RotatorGoTo, RotatorStop,
|
GetRotatorHeading, RotatorGoTo, RotatorStop, SetActiveRotor,
|
||||||
GetUltrabeamStatus, SetUltrabeamDirection, UltrabeamRetract, MotorSetElement, MotorReadElements,
|
GetUltrabeamStatus, SetUltrabeamDirection, UltrabeamRetract, MotorSetElement, MotorReadElements,
|
||||||
ListDenkoviDevices, ListSerialPorts, TestStationDevice,
|
ListDenkoviDevices, ListSerialPorts, TestStationDevice,
|
||||||
GetAmpStatuses, GetFlexState,
|
GetAmpStatuses, GetFlexState,
|
||||||
@@ -47,7 +47,7 @@ function blankDevice(): Device {
|
|||||||
return { id: '', type: 'webswitch', name: '', host: '', user: '', pass: '', labels: Array(5).fill('') };
|
return { id: '', type: 'webswitch', name: '', host: '', user: '', pass: '', labels: Array(5).fill('') };
|
||||||
}
|
}
|
||||||
|
|
||||||
type Heading = { enabled: boolean; ok: boolean; azimuth: number };
|
type Heading = { enabled: boolean; ok: boolean; azimuth: number; rotors?: string[]; active?: number };
|
||||||
|
|
||||||
// RotatorWidget shows the configured rotator (Settings → Rotator) right in the
|
// RotatorWidget shows the configured rotator (Settings → Rotator) right in the
|
||||||
// Station Control tab: a live compass you can click to turn, a heading readout, a
|
// Station Control tab: a live compass you can click to turn, a heading readout, a
|
||||||
@@ -82,6 +82,9 @@ function RotatorWidget({ hd, refetch, centerLat, centerLon, bearing, t }: Rotato
|
|||||||
centerLat={centerLat ?? null}
|
centerLat={centerLat ?? null}
|
||||||
centerLon={centerLon ?? null}
|
centerLon={centerLon ?? null}
|
||||||
rotorEnabled={hd.ok}
|
rotorEnabled={hd.ok}
|
||||||
|
rotors={hd.rotors}
|
||||||
|
activeRotor={hd.active}
|
||||||
|
onSelectRotor={(i) => { SetActiveRotor(i).then(refetch).catch((e) => setErr(String(e?.message ?? e))); }}
|
||||||
onGoto={(az) => turn(az)}
|
onGoto={(az) => turn(az)}
|
||||||
/>
|
/>
|
||||||
<div className="flex-1 min-w-0 space-y-2">
|
<div className="flex-1 min-w-0 space-y-2">
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ interface Props {
|
|||||||
wpm: number;
|
wpm: number;
|
||||||
macros: WKMacro[];
|
macros: WKMacro[];
|
||||||
sent: string; // text echoed back by the keyer as it transmits
|
sent: string; // text echoed back by the keyer as it transmits
|
||||||
source: 'winkeyer' | 'icom' | 'flex' | 'yaesu'; // CW output engine (chosen in Settings → CW Keyer)
|
source: 'winkeyer' | 'icom' | 'flex' | 'yaesu' | 'kenwood'; // CW output engine (chosen in Settings → CW Keyer)
|
||||||
breakIn?: number; // Icom CW break-in: 0=OFF, 1=SEMI, 2=FULL
|
breakIn?: number; // Icom CW break-in: 0=OFF, 1=SEMI, 2=FULL
|
||||||
onSetBreakIn?: (mode: number) => void;
|
onSetBreakIn?: (mode: number) => void;
|
||||||
onSelectPort: (p: string) => void;
|
onSelectPort: (p: string) => void;
|
||||||
@@ -101,16 +101,16 @@ export function WinkeyerPanel({
|
|||||||
<Radio className="size-4 text-primary shrink-0" />
|
<Radio className="size-4 text-primary shrink-0" />
|
||||||
{/* CW output engine (chosen in Settings → CW Keyer). */}
|
{/* CW output engine (chosen in Settings → CW Keyer). */}
|
||||||
<span className="text-xs font-semibold uppercase tracking-wider text-muted-foreground shrink-0">
|
<span className="text-xs font-semibold uppercase tracking-wider text-muted-foreground shrink-0">
|
||||||
{source === 'icom' ? 'Icom CW' : source === 'flex' ? 'Flex CWX' : source === 'yaesu' ? 'Yaesu CW' : 'WinKeyer'}
|
{source === 'icom' ? 'Icom CW' : source === 'flex' ? 'Flex CWX' : source === 'yaesu' ? 'Yaesu CW' : source === 'kenwood' ? 'Kenwood CW' : 'WinKeyer'}
|
||||||
</span>
|
</span>
|
||||||
<span className={cn('size-2 rounded-full', connected ? (status.busy ? 'bg-warning animate-pulse' : 'bg-success') : 'bg-muted-foreground/40')}
|
<span className={cn('size-2 rounded-full', connected ? (status.busy ? 'bg-warning animate-pulse' : 'bg-success') : 'bg-muted-foreground/40')}
|
||||||
title={connected ? (status.busy ? t('wkp.sending') : t('wkp.connectedV', { version: status.version })) : t('wkp.disconnected')} />
|
title={connected ? (status.busy ? t('wkp.sending') : t('wkp.connectedV', { version: status.version })) : t('wkp.disconnected')} />
|
||||||
<div className="flex-1" />
|
<div className="flex-1" />
|
||||||
{source === 'icom' || source === 'flex' || source === 'yaesu' ? (
|
{source === 'icom' || source === 'flex' || source === 'yaesu' || source === 'kenwood' ? (
|
||||||
<span className="text-[11px] font-medium text-muted-foreground">
|
<span className="text-[11px] font-medium text-muted-foreground">
|
||||||
{source === 'flex'
|
{source === 'flex'
|
||||||
? (connected ? t('wkp.cwxReady') : t('wkp.cwxOffline'))
|
? (connected ? t('wkp.cwxReady') : t('wkp.cwxOffline'))
|
||||||
: source === 'yaesu'
|
: source === 'yaesu' || source === 'kenwood'
|
||||||
? (connected ? t('wkp.rigReady') : t('wkp.rigOffline'))
|
? (connected ? t('wkp.rigReady') : t('wkp.rigOffline'))
|
||||||
: (connected ? t('wkp.civReady') : t('wkp.civOffline'))}
|
: (connected ? t('wkp.civReady') : t('wkp.civOffline'))}
|
||||||
</span>
|
</span>
|
||||||
|
|||||||
+12
-12
@@ -24,7 +24,7 @@ const en: Dict = {
|
|||||||
'upd.restartNote': 'OpsLog will restart on the new version.',
|
'upd.restartNote': 'OpsLog will restart on the new version.',
|
||||||
'upd.retry': 'Retry', 'upd.browser': 'Open page', 'upd.checking': 'Checking for updates…', 'upd.upToDate': "You're up to date",
|
'upd.retry': 'Retry', 'upd.browser': 'Open page', 'upd.checking': 'Checking for updates…', 'upd.upToDate': "You're up to date",
|
||||||
'rate.title': 'QSO rate (QSOs/hour) — projected from the last 10 / 60 minutes',
|
'rate.title': 'QSO rate (QSOs/hour) — projected from the last 10 / 60 minutes',
|
||||||
'lotw.userTip': 'LoTW user — last upload {date} ({days} days ago)',
|
'lotw.feedStale': "ARRL's user list itself was last built on {date}, so this figure may be older than the station", 'lotw.userTip': 'LoTW user — last upload {date} ({days} days ago)',
|
||||||
'menu.file': 'File', 'menu.edit': 'Edit', 'menu.view': 'View', 'menu.tools': 'Tools',
|
'menu.file': 'File', 'menu.edit': 'Edit', 'menu.view': 'View', 'menu.tools': 'Tools',
|
||||||
'file.import': 'Import ADIF…', 'file.export': 'Export ADIF…', 'file.exporting': 'Exporting…',
|
'file.import': 'Import ADIF…', 'file.export': 'Export ADIF…', 'file.exporting': 'Exporting…',
|
||||||
'file.exportCabrillo': 'Export Cabrillo…', 'file.deleteAll': 'Delete all QSOs…', 'file.exit': 'Exit',
|
'file.exportCabrillo': 'Export Cabrillo…', 'file.deleteAll': 'Delete all QSOs…', 'file.exit': 'Exit',
|
||||||
@@ -40,7 +40,7 @@ const en: Dict = {
|
|||||||
'cwd.tipOff': 'CW decoder · click to enable (decodes RX audio in CW mode)',
|
'cwd.tipOff': 'CW decoder · click to enable (decodes RX audio in CW mode)',
|
||||||
'tools.net': 'NET Control', 'tools.alerts': 'Alert management…', 'tools.contest': 'Contest mode',
|
'tools.net': 'NET Control', 'tools.alerts': 'Alert management…', 'tools.contest': 'Contest mode',
|
||||||
'alert.tuneHint': 'Click to tune the rig to this spot (freq + mode) and fill the call', 'alert.dismiss': 'Dismiss', 'alert.pending': '{n} recent spot alert(s) — click to view', 'alert.noneShort': 'No recent alerts', 'alert.recent': 'Recent alerts', 'alert.clear': 'Clear',
|
'alert.tuneHint': 'Click to tune the rig to this spot (freq + mode) and fill the call', 'alert.dismiss': 'Dismiss', 'alert.pending': '{n} recent spot alert(s) — click to view', 'alert.noneShort': 'No recent alerts', 'alert.recent': 'Recent alerts', 'alert.clear': 'Clear',
|
||||||
'menu.help': 'Help', 'prof.switchTitle': 'Switch station profile', 'prof.manage': 'Manage profiles…', 'help.about': 'About OpsLog', 'help.donate': '♥ Support OpsLog (donate)', 'tools.duplicates': 'Find duplicates…',
|
'menu.help': 'Help', 'prof.switchTitle': 'Switch station profile', 'prof.manage': 'Manage profiles…', 'logview.title': "Diagnostic log", 'logview.empty': "(log is empty)", 'logview.searchPh': "Filter lines — e.g. cluster, acom, cat", 'logview.matches': "{n} of {total} lines", 'logview.autoScroll': "Follow the end", 'logview.updated': "refreshed {time}", 'logview.copy': "Copy", 'logview.toEnd': "Jump to end", 'help.about': 'About OpsLog', 'help.donate': '♥ Support OpsLog (donate)', 'tools.duplicates': 'Find duplicates…',
|
||||||
'help.sendLog': 'Send log to F4BPO', 'help.sendLogBusy': 'Sending log…',
|
'help.sendLog': 'Send log to F4BPO', 'help.sendLogBusy': 'Sending log…',
|
||||||
'help.sendLogOk': 'Log sent to F4BPO — thanks, 73!', 'help.sendLogFail': 'Could not send log: {err}',
|
'help.sendLogOk': 'Log sent to F4BPO — thanks, 73!', 'help.sendLogFail': 'Could not send log: {err}',
|
||||||
// Duplicates modal
|
// Duplicates modal
|
||||||
@@ -163,7 +163,7 @@ const en: Dict = {
|
|||||||
'wk.escClears': 'ESC clears the callsign too (otherwise ESC only stops transmission)',
|
'wk.escClears': 'ESC clears the callsign too (otherwise ESC only stops transmission)',
|
||||||
'wk.esm': 'ESM — Enter Sends Message (CW)',
|
'wk.esm': 'ESM — Enter Sends Message (CW)',
|
||||||
'wk.esmHint': 'In CW with the keyer on, Enter fires a macro by QSO stage instead of logging: empty callsign → F1 (CQ); callsign entered → F2 (report) and focus jumps to RST; Enter in RST → F3 (TU), which logs if the macro contains <LOGQSO>.',
|
'wk.esmHint': 'In CW with the keyer on, Enter fires a macro by QSO stage instead of logging: empty callsign → F1 (CQ); callsign entered → F2 (report) and focus jumps to RST; Enter in RST → F3 (TU), which logs if the macro contains <LOGQSO>.',
|
||||||
'wk.engWinkeyer': 'WinKeyer (K1EL, serial)', 'wk.engSerial': 'Serial port (DTR=CW / RTS=PTT)', 'wk.engIcom': 'Icom CI-V (rig keyer)', 'wk.engYaesu': 'Yaesu (rig keyer)', 'wk.yaesuHint': 'Keying goes over the CAT link already configured in Settings → CAT — no second COM port. For the FTDX101 / FT-991A / FT-710 family. An FTDX10 does NOT accept it (DAKY included): on that one use the "Serial port (DTR=CW / RTS=PTT)" keyer on its other COM port (the standard one) with PC KEYING on DTR — confirmed working.', 'wk.catWarnYaesu': 'The Yaesu keyer needs the Yaesu CAT backend — CAT is currently {backend}.', 'wk.engFlex': 'FlexRadio (CWX)', 'wk.engTci': 'TCI (coming soon)',
|
'wk.engWinkeyer': 'WinKeyer (K1EL, serial)', 'wk.engSerial': 'Serial port (DTR=CW / RTS=PTT)', 'wk.engIcom': 'Icom CI-V (rig keyer)', 'wk.engYaesu': 'Yaesu (rig keyer)', 'wk.yaesuHint': 'Keying goes over the CAT link already configured in Settings → CAT — no second COM port. For the FTDX101 / FT-991A / FT-710 family. An FTDX10 does NOT accept it (DAKY included): on that one use the "Serial port (DTR=CW / RTS=PTT)" keyer on its other COM port (the standard one) with PC KEYING on DTR — confirmed working.', 'wk.catWarnYaesu': 'The Yaesu keyer needs the Yaesu CAT backend — CAT is currently {backend}.', 'wk.engKenwood': 'Kenwood / Elecraft (rig keyer)', 'wk.kenwoodHint': 'Keying goes over the CAT link already configured in Settings → CAT (the KY command) — no second COM port. Ideal for an Elecraft K3/K4 whose single USB port is the CAT port.', 'wk.catWarnKenwood': 'The Kenwood/Elecraft keyer needs the Kenwood/Elecraft CAT backend — CAT is currently {backend}.', 'wk.engFlex': 'FlexRadio (CWX)', 'wk.engTci': 'TCI (coming soon)',
|
||||||
'wk.icomNote': "Icom CI-V keys CW through the rig's own keyer over the existing CAT connection (command 0x17) — it reuses the CAT COM port set in Settings → CAT, so there's nothing else to wire up here. Put the rig in CW mode. Weight, ratio, sidetone, paddle mode… are configured on the radio; only the speed is set from here (the rig's KEY SPEED).",
|
'wk.icomNote': "Icom CI-V keys CW through the rig's own keyer over the existing CAT connection (command 0x17) — it reuses the CAT COM port set in Settings → CAT, so there's nothing else to wire up here. Put the rig in CW mode. Weight, ratio, sidetone, paddle mode… are configured on the radio; only the speed is set from here (the rig's KEY SPEED).",
|
||||||
'wk.flexNote': "FlexRadio keys CW through the radio's CWX keyer over the existing SmartSDR CAT connection — no WinKeyer or SmartCAT needed. It reuses the connection set in Settings → CAT, so there's nothing else to wire up here. Put a slice in CW mode. Only the speed is set from here; weight, sidetone and break-in are configured on the radio (break-in must be on for CW to actually transmit).",
|
'wk.flexNote': "FlexRadio keys CW through the radio's CWX keyer over the existing SmartSDR CAT connection — no WinKeyer or SmartCAT needed. It reuses the connection set in Settings → CAT, so there's nothing else to wire up here. Put a slice in CW mode. Only the speed is set from here; weight, sidetone and break-in are configured on the radio (break-in must be on for CW to actually transmit).",
|
||||||
'wk.catWarnIcom': 'Your CAT backend is set to {backend}. Icom CI-V CW needs the CAT backend set to Icom and connected — change it under Settings → CAT interface, otherwise sending CW will fail.',
|
'wk.catWarnIcom': 'Your CAT backend is set to {backend}. Icom CI-V CW needs the CAT backend set to Icom and connected — change it under Settings → CAT interface, otherwise sending CW will fail.',
|
||||||
@@ -188,7 +188,7 @@ const en: Dict = {
|
|||||||
'gen.showBeam': 'Show the antenna beam heading on the Main map',
|
'gen.showBeam': 'Show the antenna beam heading on the Main map',
|
||||||
'gen.startEqEnd': 'QSO start time = end time', 'gen.startEqEndHint': '(matches LoTW when you call a while)',
|
'gen.startEqEnd': 'QSO start time = end time', 'gen.startEqEndHint': '(matches LoTW when you call a while)',
|
||||||
'gen.showQsoRate': 'Show QSO rate in the header', 'gen.showQsoRateHint': '(QSOs/hour, projected from the last 10 / 60 min)',
|
'gen.showQsoRate': 'Show QSO rate in the header', 'gen.showQsoRateHint': '(QSOs/hour, projected from the last 10 / 60 min)',
|
||||||
'gen.lookupOnBlur': 'Look up the callsign only after leaving the field', 'gen.lookupOnBlurHint': '(not while typing)', 'amp.hint': 'Configure one or several amplifiers — each panel card has a dropdown to pick which one it shows.', 'amp.none': 'No amplifier configured yet.', 'amp.namePh': 'Name (e.g. SPE left)', 'amp.remove': 'Remove this amplifier', 'amp.add': 'Add amplifier', 'amp.freqOut': 'Send the frequency to the amplifier (band follow)', 'amp.freqPort': 'CAT/AUX COM port', 'amp.freqBroadcast': 'Also send unprompted', 'amp.freqPollOnly': 'No — answer the amplifier only', 'amp.freqEvery': 'Yes, every {ms} ms', 'amp.freqHint': 'OpsLog pretends to be a transceiver on this second port, in Kenwood format: set the amplifier to that command set (set 5 on an ACOM) at the same baud rate, and put it in OPERATE — in standby it acknowledges but does not switch band. An amplifier that POLLS (ACOM) needs nothing more; one that only LISTENS to the CAT line of the radio hears nothing unless you also turn on the unprompted send.',
|
'gen.lookupOnBlur': 'Look up the callsign only after leaving the field', 'gen.lookupOnBlurHint': '(not while typing)', 'amp.hint': 'Configure one or several amplifiers — each panel card has a dropdown to pick which one it shows.', 'amp.none': 'No amplifier configured yet.', 'amp.namePh': 'Name (e.g. SPE left)', 'amp.remove': 'Remove this amplifier', 'amp.add': 'Add amplifier', 'amp.password': 'Remote code', 'amp.passwordPh': 'blank on LAN', 'amp.passwordHint': 'PowerGenius XL only: needed when reaching the amp remotely — it then announces "AUTH" and rejects every command ("Unauthorized") until you log in. Leave blank on the local network.', 'amp.freqOut': 'Send the frequency to the amplifier (band follow)', 'amp.freqPort': 'CAT/AUX COM port', 'amp.freqBroadcast': 'Also send unprompted', 'amp.freqPollOnly': 'No — answer the amplifier only', 'amp.freqEvery': 'Yes, every {ms} ms', 'amp.freqHint': 'OpsLog pretends to be a transceiver on this second port, in Kenwood format: set the amplifier to that command set (set 5 on an ACOM) at the same baud rate, and put it in OPERATE — in standby it acknowledges but does not switch band. An amplifier that POLLS (ACOM) needs nothing more; one that only LISTENS to the CAT line of the radio hears nothing unless you also turn on the unprompted send.',
|
||||||
'gen.groupDigital': 'Group digital modes as one (DXCC-style)', 'gen.groupDigitalHint': '(matrix badges + cluster: FT8/FT4/RTTY… count as a single Digital mode; off = each digital mode is its own slot)',
|
'gen.groupDigital': 'Group digital modes as one (DXCC-style)', 'gen.groupDigitalHint': '(matrix badges + cluster: FT8/FT4/RTTY… count as a single Digital mode; off = each digital mode is its own slot)',
|
||||||
// Password encryption
|
// Password encryption
|
||||||
'gen.pwEnc': 'Password encryption',
|
'gen.pwEnc': 'Password encryption',
|
||||||
@@ -273,11 +273,11 @@ const en: Dict = {
|
|||||||
'cat.hint': "Reads the rig's frequency / band / mode and pushes them into the entry strip in real time. Use OmniRig (free, any rig) or — for FlexRadio — the native SmartSDR API (no OmniRig needed, real-time, no second-click mode bug).",
|
'cat.hint': "Reads the rig's frequency / band / mode and pushes them into the entry strip in real time. Use OmniRig (free, any rig) or — for FlexRadio — the native SmartSDR API (no OmniRig needed, real-time, no second-click mode bug).",
|
||||||
'ag2.hint': 'OpsLog talks to the 4O3A Antenna Genius switch over TCP (GSCP protocol). The port is fixed at 9007, so only the device IP is needed. A docked widget then lets you switch antennas per port (A/B).', 'ag2.password': 'Remote password', 'ag2.passwordPh': 'blank on LAN', 'ag2.passwordHint': 'Only needed when reaching the device remotely — it then announces "AG AUTH" and rejects commands until you log in. Leave blank on the local network.',
|
'ag2.hint': 'OpsLog talks to the 4O3A Antenna Genius switch over TCP (GSCP protocol). The port is fixed at 9007, so only the device IP is needed. A docked widget then lets you switch antennas per port (A/B).', 'ag2.password': 'Remote password', 'ag2.passwordPh': 'blank on LAN', 'ag2.passwordHint': 'Only needed when reaching the device remotely — it then announces "AG AUTH" and rejects commands until you log in. Leave blank on the local network.',
|
||||||
'tg2.hint': 'OpsLog talks to the 4O3A Tuner Genius XL over TCP (port fixed at 9010), so only the device IP is needed. A docked widget then shows SWR and forward power and offers Tune, Bypass and Operate/Standby. Control it directly (not through the radio) so OpsLog uses just one of the box\'s connection slots.', 'tg2.enable': 'Enable Tuner Genius control', 'tg2.portHint': 'The TCP port is fixed at 9010 on the device.', 'tg2.password': 'Remote code', 'tg2.passwordPh': 'blank on LAN', 'tg2.passwordHint': 'Only needed when reaching the device remotely — it then announces "AUTH" and rejects commands until you log in. Leave blank on the local network.',
|
'tg2.hint': 'OpsLog talks to the 4O3A Tuner Genius XL over TCP (port fixed at 9010), so only the device IP is needed. A docked widget then shows SWR and forward power and offers Tune, Bypass and Operate/Standby. Control it directly (not through the radio) so OpsLog uses just one of the box\'s connection slots.', 'tg2.enable': 'Enable Tuner Genius control', 'tg2.portHint': 'The TCP port is fixed at 9010 on the device.', 'tg2.password': 'Remote code', 'tg2.passwordPh': 'blank on LAN', 'tg2.passwordHint': 'Only needed when reaching the device remotely — it then announces "AUTH" and rejects commands until you log in. Leave blank on the local network.',
|
||||||
'rot.enable': 'Enable rotator control', 'rot.testOkRG': 'Connected — the Rotator Genius accepted the command (moving to 0°).', 'rot.type': 'Rotator type', 'rot.rotatorNum': 'Rotator #', 'rot.rgHint': 'Talks directly to a 4O3A Rotator Genius over TCP (default port 9006) — no PstRotator needed. Rotator # selects which of the two rotators to drive.', 'rot.arcoHint': "Talks directly to any controller set to Yaesu GS-232A — no PstRotator needed. microHAM ARCO: set Config → LAN → CONTROL PROTOCOL (or USB CONTROL PROTOCOL) to 'Yaesu GS-232A'; on USB the baud rate does not matter. ERC (Easy Rotor Control, incl. ERC Mini): its emulation MUST be set to GS-232 — an ERC left on Hy-Gain DCU-1 speaks a different command set and will not answer — then pick its COM port and the same baud rate as in the ERC configuration.", 'rot.hint': "OpsLog sends UDP commands to PstRotator. Enable PstRotator's UDP listener (Setup → Communication → UDP) before testing.",
|
'rot.enable': 'Enable rotator control', 'rot.testOkRG': 'Connected — the Rotator Genius accepted the command (moving to 0°).', 'rot.type': 'Rotator type', 'rot.rotatorNum': 'Rotator #', 'rot.dual': 'Two rotors', 'rot.rotor1': 'Rotor 1', 'rot.rotor2': 'Rotor 2', 'rot.name': 'Name', 'rot.antenna': 'Antenna', 'rot.antenna1': 'Rotor 1 antenna', 'rot.antenna2': 'Rotor 2 antenna', 'rot.name1': 'Rotor 1 name', 'rot.name2': 'Rotor 2 name', 'rot.antStd': 'Standard antenna', 'rot.antMotor': 'Motorized (Ultrabeam/SteppIR)', 'rot.add': 'Add rotor', 'rot.remove': 'Remove rotor', 'rot.none': 'No rotor configured. Click “Add rotor” to add one.', 'rot.rgDual': 'This Rotator Genius drives two rotors (adds a second one)', 'rot.testRotor1': 'Test rotor 1', 'rot.testRotor2': 'Test rotor 2', 'rot.dualHint': 'Two independent rotors of any type — for example an ARCO and a Rotator Genius side by side. Configure each below; OpsLog shows a Rotor 1/2 toggle on the compass to pick which one it turns and displays. Set each rotor to "Motorized" so the boom/pattern paths (reverse, bidirectional) show only for the one that carries the Ultrabeam/SteppIR. (For a single Rotator Genius driving two rotors, set both to Rotator Genius with the same host and rotator # 1 and 2.)', 'rot.rgHint': 'Talks directly to a 4O3A Rotator Genius over TCP (default port 9006) — no PstRotator needed. Rotator # selects which of the two rotators to drive.', 'rot.arcoHint': "Talks directly to any controller set to Yaesu GS-232A — no PstRotator needed. microHAM ARCO: set Config → LAN → CONTROL PROTOCOL (or USB CONTROL PROTOCOL) to 'Yaesu GS-232A'; on USB the baud rate does not matter. ERC (Easy Rotor Control, incl. ERC Mini): its emulation MUST be set to GS-232 — an ERC left on Hy-Gain DCU-1 speaks a different command set and will not answer — then pick its COM port and the same baud rate as in the ERC configuration.", 'rot.hint': "OpsLog sends UDP commands to PstRotator. Enable PstRotator's UDP listener (Setup → Communication → UDP) before testing.",
|
||||||
'extsvc.hint': 'Upload logged QSOs to online logbooks. Each service uploads automatically on a new QSO when enabled; timing is per-service (immediate, or a 1–2 min delay so a mis-logged QSO can still be fixed first).',
|
'extsvc.hint': 'Upload logged QSOs to online logbooks. Each service uploads automatically on a new QSO when enabled; timing is per-service (immediate, or a 1–2 min delay so a mis-logged QSO can still be fixed first).',
|
||||||
'hw.motorTxInhibit': 'Inhibit transmission while the antenna is moving', 'hw.motorTxInhibitHint': 'Blocks the FlexRadio from transmitting while the elements move (needs FlexRadio in API mode + this antenna enabled). No effect with other radios.', 'hw.motorAntenna': 'Ultrabeam / Steppir', 'hw.motorEnable': 'Enable antenna control', 'hw.motorType': 'Antenna type', 'hw.motorTransport': 'Connection', 'hw.motorTcp': 'Network (TCP)', 'hw.motorSerial': 'Serial (COM)', 'hw.motorCom': 'Serial port', 'hw.motorBaud': 'Baud', 'hw.steppirHint': 'SteppIR controllers are RS-232 serial (the DATA OUT DB9 port). Serial = a USB↔RS-232 (FTDI) adapter, shown as a COM port. Network = a serial-to-Ethernet bridge (as for the Ultrabeam).', 'hw.steppirRange': 'Tunable range', 'hw.steppirRangeHint': "The SteppIR's frequency coverage. On a band outside this range (e.g. 30 m on a 20 m–6 m SteppIR) OpsLog won't try to tune the antenna and won't inhibit transmission. Default 13–54 MHz (20 m–6 m); widen the low edge (e.g. 6) for a 40 m-equipped SteppIR.", 'hw.ultrabeam': 'Antenna (Ultrabeam)', 'hw.audioVoice': 'Audio devices & voice keyer',
|
'hw.motorTxInhibit': 'Inhibit transmission while the antenna is moving', 'hw.motorTxInhibitHint': 'Blocks the FlexRadio from transmitting while the elements move (needs FlexRadio in API mode + this antenna enabled). No effect with other radios.', 'hw.motorAntenna': 'Ultrabeam / Steppir', 'hw.motorEnable': 'Enable antenna control', 'hw.motorType': 'Antenna type', 'hw.motorTransport': 'Connection', 'hw.motorTcp': 'Network (TCP)', 'hw.motorSerial': 'Serial (COM)', 'hw.motorCom': 'Serial port', 'hw.motorBaud': 'Baud', 'hw.steppirHint': 'SteppIR controllers are RS-232 serial (the DATA OUT DB9 port). Serial = a USB↔RS-232 (FTDI) adapter, shown as a COM port. Network = a serial-to-Ethernet bridge (as for the Ultrabeam).', 'hw.steppirRange': 'Tunable range', 'hw.steppirRangeHint': "The SteppIR's frequency coverage. On a band outside this range (e.g. 30 m on a 20 m–6 m SteppIR) OpsLog won't try to tune the antenna and won't inhibit transmission. Default 13–54 MHz (20 m–6 m); widen the low edge (e.g. 6) for a 40 m-equipped SteppIR.", 'hw.ultrabeam': 'Antenna (Ultrabeam)', 'hw.audioVoice': 'Audio devices & voice keyer',
|
||||||
// CAT panel body
|
// CAT panel body
|
||||||
'cat.enable': 'Enable CAT', 'cat.backend': 'Backend', 'cat.optOmnirig': 'OmniRig', 'cat.optFlex': 'FlexRadio (API)', 'cat.share': 'Share CAT with other programs', 'cat.shareHint': 'A native CAT backend owns the radio serial port, so no other program can reach it. This lets WSJT-X, JTDX, MSHV or Log4OM talk to the rig THROUGH OpsLog: in the other program pick the rig model "Hamlib NET rigctl" and enter 127.0.0.1:4532. Works with every backend, not only the native ones.', 'cat.sharePort': 'Sharing port', 'cat.optXiegu': 'Xiegu (USB)', 'cat.xieguPort': 'Xiegu CAT port', 'cat.xieguBaudHint': 'Must match the radio menu (G90 default: 19200).', 'cat.xieguAddrHint': 'Factory CI-V address of the G90/X6100 family: 0x70.', 'cat.xieguPTTLine': 'How the rig is keyed', 'cat.xieguPTTCiv': 'CI-V command', 'cat.xieguPTTHint': 'A G90 does not transmit on the CI-V command: interfaces like the DE-19 key it on RTS or DTR. Pick the line yours uses \u2014 it is also what lets WSJT-X transmit through the shared CAT link.', 'cat.optYaesu': 'Yaesu (USB)', 'cat.optKenwood': 'Kenwood (USB, network)', 'cat.civTrace': 'Log the CAT protocol', 'cat.civTraceHint': 'Writes every CAT frame to and from the radio into the log \u2014 CI-V as hex, Kenwood as the text it exchanges. For reporting a rig that answers oddly \u2014 a button that does the wrong thing, a frequency that jumps. Session only: it is a diagnostic, and it makes the log large.', 'cat.kenwoodPort': 'Kenwood COM port', 'cat.kenwoodPortHint': 'The rig\u2019s CAT/USB serial port (TS-590, TS-890, TS-990, TS-2000, and Elecraft K3/K4 which speak the same dialect).', 'cat.kenwoodBaudHint': 'Must match MENU on the radio: a TS-590 leaves the factory at 9600, a TS-890 at 115200.', 'cat.kenwoodHost': 'Or over the network (host:port)', 'cat.kenwoodHostHint': 'A serial-over-network bridge \u2014 ser2net, an Ethernet-serial adapter, a Raspberry Pi at the radio. Filled in, it is used INSTEAD of the COM port above. This is not the radio\u2019s own RJ45 socket, which speaks Kenwood\u2019s KNS protocol and is not supported.', 'cat.yaesuPort': 'Yaesu CAT port', 'cat.yaesuPortHint': 'The rig CAT port — on an FTDX10/FTDX101 over USB this is the ENHANCED COM port, not the standard one.', 'cat.yaesuBaudHint': 'Must match the radio menu (FTDX10/FTDX101 default: 38400).', 'cat.lowerLines': 'Lower the DTR and RTS lines on connect', 'cat.lowerLinesHint': 'Windows raises both when the port opens, and some interfaces read either line as PTT — the radio then transmits for as long as OpsLog runs. Tick this only if that happens: other interfaces need RTS raised to transmit at all, and lowering it makes the rig go silent.', 'cat.optIcom': 'Icom (CI-V USB)', 'cat.optIcomNet': 'Icom (CI-V network)', 'cat.optTci': 'TCI', 'flxpw.title': 'FlexRadio \u2014 power per band and mode', 'flxpw.hint': 'TX power applied when the band or mode changes. Leave a box empty to leave the power alone.', 'flxpw.band': 'Band', 'flxb.title': 'FlexRadio \u2014 per-band antennas and power', 'flxb.hint': 'Antennas are applied when the band changes; power when the band or the mode changes. Leave a power box empty to leave it alone.', 'flxb.rxAnt': 'RX antenna', 'flxb.txAnt': 'TX antenna', 'flxb.noRadio': 'No antennas reported yet \u2014 connect the FlexRadio, then reopen this panel.', 'flxpw.phone': 'Phone', 'flxpw.digi': 'Digital', 'flxpw.noBands': 'No bands configured \u2014 add them in Lists \u2192 Bands.', 'flxpw.saved': 'Saved',
|
'cat.enable': 'Enable CAT', 'cat.backend': 'Backend', 'cat.optOmnirig': 'OmniRig', 'cat.optFlex': 'FlexRadio (API)', 'cat.share': 'Share CAT with other programs', 'cat.shareHint': 'A native CAT backend owns the radio serial port, so no other program can reach it. This lets WSJT-X, JTDX, MSHV or Log4OM talk to the rig THROUGH OpsLog: in the other program pick the rig model "Hamlib NET rigctl" and enter 127.0.0.1:4532. Works with every backend, not only the native ones.', 'cat.sharePort': 'Sharing port', 'cat.pttKey': 'Enable PTT hotkey', 'cat.pttKeyPress': 'Press a key…', 'cat.pttKeyNone': 'Click to set a key', 'cat.pttKeyClear': 'Clear', 'cat.pttKeyToggle': 'Toggle mode (press to key, press again to unkey)', 'cat.pttKeyHint': 'While OpsLog is focused, this key keys the transmitter — held down by default (release to stop), or latched in toggle mode. It uses the Audio → PTT method (CAT / RTS / DTR), falling back to CAT keying. Pick a key you never type while logging (e.g. Pause, ScrollLock, or a footswitch mapped to one) — OpsLog swallows it so it never lands in a field.', 'cat.optXiegu': 'Xiegu (USB)', 'cat.xieguPort': 'Xiegu CAT port', 'cat.xieguBaudHint': 'Must match the radio menu (G90 default: 19200).', 'cat.xieguAddrHint': 'Factory CI-V address of the G90/X6100 family: 0x70.', 'cat.xieguPTTLine': 'How the rig is keyed', 'cat.xieguPTTCiv': 'CI-V command', 'cat.xieguPTTHint': 'A G90 does not transmit on the CI-V command: interfaces like the DE-19 key it on RTS or DTR. Pick the line yours uses \u2014 it is also what lets WSJT-X transmit through the shared CAT link.', 'cat.optYaesu': 'Yaesu (USB)', 'cat.optKenwood': 'Kenwood (USB, network)', 'cat.civTrace': 'Log the CAT protocol', 'cat.civTraceHint': 'Writes every CAT frame to and from the radio into the log \u2014 CI-V as hex, Kenwood as the text it exchanges. For reporting a rig that answers oddly \u2014 a button that does the wrong thing, a frequency that jumps. Session only: it is a diagnostic, and it makes the log large.', 'cat.kenwoodPort': 'Kenwood COM port', 'cat.kenwoodPortHint': 'The rig\u2019s CAT/USB serial port (TS-590, TS-890, TS-990, TS-2000, and Elecraft K3/K4 which speak the same dialect).', 'cat.kenwoodBaudHint': 'Must match MENU on the radio: a TS-590 leaves the factory at 9600, a TS-890 at 115200.', 'cat.kenwoodHost': 'Or over the network (host:port)', 'cat.kenwoodHostHint': 'A serial-over-network bridge \u2014 ser2net, an Ethernet-serial adapter, a Raspberry Pi at the radio. Filled in, it is used INSTEAD of the COM port above. This is not the radio\u2019s own RJ45 socket, which speaks Kenwood\u2019s KNS protocol and is not supported.', 'cat.yaesuPort': 'Yaesu CAT port', 'cat.yaesuPortHint': 'The rig CAT port — on an FTDX10/FTDX101 over USB this is the ENHANCED COM port, not the standard one.', 'cat.yaesuBaudHint': 'Must match the radio menu (FTDX10/FTDX101 default: 38400).', 'cat.lowerLines': 'Lower the DTR and RTS lines on connect', 'cat.lowerLinesHint': 'Windows raises both when the port opens, and some interfaces read either line as PTT — the radio then transmits for as long as OpsLog runs. Tick this only if that happens: other interfaces need RTS raised to transmit at all, and lowering it makes the rig go silent.', 'cat.optIcom': 'Icom (CI-V USB)', 'cat.optIcomNet': 'Icom (CI-V network)', 'cat.optTci': 'TCI', 'flxpw.title': 'FlexRadio \u2014 power per band and mode', 'flxpw.hint': 'TX power applied when the band or mode changes. Leave a box empty to leave the power alone.', 'flxpw.band': 'Band', 'flxb.title': 'FlexRadio \u2014 per-band antennas and power', 'flxb.hint': 'Antennas are applied when the band changes; power when the band or the mode changes. Leave a power box empty to leave it alone.', 'flxb.rxAnt': 'RX antenna', 'flxb.txAnt': 'TX antenna', 'flxb.noRadio': 'No antennas reported yet \u2014 connect the FlexRadio, then reopen this panel.', 'flxpw.phone': 'Phone', 'flxpw.digi': 'Digital', 'flxpw.noBands': 'No bands configured \u2014 add them in Lists \u2192 Bands.', 'flxpw.saved': 'Saved',
|
||||||
'cat.icomNetHost': 'Rig IP / hostname', 'cat.icomNetUser': 'Network user (ID)', 'cat.icomNetPass': 'Network password',
|
'cat.icomNetHost': 'Rig IP / hostname', 'cat.icomNetUser': 'Network user (ID)', 'cat.icomNetPass': 'Network password',
|
||||||
'cat.icomNetHint': "Connects to the rig's built-in LAN server directly — no RS-BA1 or Remote Utility needed (close them first). Use the Network User1 ID/Password set in the rig's Network menu. A rig in standby is powered on automatically.",
|
'cat.icomNetHint': "Connects to the rig's built-in LAN server directly — no RS-BA1 or Remote Utility needed (close them first). Use the Network User1 ID/Password set in the rig's Network menu. A rig in standby is powered on automatically.",
|
||||||
'cat.icomNetAudio': 'Stream RX audio over the network (experimental)',
|
'cat.icomNetAudio': 'Stream RX audio over the network (experimental)',
|
||||||
@@ -445,7 +445,7 @@ const fr: Dict = {
|
|||||||
'live.offlineTip': 'Hors ligne — aucun QSO loggé depuis 5 minutes',
|
'live.offlineTip': 'Hors ligne — aucun QSO loggé depuis 5 minutes',
|
||||||
'live.stationsTitle': 'Stations on air', 'live.stationsEmpty': 'Aucune station ne reporte pour le moment.', 'live.stationsHide': 'Masquer',
|
'live.stationsTitle': 'Stations on air', 'live.stationsEmpty': 'Aucune station ne reporte pour le moment.', 'live.stationsHide': 'Masquer',
|
||||||
'rate.title': 'Rythme QSO (QSO/heure) — projeté sur les 10 / 60 dernières minutes',
|
'rate.title': 'Rythme QSO (QSO/heure) — projeté sur les 10 / 60 dernières minutes',
|
||||||
'lotw.userTip': 'Utilisateur LoTW — dernier upload {date} (il y a {days} j)',
|
'lotw.feedStale': "la liste ARRL elle-même date du {date}, ce chiffre peut donc être plus vieux que la station", 'lotw.userTip': 'Utilisateur LoTW — dernier upload {date} (il y a {days} j)',
|
||||||
'menu.file': 'Fichier', 'menu.edit': 'Édition', 'menu.view': 'Affichage', 'menu.tools': 'Outils',
|
'menu.file': 'Fichier', 'menu.edit': 'Édition', 'menu.view': 'Affichage', 'menu.tools': 'Outils',
|
||||||
'file.import': 'Importer ADIF…', 'file.export': 'Exporter ADIF…', 'file.exporting': 'Export…',
|
'file.import': 'Importer ADIF…', 'file.export': 'Exporter ADIF…', 'file.exporting': 'Export…',
|
||||||
'file.exportCabrillo': 'Exporter Cabrillo…', 'file.deleteAll': 'Supprimer tous les QSO…', 'file.exit': 'Quitter',
|
'file.exportCabrillo': 'Exporter Cabrillo…', 'file.deleteAll': 'Supprimer tous les QSO…', 'file.exit': 'Quitter',
|
||||||
@@ -461,7 +461,7 @@ const fr: Dict = {
|
|||||||
'cwd.tipOff': 'Décodeur CW · clic pour activer (décode l’audio RX en mode CW)',
|
'cwd.tipOff': 'Décodeur CW · clic pour activer (décode l’audio RX en mode CW)',
|
||||||
'tools.net': 'Contrôle de NET', 'tools.alerts': 'Gestion des alertes…', 'tools.contest': 'Mode contest',
|
'tools.net': 'Contrôle de NET', 'tools.alerts': 'Gestion des alertes…', 'tools.contest': 'Mode contest',
|
||||||
'alert.tuneHint': 'Cliquer pour accorder la radio sur ce spot (fréq + mode) et remplir l\'indicatif', 'alert.dismiss': 'Fermer', 'alert.pending': '{n} alerte(s) de spot récente(s) — cliquer pour voir', 'alert.noneShort': 'Aucune alerte récente', 'alert.recent': 'Alertes récentes', 'alert.clear': 'Effacer',
|
'alert.tuneHint': 'Cliquer pour accorder la radio sur ce spot (fréq + mode) et remplir l\'indicatif', 'alert.dismiss': 'Fermer', 'alert.pending': '{n} alerte(s) de spot récente(s) — cliquer pour voir', 'alert.noneShort': 'Aucune alerte récente', 'alert.recent': 'Alertes récentes', 'alert.clear': 'Effacer',
|
||||||
'menu.help': 'Aide', 'prof.switchTitle': 'Changer de profil de station', 'prof.manage': 'Gérer les profils…', 'help.about': 'À propos d\'OpsLog', 'help.donate': '♥ Soutenir OpsLog (don)', 'tools.duplicates': 'Trouver les doublons…',
|
'menu.help': 'Aide', 'prof.switchTitle': 'Changer de profil de station', 'prof.manage': 'Gérer les profils…', 'logview.title': "Journal de diagnostic", 'logview.empty': "(journal vide)", 'logview.searchPh': "Filtrer les lignes — ex. cluster, acom, cat", 'logview.matches': "{n} lignes sur {total}", 'logview.autoScroll': "Suivre la fin", 'logview.updated': "actualisé {time}", 'logview.copy': "Copier", 'logview.toEnd': "Aller à la fin", 'help.about': 'À propos d\'OpsLog', 'help.donate': '♥ Soutenir OpsLog (don)', 'tools.duplicates': 'Trouver les doublons…',
|
||||||
'help.sendLog': 'Envoyer le journal à F4BPO', 'help.sendLogBusy': 'Envoi du journal…',
|
'help.sendLog': 'Envoyer le journal à F4BPO', 'help.sendLogBusy': 'Envoi du journal…',
|
||||||
'help.sendLogOk': 'Journal envoyé à F4BPO — merci, 73 !', 'help.sendLogFail': 'Échec de l\'envoi du journal : {err}',
|
'help.sendLogOk': 'Journal envoyé à F4BPO — merci, 73 !', 'help.sendLogFail': 'Échec de l\'envoi du journal : {err}',
|
||||||
'dup.title': 'Trouver les doublons', 'dup.scanning': 'Analyse du journal…', 'dup.none': 'Aucun doublon trouvé. 🎉',
|
'dup.title': 'Trouver les doublons', 'dup.scanning': 'Analyse du journal…', 'dup.none': 'Aucun doublon trouvé. 🎉',
|
||||||
@@ -580,7 +580,7 @@ const fr: Dict = {
|
|||||||
'wk.escClears': "ÉCHAP efface aussi l'indicatif (sinon ÉCHAP arrête seulement la transmission)",
|
'wk.escClears': "ÉCHAP efface aussi l'indicatif (sinon ÉCHAP arrête seulement la transmission)",
|
||||||
'wk.esm': 'ESM — Entrée envoie le message (CW)',
|
'wk.esm': 'ESM — Entrée envoie le message (CW)',
|
||||||
'wk.esmHint': "En CW avec le keyer actif, Entrée envoie un macro selon l'étape du QSO au lieu de loguer : indicatif vide → F1 (CQ) ; indicatif saisi → F2 (report) et le focus passe au RST ; Entrée dans le RST → F3 (TU), qui logue si le macro contient <LOGQSO>.",
|
'wk.esmHint': "En CW avec le keyer actif, Entrée envoie un macro selon l'étape du QSO au lieu de loguer : indicatif vide → F1 (CQ) ; indicatif saisi → F2 (report) et le focus passe au RST ; Entrée dans le RST → F3 (TU), qui logue si le macro contient <LOGQSO>.",
|
||||||
'wk.engWinkeyer': 'WinKeyer (K1EL, série)', 'wk.engSerial': 'Port série (DTR=CW / RTS=PTT)', 'wk.engIcom': 'Icom CI-V (keyer de la radio)', 'wk.engYaesu': 'Yaesu (keyer de la radio)', 'wk.yaesuHint': "La manipulation passe par la liaison CAT déjà configurée dans Réglages → CAT — sans second port COM. Pour la famille FTDX101 / FT-991A / FT-710. Un FTDX10 ne l'accepte PAS (DAKY compris) : sur celui-ci, utilisez le keyer « Port série (DTR=CW / RTS=PTT) » sur son autre port COM (le standard) avec PC KEYING sur DTR — confirmé fonctionnel.", 'wk.catWarnYaesu': 'Le keyer Yaesu nécessite le backend CAT Yaesu — le CAT est actuellement : {backend}.', 'wk.engFlex': 'FlexRadio (CWX)', 'wk.engTci': 'TCI (bientôt)',
|
'wk.engWinkeyer': 'WinKeyer (K1EL, série)', 'wk.engSerial': 'Port série (DTR=CW / RTS=PTT)', 'wk.engIcom': 'Icom CI-V (keyer de la radio)', 'wk.engYaesu': 'Yaesu (keyer de la radio)', 'wk.yaesuHint': "La manipulation passe par la liaison CAT déjà configurée dans Réglages → CAT — sans second port COM. Pour la famille FTDX101 / FT-991A / FT-710. Un FTDX10 ne l'accepte PAS (DAKY compris) : sur celui-ci, utilisez le keyer « Port série (DTR=CW / RTS=PTT) » sur son autre port COM (le standard) avec PC KEYING sur DTR — confirmé fonctionnel.", 'wk.catWarnYaesu': 'Le keyer Yaesu nécessite le backend CAT Yaesu — le CAT est actuellement : {backend}.', 'wk.engKenwood': 'Kenwood / Elecraft (keyer de la radio)', 'wk.kenwoodHint': "La manipulation passe par la liaison CAT déjà configurée dans Réglages → CAT (la commande KY) — sans second port COM. Idéal pour un Elecraft K3/K4 dont l'unique port USB est le port CAT.", 'wk.catWarnKenwood': 'Le keyer Kenwood/Elecraft nécessite le backend CAT Kenwood/Elecraft — le CAT est actuellement : {backend}.', 'wk.engFlex': 'FlexRadio (CWX)', 'wk.engTci': 'TCI (bientôt)',
|
||||||
'wk.icomNote': "L'Icom CI-V manipule la CW via le keyer interne de la radio sur la connexion CAT existante (commande 0x17) — il réutilise le port COM CAT défini dans Réglages → CAT, rien d'autre à câbler ici. Mets la radio en mode CW. Poids, ratio, sidetone, mode paddle… se règlent sur la radio ; seule la vitesse est définie ici (KEY SPEED de la radio).",
|
'wk.icomNote': "L'Icom CI-V manipule la CW via le keyer interne de la radio sur la connexion CAT existante (commande 0x17) — il réutilise le port COM CAT défini dans Réglages → CAT, rien d'autre à câbler ici. Mets la radio en mode CW. Poids, ratio, sidetone, mode paddle… se règlent sur la radio ; seule la vitesse est définie ici (KEY SPEED de la radio).",
|
||||||
'wk.flexNote': "FlexRadio manipule la CW via le keyer CWX de la radio sur la connexion SmartSDR CAT existante — pas besoin de WinKeyer ni de SmartCAT. Il réutilise la connexion définie dans Réglages → CAT, rien d'autre à câbler ici. Mets une slice en mode CW. Seule la vitesse est définie ici ; poids, sidetone et break-in se règlent sur la radio (le break-in doit être activé pour que la CW parte vraiment).",
|
'wk.flexNote': "FlexRadio manipule la CW via le keyer CWX de la radio sur la connexion SmartSDR CAT existante — pas besoin de WinKeyer ni de SmartCAT. Il réutilise la connexion définie dans Réglages → CAT, rien d'autre à câbler ici. Mets une slice en mode CW. Seule la vitesse est définie ici ; poids, sidetone et break-in se règlent sur la radio (le break-in doit être activé pour que la CW parte vraiment).",
|
||||||
'wk.catWarnIcom': "Ton backend CAT est réglé sur {backend}. La CW Icom CI-V nécessite le backend CAT réglé sur Icom et connecté — change-le dans Réglages → Interface CAT, sinon l'envoi CW échouera.",
|
'wk.catWarnIcom': "Ton backend CAT est réglé sur {backend}. La CW Icom CI-V nécessite le backend CAT réglé sur Icom et connecté — change-le dans Réglages → Interface CAT, sinon l'envoi CW échouera.",
|
||||||
@@ -604,7 +604,7 @@ const fr: Dict = {
|
|||||||
'gen.showBeam': 'Afficher le cap de l\'antenne sur la carte principale',
|
'gen.showBeam': 'Afficher le cap de l\'antenne sur la carte principale',
|
||||||
'gen.startEqEnd': 'Heure de début du QSO = heure de fin', 'gen.startEqEndHint': '(correspond à LoTW quand tu appelles un moment)',
|
'gen.startEqEnd': 'Heure de début du QSO = heure de fin', 'gen.startEqEndHint': '(correspond à LoTW quand tu appelles un moment)',
|
||||||
'gen.showQsoRate': 'Afficher le rythme QSO dans la barre du haut', 'gen.showQsoRateHint': '(QSO/heure, projeté sur les 10 / 60 dernières min)',
|
'gen.showQsoRate': 'Afficher le rythme QSO dans la barre du haut', 'gen.showQsoRateHint': '(QSO/heure, projeté sur les 10 / 60 dernières min)',
|
||||||
'gen.lookupOnBlur': 'Rechercher l\'indicatif seulement après avoir quitté le champ', 'gen.lookupOnBlurHint': '(pas pendant la saisie)', 'amp.hint': 'Configurez un ou plusieurs amplificateurs — chaque carte de panneau a une liste déroulante pour choisir lequel afficher.', 'amp.none': 'Aucun amplificateur configuré.', 'amp.namePh': 'Nom (p. ex. SPE gauche)', 'amp.remove': 'Supprimer cet amplificateur', 'amp.add': 'Ajouter un amplificateur', 'amp.freqOut': "Envoyer la fréquence à l'amplificateur (suivi de bande)", 'amp.freqPort': 'Port COM CAT/AUX', 'amp.freqBroadcast': 'Envoyer aussi sans être interrogé', 'amp.freqPollOnly': "Non — répondre seulement à l'amplificateur", 'amp.freqEvery': 'Oui, toutes les {ms} ms', 'amp.freqHint': "OpsLog se fait passer pour un transceiver sur ce second port, au format Kenwood : réglez l'amplificateur sur ce jeu de commandes (le jeu 5 sur un ACOM) à la même vitesse, et mettez-le en OPERATE — en veille il acquitte mais ne change pas de bande. Un amplificateur qui INTERROGE (ACOM) n'a besoin de rien de plus ; un amplificateur qui se contente d'ÉCOUTER la liaison CAT de la radio n'entendra rien tant que l'envoi spontané n'est pas activé.",
|
'gen.lookupOnBlur': 'Rechercher l\'indicatif seulement après avoir quitté le champ', 'gen.lookupOnBlurHint': '(pas pendant la saisie)', 'amp.hint': 'Configurez un ou plusieurs amplificateurs — chaque carte de panneau a une liste déroulante pour choisir lequel afficher.', 'amp.none': 'Aucun amplificateur configuré.', 'amp.namePh': 'Nom (p. ex. SPE gauche)', 'amp.remove': 'Supprimer cet amplificateur', 'amp.add': 'Ajouter un amplificateur', 'amp.password': 'Code distant', 'amp.passwordPh': 'vide en LAN', 'amp.passwordHint': "PowerGenius XL uniquement : nécessaire pour joindre l'ampli à distance — il annonce alors « AUTH » et refuse toute commande (« Unauthorized ») tant qu'on n'est pas identifié. Laisse vide sur le réseau local.", 'amp.freqOut': "Envoyer la fréquence à l'amplificateur (suivi de bande)", 'amp.freqPort': 'Port COM CAT/AUX', 'amp.freqBroadcast': 'Envoyer aussi sans être interrogé', 'amp.freqPollOnly': "Non — répondre seulement à l'amplificateur", 'amp.freqEvery': 'Oui, toutes les {ms} ms', 'amp.freqHint': "OpsLog se fait passer pour un transceiver sur ce second port, au format Kenwood : réglez l'amplificateur sur ce jeu de commandes (le jeu 5 sur un ACOM) à la même vitesse, et mettez-le en OPERATE — en veille il acquitte mais ne change pas de bande. Un amplificateur qui INTERROGE (ACOM) n'a besoin de rien de plus ; un amplificateur qui se contente d'ÉCOUTER la liaison CAT de la radio n'entendra rien tant que l'envoi spontané n'est pas activé.",
|
||||||
'gen.groupDigital': 'Regrouper les modes digitaux en un seul (style DXCC)', 'gen.groupDigitalHint': '(badges de la matrice + cluster : FT8/FT4/RTTY… comptent comme un seul mode Digital ; décoché = chaque mode digital est un slot distinct)',
|
'gen.groupDigital': 'Regrouper les modes digitaux en un seul (style DXCC)', 'gen.groupDigitalHint': '(badges de la matrice + cluster : FT8/FT4/RTTY… comptent comme un seul mode Digital ; décoché = chaque mode digital est un slot distinct)',
|
||||||
// Chiffrement des mots de passe
|
// Chiffrement des mots de passe
|
||||||
'gen.pwEnc': 'Chiffrement des mots de passe',
|
'gen.pwEnc': 'Chiffrement des mots de passe',
|
||||||
@@ -681,10 +681,10 @@ const fr: Dict = {
|
|||||||
'cat.hint': "Lit la fréquence / bande / mode du poste et les injecte dans le bandeau de saisie en temps réel. Utilise OmniRig (gratuit, tout poste) ou — pour FlexRadio — l'API native SmartSDR (sans OmniRig, temps réel, sans le bug du mode au 2ᵉ clic).",
|
'cat.hint': "Lit la fréquence / bande / mode du poste et les injecte dans le bandeau de saisie en temps réel. Utilise OmniRig (gratuit, tout poste) ou — pour FlexRadio — l'API native SmartSDR (sans OmniRig, temps réel, sans le bug du mode au 2ᵉ clic).",
|
||||||
'ag2.hint': "OpsLog dialogue avec le switch 4O3A Antenna Genius en TCP (protocole GSCP). Le port est fixé à 9007, seule l'IP de l'appareil est nécessaire. Un widget ancré permet ensuite de commuter les antennes par port (A/B).", 'ag2.password': 'Mot de passe distant', 'ag2.passwordPh': 'vide en LAN', 'ag2.passwordHint': "Nécessaire seulement à distance — l'appareil annonce alors « AG AUTH » et refuse les commandes tant qu'on n'est pas identifié. Laisse vide sur le réseau local.",
|
'ag2.hint': "OpsLog dialogue avec le switch 4O3A Antenna Genius en TCP (protocole GSCP). Le port est fixé à 9007, seule l'IP de l'appareil est nécessaire. Un widget ancré permet ensuite de commuter les antennes par port (A/B).", 'ag2.password': 'Mot de passe distant', 'ag2.passwordPh': 'vide en LAN', 'ag2.passwordHint': "Nécessaire seulement à distance — l'appareil annonce alors « AG AUTH » et refuse les commandes tant qu'on n'est pas identifié. Laisse vide sur le réseau local.",
|
||||||
'tg2.hint': "OpsLog dialogue avec le 4O3A Tuner Genius XL en TCP (port fixé à 9010), seule l'IP de l'appareil est nécessaire. Un widget ancré affiche le ROS et la puissance directe et propose Accord, Bypass et Operate/Standby. Pilotage direct (pas via la radio) pour n'utiliser qu'une des connexions de la boîte.", 'tg2.enable': "Activer le contrôle du Tuner Genius", 'tg2.portHint': "Le port TCP est fixé à 9010 sur l'appareil.", 'tg2.password': 'Code distant', 'tg2.passwordPh': 'vide en LAN', 'tg2.passwordHint': "Nécessaire seulement à distance — l'appareil annonce alors « AUTH » et refuse les commandes tant qu'on n'est pas identifié. Laisse vide sur le réseau local.",
|
'tg2.hint': "OpsLog dialogue avec le 4O3A Tuner Genius XL en TCP (port fixé à 9010), seule l'IP de l'appareil est nécessaire. Un widget ancré affiche le ROS et la puissance directe et propose Accord, Bypass et Operate/Standby. Pilotage direct (pas via la radio) pour n'utiliser qu'une des connexions de la boîte.", 'tg2.enable': "Activer le contrôle du Tuner Genius", 'tg2.portHint': "Le port TCP est fixé à 9010 sur l'appareil.", 'tg2.password': 'Code distant', 'tg2.passwordPh': 'vide en LAN', 'tg2.passwordHint': "Nécessaire seulement à distance — l'appareil annonce alors « AUTH » et refuse les commandes tant qu'on n'est pas identifié. Laisse vide sur le réseau local.",
|
||||||
'rot.enable': 'Activer le contrôle du rotator', 'rot.testOkRG': 'Connecté — le Rotator Genius a accepté la commande (rotation vers 0°).', 'rot.type': 'Type de rotator', 'rot.rotatorNum': 'Rotator n°', 'rot.rgHint': 'Parle directement à un Rotator Genius 4O3A en TCP (port 9006 par défaut) — sans PstRotator. Le n° choisit lequel des deux rotators du boîtier piloter.', 'rot.arcoHint': "Parle directement à tout contrôleur réglé sur Yaesu GS-232A — sans PstRotator. microHAM ARCO : régler Config → LAN → CONTROL PROTOCOL (ou USB CONTROL PROTOCOL) sur « Yaesu GS-232A » ; en USB la vitesse est sans importance. ERC (Easy Rotor Control, ERC Mini compris) : son émulation DOIT être réglée sur GS-232 — un ERC laissé en Hy-Gain DCU-1 parle un autre jeu de commandes et ne répondra pas — puis choisir son port COM et la même vitesse que dans la configuration de l'ERC.", 'rot.hint': "OpsLog envoie des commandes UDP à PstRotator. Active l'écouteur UDP de PstRotator (Setup → Communication → UDP) avant de tester.",
|
'rot.enable': 'Activer le contrôle du rotator', 'rot.testOkRG': 'Connecté — le Rotator Genius a accepté la commande (rotation vers 0°).', 'rot.type': 'Type de rotator', 'rot.rotatorNum': 'Rotator n°', 'rot.dual': 'Deux rotors', 'rot.rotor1': 'Rotor 1', 'rot.rotor2': 'Rotor 2', 'rot.name': 'Nom', 'rot.antenna': 'Antenne', 'rot.antenna1': 'Antenne rotor 1', 'rot.antenna2': 'Antenne rotor 2', 'rot.name1': 'Nom du rotor 1', 'rot.name2': 'Nom du rotor 2', 'rot.antStd': 'Antenne standard', 'rot.antMotor': 'Motorisée (Ultrabeam/SteppIR)', 'rot.add': 'Ajouter un rotor', 'rot.remove': 'Supprimer le rotor', 'rot.none': 'Aucun rotor configuré. Cliquez sur « Ajouter un rotor ».', 'rot.rgDual': 'Ce Rotator Genius pilote deux rotors (en ajoute un second)', 'rot.testRotor1': 'Tester rotor 1', 'rot.testRotor2': 'Tester rotor 2', 'rot.dualHint': 'Deux rotors indépendants de n\'importe quel type — par exemple un ARCO et un Rotator Genius côte à côte. Configurez chacun ci-dessous ; OpsLog affiche un sélecteur Rotor 1/2 sur le compas pour choisir celui qu\'il tourne et affiche. Réglez chaque rotor sur « Motorisée » pour que les tracés de boom/diagramme (inverse, bidirectionnel) n\'apparaissent que pour celui qui porte l\'Ultrabeam/SteppIR. (Pour un seul Rotator Genius pilotant deux rotors, réglez les deux sur Rotator Genius avec le même hôte et le rotator n° 1 et 2.)', 'rot.rgHint': 'Parle directement à un Rotator Genius 4O3A en TCP (port 9006 par défaut) — sans PstRotator. Le n° choisit lequel des deux rotators du boîtier piloter.', 'rot.arcoHint': "Parle directement à tout contrôleur réglé sur Yaesu GS-232A — sans PstRotator. microHAM ARCO : régler Config → LAN → CONTROL PROTOCOL (ou USB CONTROL PROTOCOL) sur « Yaesu GS-232A » ; en USB la vitesse est sans importance. ERC (Easy Rotor Control, ERC Mini compris) : son émulation DOIT être réglée sur GS-232 — un ERC laissé en Hy-Gain DCU-1 parle un autre jeu de commandes et ne répondra pas — puis choisir son port COM et la même vitesse que dans la configuration de l'ERC.", 'rot.hint': "OpsLog envoie des commandes UDP à PstRotator. Active l'écouteur UDP de PstRotator (Setup → Communication → UDP) avant de tester.",
|
||||||
'extsvc.hint': "Envoie les QSO enregistrés vers des carnets en ligne. Chaque service upload automatiquement à chaque nouveau QSO si activé ; le délai est propre à chaque service (immédiat, ou 1–2 min pour corriger un QSO mal saisi avant).",
|
'extsvc.hint': "Envoie les QSO enregistrés vers des carnets en ligne. Chaque service upload automatiquement à chaque nouveau QSO si activé ; le délai est propre à chaque service (immédiat, ou 1–2 min pour corriger un QSO mal saisi avant).",
|
||||||
'hw.motorTxInhibit': "Inhiber la transmission pendant que l'antenne bouge", 'hw.motorTxInhibitHint': "Empêche le FlexRadio d'émettre pendant que les éléments bougent (nécessite le FlexRadio en API + cette antenne activée). Sans effet avec les autres radios.", 'hw.motorAntenna': 'Antenne motorisée', 'hw.motorEnable': "Activer le contrôle de l'antenne", 'hw.motorType': "Type d'antenne", 'hw.motorTransport': 'Connexion', 'hw.motorTcp': 'Réseau (TCP)', 'hw.motorSerial': 'Série (COM)', 'hw.motorCom': 'Port série', 'hw.motorBaud': 'Débit', 'hw.steppirHint': "Les contrôleurs SteppIR sont en RS-232 série (port DB9 « DATA OUT »). Série = un adaptateur USB↔RS-232 (FTDI), vu comme un port COM. Réseau = un pont série-Ethernet (comme pour l'Ultrabeam).", 'hw.steppirRange': 'Plage accordable', 'hw.steppirRangeHint': "La couverture en fréquence de la SteppIR. Sur une bande hors de cette plage (p. ex. 30 m avec une SteppIR 20 m-6 m), OpsLog n'essaie pas d'accorder l'antenne et n'inhibe pas l'émission. Défaut 13-54 MHz (20 m-6 m) ; abaisse la borne basse (p. ex. 6) pour une SteppIR équipée 40 m.", 'hw.ultrabeam': 'Antenne (Ultrabeam)', 'hw.audioVoice': 'Périphériques audio & manipulateur vocal',
|
'hw.motorTxInhibit': "Inhiber la transmission pendant que l'antenne bouge", 'hw.motorTxInhibitHint': "Empêche le FlexRadio d'émettre pendant que les éléments bougent (nécessite le FlexRadio en API + cette antenne activée). Sans effet avec les autres radios.", 'hw.motorAntenna': 'Antenne motorisée', 'hw.motorEnable': "Activer le contrôle de l'antenne", 'hw.motorType': "Type d'antenne", 'hw.motorTransport': 'Connexion', 'hw.motorTcp': 'Réseau (TCP)', 'hw.motorSerial': 'Série (COM)', 'hw.motorCom': 'Port série', 'hw.motorBaud': 'Débit', 'hw.steppirHint': "Les contrôleurs SteppIR sont en RS-232 série (port DB9 « DATA OUT »). Série = un adaptateur USB↔RS-232 (FTDI), vu comme un port COM. Réseau = un pont série-Ethernet (comme pour l'Ultrabeam).", 'hw.steppirRange': 'Plage accordable', 'hw.steppirRangeHint': "La couverture en fréquence de la SteppIR. Sur une bande hors de cette plage (p. ex. 30 m avec une SteppIR 20 m-6 m), OpsLog n'essaie pas d'accorder l'antenne et n'inhibe pas l'émission. Défaut 13-54 MHz (20 m-6 m) ; abaisse la borne basse (p. ex. 6) pour une SteppIR équipée 40 m.", 'hw.ultrabeam': 'Antenne (Ultrabeam)', 'hw.audioVoice': 'Périphériques audio & manipulateur vocal',
|
||||||
'cat.enable': 'Activer le CAT', 'cat.backend': 'Backend', 'cat.optOmnirig': 'OmniRig', 'cat.optFlex': 'FlexRadio (API)', 'cat.share': 'Partager le CAT avec les autres logiciels', 'cat.shareHint': "Un backend CAT natif occupe le port série de la radio, aucun autre logiciel ne peut donc y accéder. Ceci permet à WSJT-X, JTDX, MSHV ou Log4OM de dialoguer avec la radio À TRAVERS OpsLog : dans l'autre logiciel, choisissez le modèle « Hamlib NET rigctl » et saisissez 127.0.0.1:4532. Fonctionne avec tous les backends, pas seulement les natifs.", 'cat.sharePort': 'Port de partage', 'cat.optXiegu': 'Xiegu (USB)', 'cat.xieguPort': 'Port CAT Xiegu', 'cat.xieguBaudHint': 'Doit correspondre au menu de la radio (G90 par défaut : 19200).', 'cat.xieguAddrHint': "Adresse CI-V d'usine de la famille G90/X6100 : 0x70.", 'cat.xieguPTTLine': 'Passage en \u00e9mission', 'cat.xieguPTTCiv': 'Commande CI-V', 'cat.xieguPTTHint': 'Un G90 ne passe pas en \u00e9mission sur la commande CI-V : les interfaces comme le DE-19 le pilotent par RTS ou DTR. Choisissez la ligne de la v\u00f4tre \u2014 c\u2019est aussi ce qui permet \u00e0 WSJT-X d\u2019\u00e9mettre via le partage CAT.', 'cat.optYaesu': 'Yaesu (USB)', 'cat.optKenwood': 'Kenwood (USB, réseau)', 'cat.civTrace': 'Journaliser le protocole CAT', 'cat.civTraceHint': '\u00c9crit dans le journal chaque trame CAT \u00e9chang\u00e9e avec la radio \u2014 CI-V en hexad\u00e9cimal, Kenwood en texte. Pour signaler une radio qui r\u00e9pond de travers \u2014 un bouton qui fait autre chose, une fr\u00e9quence qui saute. Valable pour la session seulement : c\u2019est un diagnostic, et le journal grossit vite.', 'cat.kenwoodPort': 'Port COM Kenwood', 'cat.kenwoodPortHint': 'Le port s\u00e9rie CAT/USB de la radio (TS-590, TS-890, TS-990, TS-2000, ainsi que les Elecraft K3/K4 qui parlent le m\u00eame dialecte).', 'cat.kenwoodBaudHint': 'Doit correspondre au MENU de la radio : un TS-590 sort d\u2019usine \u00e0 9600, un TS-890 \u00e0 115200.', 'cat.kenwoodHost': 'Ou par le r\u00e9seau (h\u00f4te:port)', 'cat.kenwoodHostHint': 'Un pont s\u00e9rie-r\u00e9seau \u2014 ser2net, un bo\u00eetier Ethernet-s\u00e9rie, un Raspberry Pi pr\u00e8s de la radio. S\u2019il est rempli, il est utilis\u00e9 \u00c0 LA PLACE du port COM ci-dessus. Il ne s\u2019agit pas de la prise RJ45 de la radio, qui parle le protocole KNS de Kenwood et n\u2019est pas prise en charge.', 'cat.yaesuPort': 'Port CAT Yaesu', 'cat.yaesuPortHint': "Le port CAT de la radio — sur un FTDX10/FTDX101 en USB c'est le port COM ENHANCED, pas le standard.", 'cat.yaesuBaudHint': 'Doit correspondre au menu de la radio (FTDX10/FTDX101 par défaut : 38400).', 'cat.lowerLines': 'Abaisser les lignes DTR et RTS à la connexion', 'cat.lowerLinesHint': 'Windows les lève à l’ouverture du port, et certaines interfaces lisent l’une ou l’autre comme PTT — la radio émet alors tant qu’OpsLog tourne. À cocher seulement dans ce cas : d’autres interfaces ont besoin de RTS haut pour émettre, et l’abaisser rend la radio muette.', 'cat.optIcom': 'Icom (CI-V USB)', 'cat.optIcomNet': 'Icom (CI-V réseau)', 'cat.optTci': 'TCI', 'flxpw.title': 'FlexRadio \u2014 puissance par bande et par mode', 'flxpw.hint': 'Puissance d\u2019\u00e9mission appliqu\u00e9e au changement de bande ou de mode. Laissez une case vide pour ne pas toucher \u00e0 la puissance.', 'flxpw.band': 'Bande', 'flxb.title': 'FlexRadio \u2014 antennes et puissance par bande', 'flxb.hint': 'Les antennes sont appliqu\u00e9es au changement de bande ; la puissance au changement de bande ou de mode. Laissez une case de puissance vide pour ne pas y toucher.', 'flxb.rxAnt': 'Antenne RX', 'flxb.txAnt': 'Antenne TX', 'flxb.noRadio': 'Aucune antenne remont\u00e9e \u2014 connectez le FlexRadio, puis rouvrez ce panneau.', 'flxpw.phone': 'Phonie', 'flxpw.digi': 'Num\u00e9rique', 'flxpw.noBands': 'Aucune bande configur\u00e9e \u2014 ajoutez-les dans Listes \u2192 Bandes.', 'flxpw.saved': 'Enregistr\u00e9',
|
'cat.enable': 'Activer le CAT', 'cat.backend': 'Backend', 'cat.optOmnirig': 'OmniRig', 'cat.optFlex': 'FlexRadio (API)', 'cat.share': 'Partager le CAT avec les autres logiciels', 'cat.shareHint': "Un backend CAT natif occupe le port série de la radio, aucun autre logiciel ne peut donc y accéder. Ceci permet à WSJT-X, JTDX, MSHV ou Log4OM de dialoguer avec la radio À TRAVERS OpsLog : dans l'autre logiciel, choisissez le modèle « Hamlib NET rigctl » et saisissez 127.0.0.1:4532. Fonctionne avec tous les backends, pas seulement les natifs.", 'cat.sharePort': 'Port de partage', 'cat.pttKey': 'Activer la touche PTT', 'cat.pttKeyPress': 'Appuyez sur une touche…', 'cat.pttKeyNone': 'Cliquez pour définir une touche', 'cat.pttKeyClear': 'Effacer', 'cat.pttKeyToggle': 'Mode bascule (appui = émission, nouvel appui = arrêt)', 'cat.pttKeyHint': "Quand OpsLog a le focus, cette touche passe la radio en émission — maintenue par défaut (relâcher pour arrêter), ou verrouillée en mode bascule. Elle utilise la méthode PTT de Audio → PTT (CAT / RTS / DTR), avec repli sur le CAT. Choisissez une touche que vous ne tapez jamais en journalisant (ex. Pause, Arrêt défil., ou une pédale mappée dessus) — OpsLog l'intercepte pour qu'elle n'atterrisse pas dans un champ.", 'cat.optXiegu': 'Xiegu (USB)', 'cat.xieguPort': 'Port CAT Xiegu', 'cat.xieguBaudHint': 'Doit correspondre au menu de la radio (G90 par défaut : 19200).', 'cat.xieguAddrHint': "Adresse CI-V d'usine de la famille G90/X6100 : 0x70.", 'cat.xieguPTTLine': 'Passage en \u00e9mission', 'cat.xieguPTTCiv': 'Commande CI-V', 'cat.xieguPTTHint': 'Un G90 ne passe pas en \u00e9mission sur la commande CI-V : les interfaces comme le DE-19 le pilotent par RTS ou DTR. Choisissez la ligne de la v\u00f4tre \u2014 c\u2019est aussi ce qui permet \u00e0 WSJT-X d\u2019\u00e9mettre via le partage CAT.', 'cat.optYaesu': 'Yaesu (USB)', 'cat.optKenwood': 'Kenwood (USB, réseau)', 'cat.civTrace': 'Journaliser le protocole CAT', 'cat.civTraceHint': '\u00c9crit dans le journal chaque trame CAT \u00e9chang\u00e9e avec la radio \u2014 CI-V en hexad\u00e9cimal, Kenwood en texte. Pour signaler une radio qui r\u00e9pond de travers \u2014 un bouton qui fait autre chose, une fr\u00e9quence qui saute. Valable pour la session seulement : c\u2019est un diagnostic, et le journal grossit vite.', 'cat.kenwoodPort': 'Port COM Kenwood', 'cat.kenwoodPortHint': 'Le port s\u00e9rie CAT/USB de la radio (TS-590, TS-890, TS-990, TS-2000, ainsi que les Elecraft K3/K4 qui parlent le m\u00eame dialecte).', 'cat.kenwoodBaudHint': 'Doit correspondre au MENU de la radio : un TS-590 sort d\u2019usine \u00e0 9600, un TS-890 \u00e0 115200.', 'cat.kenwoodHost': 'Ou par le r\u00e9seau (h\u00f4te:port)', 'cat.kenwoodHostHint': 'Un pont s\u00e9rie-r\u00e9seau \u2014 ser2net, un bo\u00eetier Ethernet-s\u00e9rie, un Raspberry Pi pr\u00e8s de la radio. S\u2019il est rempli, il est utilis\u00e9 \u00c0 LA PLACE du port COM ci-dessus. Il ne s\u2019agit pas de la prise RJ45 de la radio, qui parle le protocole KNS de Kenwood et n\u2019est pas prise en charge.', 'cat.yaesuPort': 'Port CAT Yaesu', 'cat.yaesuPortHint': "Le port CAT de la radio — sur un FTDX10/FTDX101 en USB c'est le port COM ENHANCED, pas le standard.", 'cat.yaesuBaudHint': 'Doit correspondre au menu de la radio (FTDX10/FTDX101 par défaut : 38400).', 'cat.lowerLines': 'Abaisser les lignes DTR et RTS à la connexion', 'cat.lowerLinesHint': 'Windows les lève à l’ouverture du port, et certaines interfaces lisent l’une ou l’autre comme PTT — la radio émet alors tant qu’OpsLog tourne. À cocher seulement dans ce cas : d’autres interfaces ont besoin de RTS haut pour émettre, et l’abaisser rend la radio muette.', 'cat.optIcom': 'Icom (CI-V USB)', 'cat.optIcomNet': 'Icom (CI-V réseau)', 'cat.optTci': 'TCI', 'flxpw.title': 'FlexRadio \u2014 puissance par bande et par mode', 'flxpw.hint': 'Puissance d\u2019\u00e9mission appliqu\u00e9e au changement de bande ou de mode. Laissez une case vide pour ne pas toucher \u00e0 la puissance.', 'flxpw.band': 'Bande', 'flxb.title': 'FlexRadio \u2014 antennes et puissance par bande', 'flxb.hint': 'Les antennes sont appliqu\u00e9es au changement de bande ; la puissance au changement de bande ou de mode. Laissez une case de puissance vide pour ne pas y toucher.', 'flxb.rxAnt': 'Antenne RX', 'flxb.txAnt': 'Antenne TX', 'flxb.noRadio': 'Aucune antenne remont\u00e9e \u2014 connectez le FlexRadio, puis rouvrez ce panneau.', 'flxpw.phone': 'Phonie', 'flxpw.digi': 'Num\u00e9rique', 'flxpw.noBands': 'Aucune bande configur\u00e9e \u2014 ajoutez-les dans Listes \u2192 Bandes.', 'flxpw.saved': 'Enregistr\u00e9',
|
||||||
'cat.icomNetHost': 'IP / nom d\'hôte du poste', 'cat.icomNetUser': 'Utilisateur réseau (ID)', 'cat.icomNetPass': 'Mot de passe réseau',
|
'cat.icomNetHost': 'IP / nom d\'hôte du poste', 'cat.icomNetUser': 'Utilisateur réseau (ID)', 'cat.icomNetPass': 'Mot de passe réseau',
|
||||||
'cat.icomNetHint': "Se connecte directement au serveur LAN intégré du poste — sans RS-BA1 ni Remote Utility (ferme-les d'abord). Utilise l'ID/mot de passe Network User1 configurés dans le menu Network du poste. Un poste en veille est allumé automatiquement.",
|
'cat.icomNetHint': "Se connecte directement au serveur LAN intégré du poste — sans RS-BA1 ni Remote Utility (ferme-les d'abord). Utilise l'ID/mot de passe Network User1 configurés dans le menu Network du poste. Un poste en veille est allumé automatiquement.",
|
||||||
'cat.icomNetAudio': 'Diffuser l’audio RX par le réseau (expérimental)',
|
'cat.icomNetAudio': 'Diffuser l’audio RX par le réseau (expérimental)',
|
||||||
|
|||||||
@@ -0,0 +1,83 @@
|
|||||||
|
// Sunrise / sunset for a station, in UTC.
|
||||||
|
//
|
||||||
|
// Built on greyline.ts's sunPosition() rather than on a second implementation of
|
||||||
|
// the solar equations: the map's terminator and the entry strip's sunrise must
|
||||||
|
// never disagree, and there is a whole comment block over there about a sign
|
||||||
|
// error that produced six months of plausible-looking wrong answers. One source
|
||||||
|
// of astronomy, one place to be wrong.
|
||||||
|
//
|
||||||
|
// Everything is UTC. Amateur radio runs on UTC, the log is in UTC, and a local
|
||||||
|
// time would raise the question "local to whom — me or the DX?".
|
||||||
|
import { sunPosition } from './greyline';
|
||||||
|
|
||||||
|
const DEG = Math.PI / 180;
|
||||||
|
|
||||||
|
// Standard altitude of the Sun's centre at rise/set: half a solar diameter below
|
||||||
|
// the horizon plus atmospheric refraction.
|
||||||
|
const H0 = -0.833;
|
||||||
|
|
||||||
|
// solarAltitude returns the Sun's elevation in degrees at a place and instant.
|
||||||
|
function solarAltitude(date: Date, latDeg: number, lonDeg: number): number {
|
||||||
|
const { dec, gha } = sunPosition(date);
|
||||||
|
const ha = (gha + lonDeg) * DEG; // local hour angle
|
||||||
|
const d = dec * DEG;
|
||||||
|
const lat = latDeg * DEG;
|
||||||
|
return Math.asin(Math.sin(lat) * Math.sin(d) + Math.cos(lat) * Math.cos(d) * Math.cos(ha)) / DEG;
|
||||||
|
}
|
||||||
|
|
||||||
|
export type SunTimes = {
|
||||||
|
rise: string; // "HH:MM" UTC, "" when the Sun does not rise that day
|
||||||
|
set: string;
|
||||||
|
polarDay: boolean; // Sun stays up all day
|
||||||
|
polarNight: boolean; // Sun never comes up
|
||||||
|
};
|
||||||
|
|
||||||
|
// sunTimes scans the UTC day a minute at a time and reports where the Sun
|
||||||
|
// crosses the rise/set altitude.
|
||||||
|
//
|
||||||
|
// A scan, not the closed-form hour-angle formula, because the closed form needs
|
||||||
|
// special-casing for the polar cases and for days where the declination shifts
|
||||||
|
// enough to matter, and it silently returns NaN rather than saying "no sunrise
|
||||||
|
// here today". 1440 evaluations is nothing, and the failure mode is honest: no
|
||||||
|
// crossing found means no sunrise, which is a real answer above the Arctic
|
||||||
|
// circle. The crossing minute is then refined by linear interpolation, so the
|
||||||
|
// result is accurate to well under a minute despite the coarse scan.
|
||||||
|
export function sunTimes(date: Date, latDeg: number, lonDeg: number): SunTimes {
|
||||||
|
const out: SunTimes = { rise: '', set: '', polarDay: false, polarNight: false };
|
||||||
|
if (!isFinite(latDeg) || !isFinite(lonDeg)) return out;
|
||||||
|
|
||||||
|
const start = Date.UTC(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate());
|
||||||
|
const minute = 60000;
|
||||||
|
let prev = solarAltitude(new Date(start), latDeg, lonDeg);
|
||||||
|
const anyUp = prev > H0;
|
||||||
|
let anyDown = prev <= H0;
|
||||||
|
let sawUp = anyUp;
|
||||||
|
|
||||||
|
for (let i = 1; i <= 1440; i++) {
|
||||||
|
const alt = solarAltitude(new Date(start + i * minute), latDeg, lonDeg);
|
||||||
|
if (alt > H0) sawUp = true; else anyDown = true;
|
||||||
|
if (prev <= H0 && alt > H0 && !out.rise) {
|
||||||
|
out.rise = fmt(start + (i - 1 + frac(prev, alt)) * minute);
|
||||||
|
} else if (prev > H0 && alt <= H0 && !out.set) {
|
||||||
|
out.set = fmt(start + (i - 1 + frac(prev, alt)) * minute);
|
||||||
|
}
|
||||||
|
prev = alt;
|
||||||
|
}
|
||||||
|
if (!out.rise && !out.set) {
|
||||||
|
out.polarDay = sawUp && !anyDown;
|
||||||
|
out.polarNight = !sawUp;
|
||||||
|
}
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
// frac is where between two samples the altitude crosses H0.
|
||||||
|
function frac(a: number, b: number): number {
|
||||||
|
const d = b - a;
|
||||||
|
return d === 0 ? 0 : (H0 - a) / d;
|
||||||
|
}
|
||||||
|
|
||||||
|
function fmt(ms: number): string {
|
||||||
|
const d = new Date(ms);
|
||||||
|
const p = (n: number) => String(n).padStart(2, '0');
|
||||||
|
return `${p(d.getUTCHours())}:${p(d.getUTCMinutes())}`;
|
||||||
|
}
|
||||||
@@ -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.23.1';
|
export const APP_VERSION = '0.23.3';
|
||||||
|
|
||||||
// Author / credits, shown in Help -> About.
|
// Author / credits, shown in Help -> About.
|
||||||
export const APP_AUTHOR = 'F4BPO';
|
export const APP_AUTHOR = 'F4BPO';
|
||||||
|
|||||||
Vendored
+17
-3
@@ -469,7 +469,7 @@ export function GetRelayAuto():Promise<main.RelayAutoConfig>;
|
|||||||
|
|
||||||
export function GetRotatorHeading():Promise<main.RotatorHeading>;
|
export function GetRotatorHeading():Promise<main.RotatorHeading>;
|
||||||
|
|
||||||
export function GetRotatorSettings():Promise<main.RotatorSettings>;
|
export function GetRotators():Promise<Array<main.RotatorDevice>>;
|
||||||
|
|
||||||
export function GetSPEStatus():Promise<spe.Status>;
|
export function GetSPEStatus():Promise<spe.Status>;
|
||||||
|
|
||||||
@@ -607,6 +607,10 @@ export function InspectAwardImport():Promise<main.AwardImportPreview>;
|
|||||||
|
|
||||||
export function IsNewUSCounty(arg1:string,arg2:string):Promise<boolean>;
|
export function IsNewUSCounty(arg1:string,arg2:string):Promise<boolean>;
|
||||||
|
|
||||||
|
export function KenwoodSendCW(arg1:string):Promise<void>;
|
||||||
|
|
||||||
|
export function KenwoodStopCW():Promise<void>;
|
||||||
|
|
||||||
export function LaunchAutostartProgram(arg1:string):Promise<main.AutostartLaunchResult>;
|
export function LaunchAutostartProgram(arg1:string):Promise<main.AutostartLaunchResult>;
|
||||||
|
|
||||||
export function LaunchAutostartPrograms():Promise<Array<main.AutostartLaunchResult>>;
|
export function LaunchAutostartPrograms():Promise<Array<main.AutostartLaunchResult>>;
|
||||||
@@ -707,6 +711,10 @@ export function PGXLSetFanMode(arg1:string):Promise<void>;
|
|||||||
|
|
||||||
export function PGXLSetOperate(arg1:boolean):Promise<void>;
|
export function PGXLSetOperate(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function PTTHotkeyDown():Promise<void>;
|
||||||
|
|
||||||
|
export function PTTHotkeyUp():Promise<void>;
|
||||||
|
|
||||||
export function PickADIFMonitorFile():Promise<string>;
|
export function PickADIFMonitorFile():Promise<string>;
|
||||||
|
|
||||||
export function PickAudioFolder():Promise<string>;
|
export function PickAudioFolder():Promise<string>;
|
||||||
@@ -879,7 +887,7 @@ export function SaveQSLDefaults(arg1:main.QSLDefaults):Promise<void>;
|
|||||||
|
|
||||||
export function SaveRelayAuto(arg1:main.RelayAutoConfig):Promise<void>;
|
export function SaveRelayAuto(arg1:main.RelayAutoConfig):Promise<void>;
|
||||||
|
|
||||||
export function SaveRotatorSettings(arg1:main.RotatorSettings):Promise<void>;
|
export function SaveRotators(arg1:Array<main.RotatorDevice>):Promise<void>;
|
||||||
|
|
||||||
export function SaveStationDevices(arg1:Array<main.StationDevice>):Promise<void>;
|
export function SaveStationDevices(arg1:Array<main.StationDevice>):Promise<void>;
|
||||||
|
|
||||||
@@ -909,6 +917,8 @@ export function SendLogToDeveloper():Promise<void>;
|
|||||||
|
|
||||||
export function SendQSORecordingEmail(arg1:number):Promise<void>;
|
export function SendQSORecordingEmail(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function SetActiveRotor(arg1:number):Promise<void>;
|
||||||
|
|
||||||
export function SetAlertEmailTo(arg1:string):Promise<void>;
|
export function SetAlertEmailTo(arg1:string):Promise<void>;
|
||||||
|
|
||||||
export function SetCATFrequency(arg1:number):Promise<void>;
|
export function SetCATFrequency(arg1:number):Promise<void>;
|
||||||
@@ -929,6 +939,8 @@ export function SetCompactMode(arg1:boolean):Promise<void>;
|
|||||||
|
|
||||||
export function SetDVKLabel(arg1:number,arg2:string):Promise<void>;
|
export function SetDVKLabel(arg1:number,arg2:string):Promise<void>;
|
||||||
|
|
||||||
|
export function SetKenwoodKeySpeed(arg1:number):Promise<void>;
|
||||||
|
|
||||||
export function SetPassphrase(arg1:string):Promise<void>;
|
export function SetPassphrase(arg1:string):Promise<void>;
|
||||||
|
|
||||||
export function SetScpEnabled(arg1:boolean):Promise<void>;
|
export function SetScpEnabled(arg1:boolean):Promise<void>;
|
||||||
@@ -989,6 +1001,8 @@ export function SwitchCATRig(arg1:number):Promise<void>;
|
|||||||
|
|
||||||
export function SyncPOTAHunterLog(arg1:boolean,arg2:boolean):Promise<main.POTASyncResult>;
|
export function SyncPOTAHunterLog(arg1:boolean,arg2:boolean):Promise<main.POTASyncResult>;
|
||||||
|
|
||||||
|
export function TailLogFile(arg1:number):Promise<string>;
|
||||||
|
|
||||||
export function TestCloudlogUpload():Promise<string>;
|
export function TestCloudlogUpload():Promise<string>;
|
||||||
|
|
||||||
export function TestClublogUpload():Promise<string>;
|
export function TestClublogUpload():Promise<string>;
|
||||||
@@ -1009,7 +1023,7 @@ export function TestPTT(arg1:main.AudioSettings):Promise<void>;
|
|||||||
|
|
||||||
export function TestQRZUpload():Promise<string>;
|
export function TestQRZUpload():Promise<string>;
|
||||||
|
|
||||||
export function TestRotator(arg1:main.RotatorSettings):Promise<void>;
|
export function TestRotatorDevice(arg1:main.RotatorDevice,arg2:number):Promise<void>;
|
||||||
|
|
||||||
export function TestStationDevice(arg1:main.StationDevice):Promise<main.StationTestResult>;
|
export function TestStationDevice(arg1:main.StationDevice):Promise<main.StationTestResult>;
|
||||||
|
|
||||||
|
|||||||
@@ -886,8 +886,8 @@ export function GetRotatorHeading() {
|
|||||||
return window['go']['main']['App']['GetRotatorHeading']();
|
return window['go']['main']['App']['GetRotatorHeading']();
|
||||||
}
|
}
|
||||||
|
|
||||||
export function GetRotatorSettings() {
|
export function GetRotators() {
|
||||||
return window['go']['main']['App']['GetRotatorSettings']();
|
return window['go']['main']['App']['GetRotators']();
|
||||||
}
|
}
|
||||||
|
|
||||||
export function GetSPEStatus() {
|
export function GetSPEStatus() {
|
||||||
@@ -1162,6 +1162,14 @@ export function IsNewUSCounty(arg1, arg2) {
|
|||||||
return window['go']['main']['App']['IsNewUSCounty'](arg1, arg2);
|
return window['go']['main']['App']['IsNewUSCounty'](arg1, arg2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function KenwoodSendCW(arg1) {
|
||||||
|
return window['go']['main']['App']['KenwoodSendCW'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function KenwoodStopCW() {
|
||||||
|
return window['go']['main']['App']['KenwoodStopCW']();
|
||||||
|
}
|
||||||
|
|
||||||
export function LaunchAutostartProgram(arg1) {
|
export function LaunchAutostartProgram(arg1) {
|
||||||
return window['go']['main']['App']['LaunchAutostartProgram'](arg1);
|
return window['go']['main']['App']['LaunchAutostartProgram'](arg1);
|
||||||
}
|
}
|
||||||
@@ -1362,6 +1370,14 @@ export function PGXLSetOperate(arg1) {
|
|||||||
return window['go']['main']['App']['PGXLSetOperate'](arg1);
|
return window['go']['main']['App']['PGXLSetOperate'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function PTTHotkeyDown() {
|
||||||
|
return window['go']['main']['App']['PTTHotkeyDown']();
|
||||||
|
}
|
||||||
|
|
||||||
|
export function PTTHotkeyUp() {
|
||||||
|
return window['go']['main']['App']['PTTHotkeyUp']();
|
||||||
|
}
|
||||||
|
|
||||||
export function PickADIFMonitorFile() {
|
export function PickADIFMonitorFile() {
|
||||||
return window['go']['main']['App']['PickADIFMonitorFile']();
|
return window['go']['main']['App']['PickADIFMonitorFile']();
|
||||||
}
|
}
|
||||||
@@ -1706,8 +1722,8 @@ export function SaveRelayAuto(arg1) {
|
|||||||
return window['go']['main']['App']['SaveRelayAuto'](arg1);
|
return window['go']['main']['App']['SaveRelayAuto'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function SaveRotatorSettings(arg1) {
|
export function SaveRotators(arg1) {
|
||||||
return window['go']['main']['App']['SaveRotatorSettings'](arg1);
|
return window['go']['main']['App']['SaveRotators'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function SaveStationDevices(arg1) {
|
export function SaveStationDevices(arg1) {
|
||||||
@@ -1766,6 +1782,10 @@ export function SendQSORecordingEmail(arg1) {
|
|||||||
return window['go']['main']['App']['SendQSORecordingEmail'](arg1);
|
return window['go']['main']['App']['SendQSORecordingEmail'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function SetActiveRotor(arg1) {
|
||||||
|
return window['go']['main']['App']['SetActiveRotor'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function SetAlertEmailTo(arg1) {
|
export function SetAlertEmailTo(arg1) {
|
||||||
return window['go']['main']['App']['SetAlertEmailTo'](arg1);
|
return window['go']['main']['App']['SetAlertEmailTo'](arg1);
|
||||||
}
|
}
|
||||||
@@ -1806,6 +1826,10 @@ export function SetDVKLabel(arg1, arg2) {
|
|||||||
return window['go']['main']['App']['SetDVKLabel'](arg1, arg2);
|
return window['go']['main']['App']['SetDVKLabel'](arg1, arg2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function SetKenwoodKeySpeed(arg1) {
|
||||||
|
return window['go']['main']['App']['SetKenwoodKeySpeed'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function SetPassphrase(arg1) {
|
export function SetPassphrase(arg1) {
|
||||||
return window['go']['main']['App']['SetPassphrase'](arg1);
|
return window['go']['main']['App']['SetPassphrase'](arg1);
|
||||||
}
|
}
|
||||||
@@ -1926,6 +1950,10 @@ export function SyncPOTAHunterLog(arg1, arg2) {
|
|||||||
return window['go']['main']['App']['SyncPOTAHunterLog'](arg1, arg2);
|
return window['go']['main']['App']['SyncPOTAHunterLog'](arg1, arg2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function TailLogFile(arg1) {
|
||||||
|
return window['go']['main']['App']['TailLogFile'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function TestCloudlogUpload() {
|
export function TestCloudlogUpload() {
|
||||||
return window['go']['main']['App']['TestCloudlogUpload']();
|
return window['go']['main']['App']['TestCloudlogUpload']();
|
||||||
}
|
}
|
||||||
@@ -1966,8 +1994,8 @@ export function TestQRZUpload() {
|
|||||||
return window['go']['main']['App']['TestQRZUpload']();
|
return window['go']['main']['App']['TestQRZUpload']();
|
||||||
}
|
}
|
||||||
|
|
||||||
export function TestRotator(arg1) {
|
export function TestRotatorDevice(arg1, arg2) {
|
||||||
return window['go']['main']['App']['TestRotator'](arg1);
|
return window['go']['main']['App']['TestRotatorDevice'](arg1, arg2);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function TestStationDevice(arg1) {
|
export function TestStationDevice(arg1) {
|
||||||
|
|||||||
@@ -1442,6 +1442,8 @@ export namespace lotwusers {
|
|||||||
is_user: boolean;
|
is_user: boolean;
|
||||||
last_upload?: string;
|
last_upload?: string;
|
||||||
days_ago: number;
|
days_ago: number;
|
||||||
|
feed_date?: string;
|
||||||
|
feed_stale: boolean;
|
||||||
|
|
||||||
static createFrom(source: any = {}) {
|
static createFrom(source: any = {}) {
|
||||||
return new Info(source);
|
return new Info(source);
|
||||||
@@ -1452,6 +1454,8 @@ export namespace lotwusers {
|
|||||||
this.is_user = source["is_user"];
|
this.is_user = source["is_user"];
|
||||||
this.last_upload = source["last_upload"];
|
this.last_upload = source["last_upload"];
|
||||||
this.days_ago = source["days_ago"];
|
this.days_ago = source["days_ago"];
|
||||||
|
this.feed_date = source["feed_date"];
|
||||||
|
this.feed_stale = source["feed_stale"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1516,6 +1520,7 @@ export namespace main {
|
|||||||
transport: string;
|
transport: string;
|
||||||
host: string;
|
host: string;
|
||||||
port: number;
|
port: number;
|
||||||
|
password: string;
|
||||||
com_port: string;
|
com_port: string;
|
||||||
baud: number;
|
baud: number;
|
||||||
freq_out: boolean;
|
freq_out: boolean;
|
||||||
@@ -1536,6 +1541,7 @@ export namespace main {
|
|||||||
this.transport = source["transport"];
|
this.transport = source["transport"];
|
||||||
this.host = source["host"];
|
this.host = source["host"];
|
||||||
this.port = source["port"];
|
this.port = source["port"];
|
||||||
|
this.password = source["password"];
|
||||||
this.com_port = source["com_port"];
|
this.com_port = source["com_port"];
|
||||||
this.baud = source["baud"];
|
this.baud = source["baud"];
|
||||||
this.freq_out = source["freq_out"];
|
this.freq_out = source["freq_out"];
|
||||||
@@ -1941,6 +1947,9 @@ export namespace main {
|
|||||||
digital_default: string;
|
digital_default: string;
|
||||||
share_enabled: boolean;
|
share_enabled: boolean;
|
||||||
share_port: number;
|
share_port: number;
|
||||||
|
ptt_hotkey_enabled: boolean;
|
||||||
|
ptt_hotkey: string;
|
||||||
|
ptt_hotkey_toggle: boolean;
|
||||||
|
|
||||||
static createFrom(source: any = {}) {
|
static createFrom(source: any = {}) {
|
||||||
return new CATSettings(source);
|
return new CATSettings(source);
|
||||||
@@ -1983,6 +1992,9 @@ export namespace main {
|
|||||||
this.digital_default = source["digital_default"];
|
this.digital_default = source["digital_default"];
|
||||||
this.share_enabled = source["share_enabled"];
|
this.share_enabled = source["share_enabled"];
|
||||||
this.share_port = source["share_port"];
|
this.share_port = source["share_port"];
|
||||||
|
this.ptt_hotkey_enabled = source["ptt_hotkey_enabled"];
|
||||||
|
this.ptt_hotkey = source["ptt_hotkey"];
|
||||||
|
this.ptt_hotkey_toggle = source["ptt_hotkey_toggle"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
export class CabrilloResult {
|
export class CabrilloResult {
|
||||||
@@ -2800,11 +2812,52 @@ export namespace main {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export class RotatorDevice {
|
||||||
|
id: string;
|
||||||
|
name: string;
|
||||||
|
type: string;
|
||||||
|
host: string;
|
||||||
|
port: number;
|
||||||
|
has_elevation: boolean;
|
||||||
|
rotator_num: number;
|
||||||
|
dual: boolean;
|
||||||
|
motorized: boolean;
|
||||||
|
name2: string;
|
||||||
|
motorized2: boolean;
|
||||||
|
transport: string;
|
||||||
|
com_port: string;
|
||||||
|
baud: number;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new RotatorDevice(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.id = source["id"];
|
||||||
|
this.name = source["name"];
|
||||||
|
this.type = source["type"];
|
||||||
|
this.host = source["host"];
|
||||||
|
this.port = source["port"];
|
||||||
|
this.has_elevation = source["has_elevation"];
|
||||||
|
this.rotator_num = source["rotator_num"];
|
||||||
|
this.dual = source["dual"];
|
||||||
|
this.motorized = source["motorized"];
|
||||||
|
this.name2 = source["name2"];
|
||||||
|
this.motorized2 = source["motorized2"];
|
||||||
|
this.transport = source["transport"];
|
||||||
|
this.com_port = source["com_port"];
|
||||||
|
this.baud = source["baud"];
|
||||||
|
}
|
||||||
|
}
|
||||||
export class RotatorHeading {
|
export class RotatorHeading {
|
||||||
enabled: boolean;
|
enabled: boolean;
|
||||||
ok: boolean;
|
ok: boolean;
|
||||||
azimuth: number;
|
azimuth: number;
|
||||||
raw: string;
|
raw: string;
|
||||||
|
rotors: string[];
|
||||||
|
active: number;
|
||||||
|
motorized: boolean;
|
||||||
|
|
||||||
static createFrom(source: any = {}) {
|
static createFrom(source: any = {}) {
|
||||||
return new RotatorHeading(source);
|
return new RotatorHeading(source);
|
||||||
@@ -2816,34 +2869,9 @@ export namespace main {
|
|||||||
this.ok = source["ok"];
|
this.ok = source["ok"];
|
||||||
this.azimuth = source["azimuth"];
|
this.azimuth = source["azimuth"];
|
||||||
this.raw = source["raw"];
|
this.raw = source["raw"];
|
||||||
}
|
this.rotors = source["rotors"];
|
||||||
}
|
this.active = source["active"];
|
||||||
export class RotatorSettings {
|
this.motorized = source["motorized"];
|
||||||
enabled: boolean;
|
|
||||||
type: string;
|
|
||||||
host: string;
|
|
||||||
port: number;
|
|
||||||
has_elevation: boolean;
|
|
||||||
rotator_num: number;
|
|
||||||
transport: string;
|
|
||||||
com_port: string;
|
|
||||||
baud: number;
|
|
||||||
|
|
||||||
static createFrom(source: any = {}) {
|
|
||||||
return new RotatorSettings(source);
|
|
||||||
}
|
|
||||||
|
|
||||||
constructor(source: any = {}) {
|
|
||||||
if ('string' === typeof source) source = JSON.parse(source);
|
|
||||||
this.enabled = source["enabled"];
|
|
||||||
this.type = source["type"];
|
|
||||||
this.host = source["host"];
|
|
||||||
this.port = source["port"];
|
|
||||||
this.has_elevation = source["has_elevation"];
|
|
||||||
this.rotator_num = source["rotator_num"];
|
|
||||||
this.transport = source["transport"];
|
|
||||||
this.com_port = source["com_port"];
|
|
||||||
this.baud = source["baud"];
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
export class ScpStatus {
|
export class ScpStatus {
|
||||||
|
|||||||
@@ -869,3 +869,22 @@ func (m *Manager) YaesuDo(fn func(YaesuController) error) error {
|
|||||||
return fn(yc)
|
return fn(yc)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// KenwoodController is the Kenwood/Elecraft CW-over-CAT capability (the KY keyer),
|
||||||
|
// so a K3 can key CW through its single CAT link instead of a second COM port.
|
||||||
|
type KenwoodController interface {
|
||||||
|
SendCW(string) error
|
||||||
|
StopCW() error
|
||||||
|
SetKeySpeed(int) error
|
||||||
|
}
|
||||||
|
|
||||||
|
// KenwoodDo dispatches a Kenwood control onto the CAT goroutine.
|
||||||
|
func (m *Manager) KenwoodDo(fn func(KenwoodController) error) error {
|
||||||
|
return m.exec(func(b Backend) error {
|
||||||
|
kc, ok := b.(KenwoodController)
|
||||||
|
if !ok {
|
||||||
|
return fmt.Errorf("active CAT backend is not a Kenwood/Elecraft")
|
||||||
|
}
|
||||||
|
return fn(kc)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|||||||
+17
-2
@@ -62,8 +62,10 @@ type Flex struct {
|
|||||||
spotsEnabled bool // push cluster spots + manage the panadapter overlay
|
spotsEnabled bool // push cluster spots + manage the panadapter overlay
|
||||||
spotIdx map[int]bool // panadapter spot indices currently known to the radio
|
spotIdx map[int]bool // panadapter spot indices currently known to the radio
|
||||||
pendingSpot map[int]string // seq → callsign, awaiting the spot index in the R response
|
pendingSpot map[int]string // seq → callsign, awaiting the spot index in the R response
|
||||||
|
pendingSpotMode map[int]string // seq → ADIF mode, paired with pendingSpot
|
||||||
pendingSplit map[int]bool // seq → awaiting the new TX slice's index (split create)
|
pendingSplit map[int]bool // seq → awaiting the new TX slice's index (split create)
|
||||||
spotCall map[int]string // spot index → callsign (to fill the call on a panadapter click)
|
spotCall map[int]string // spot index → callsign (to fill the call on a panadapter click)
|
||||||
|
spotMode map[int]string // spot index → ADIF mode, so a click can also set the slice mode (SmartSDR tunes the spot's freq but not its mode)
|
||||||
spotByCall map[string]int // callsign → live spot index, so re-spotting a call replaces its old spot (WSJT decodes re-fire every cycle)
|
spotByCall map[string]int // callsign → live spot index, so re-spotting a call replaces its old spot (WSJT decodes re-fire every cycle)
|
||||||
sentCmds map[int]string // seq → command text, so an R<seq> error names the command
|
sentCmds map[int]string // seq → command text, so an R<seq> error names the command
|
||||||
|
|
||||||
@@ -185,7 +187,7 @@ func NewFlex(host string, port int, spotsEnabled bool) *Flex {
|
|||||||
return &Flex{
|
return &Flex{
|
||||||
host: strings.TrimSpace(host), port: port,
|
host: strings.TrimSpace(host), port: port,
|
||||||
slices: map[int]*flexSlice{}, spotsEnabled: spotsEnabled,
|
slices: map[int]*flexSlice{}, spotsEnabled: spotsEnabled,
|
||||||
spotIdx: map[int]bool{}, pendingSpot: map[int]string{}, spotCall: map[int]string{}, spotByCall: map[string]int{}, pendingSplit: map[int]bool{},
|
spotIdx: map[int]bool{}, pendingSpot: map[int]string{}, pendingSpotMode: map[int]string{}, spotCall: map[int]string{}, spotMode: map[int]string{}, spotByCall: map[string]int{}, pendingSplit: map[int]bool{},
|
||||||
meterMeta: map[int]meterInfo{}, meterVal: map[int]float64{}, meterSub: map[int]bool{},
|
meterMeta: map[int]meterInfo{}, meterVal: map[int]float64{}, meterSub: map[int]bool{},
|
||||||
sentCmds: map[int]string{}, txSetAt: map[string]time.Time{},
|
sentCmds: map[int]string{}, txSetAt: map[string]time.Time{},
|
||||||
pinnedSlice: -1,
|
pinnedSlice: -1,
|
||||||
@@ -338,11 +340,17 @@ func (f *Flex) reader(conn net.Conn) {
|
|||||||
if idx, err := strconv.Atoi(mm[1]); err == nil {
|
if idx, err := strconv.Atoi(mm[1]); err == nil {
|
||||||
f.mu.Lock()
|
f.mu.Lock()
|
||||||
call := f.spotCall[idx]
|
call := f.spotCall[idx]
|
||||||
|
mode := f.spotMode[idx]
|
||||||
handler := f.OnSpotClick
|
handler := f.OnSpotClick
|
||||||
f.mu.Unlock()
|
f.mu.Unlock()
|
||||||
if call != "" && handler != nil {
|
if call != "" && handler != nil {
|
||||||
debugLog.Printf("Flex: spot %d triggered → %s", idx, call)
|
debugLog.Printf("Flex: spot %d triggered → %s (mode %s)", idx, call, mode)
|
||||||
go handler(call, 0)
|
go handler(call, 0)
|
||||||
|
// SmartSDR tunes the spot's frequency on click but does NOT apply
|
||||||
|
// its mode=, so set the slice mode ourselves from what we spotted.
|
||||||
|
if mode != "" {
|
||||||
|
go func(m string) { _ = f.SetMode(m) }(mode)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -379,12 +387,15 @@ func (f *Flex) reader(conn net.Conn) {
|
|||||||
// pair it with the callsign we stashed under this seq.
|
// pair it with the callsign we stashed under this seq.
|
||||||
f.mu.Lock()
|
f.mu.Lock()
|
||||||
call, pending := f.pendingSpot[seq]
|
call, pending := f.pendingSpot[seq]
|
||||||
|
spotMode := f.pendingSpotMode[seq]
|
||||||
if pending {
|
if pending {
|
||||||
delete(f.pendingSpot, seq)
|
delete(f.pendingSpot, seq)
|
||||||
|
delete(f.pendingSpotMode, seq)
|
||||||
}
|
}
|
||||||
if pending && ok && len(parts) >= 3 {
|
if pending && ok && len(parts) >= 3 {
|
||||||
if idx, e := strconv.Atoi(strings.TrimSpace(parts[2])); e == nil {
|
if idx, e := strconv.Atoi(strings.TrimSpace(parts[2])); e == nil {
|
||||||
f.spotCall[idx] = call
|
f.spotCall[idx] = call
|
||||||
|
f.spotMode[idx] = spotMode
|
||||||
f.spotIdx[idx] = true
|
f.spotIdx[idx] = true
|
||||||
f.spotByCall[strings.ToUpper(call)] = idx
|
f.spotByCall[strings.ToUpper(call)] = idx
|
||||||
}
|
}
|
||||||
@@ -801,6 +812,7 @@ func (f *Flex) handleStatus(payload string) {
|
|||||||
if removed {
|
if removed {
|
||||||
delete(f.spotIdx, idx)
|
delete(f.spotIdx, idx)
|
||||||
delete(f.spotCall, idx)
|
delete(f.spotCall, idx)
|
||||||
|
delete(f.spotMode, idx)
|
||||||
} else {
|
} else {
|
||||||
f.spotIdx[idx] = true
|
f.spotIdx[idx] = true
|
||||||
}
|
}
|
||||||
@@ -1263,6 +1275,7 @@ func (f *Flex) SendSpot(s SpotInfo) error {
|
|||||||
if hadOld {
|
if hadOld {
|
||||||
delete(f.spotByCall, upperCall)
|
delete(f.spotByCall, upperCall)
|
||||||
delete(f.spotCall, old)
|
delete(f.spotCall, old)
|
||||||
|
delete(f.spotMode, old)
|
||||||
delete(f.spotIdx, old)
|
delete(f.spotIdx, old)
|
||||||
}
|
}
|
||||||
f.mu.Unlock()
|
f.mu.Unlock()
|
||||||
@@ -1288,6 +1301,7 @@ func (f *Flex) SendSpot(s SpotInfo) error {
|
|||||||
// (trigger) can be resolved back to the callsign.
|
// (trigger) can be resolved back to the callsign.
|
||||||
f.mu.Lock()
|
f.mu.Lock()
|
||||||
f.pendingSpot[seq] = s.Callsign
|
f.pendingSpot[seq] = s.Callsign
|
||||||
|
f.pendingSpotMode[seq] = s.Mode
|
||||||
f.mu.Unlock()
|
f.mu.Unlock()
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
@@ -1320,6 +1334,7 @@ func (f *Flex) ClearSpots() error {
|
|||||||
f.mu.Lock()
|
f.mu.Lock()
|
||||||
f.spotIdx = map[int]bool{}
|
f.spotIdx = map[int]bool{}
|
||||||
f.spotCall = map[int]string{}
|
f.spotCall = map[int]string{}
|
||||||
|
f.spotMode = map[int]string{}
|
||||||
f.spotByCall = map[string]int{}
|
f.spotByCall = map[string]int{}
|
||||||
connected := f.conn != nil
|
connected := f.conn != nil
|
||||||
f.mu.Unlock()
|
f.mu.Unlock()
|
||||||
|
|||||||
+33
-11
@@ -70,6 +70,15 @@ type Kenwood struct {
|
|||||||
curFreq int64
|
curFreq int64
|
||||||
curRXFreq int64
|
curRXFreq int64
|
||||||
curVFO string // "A" or "B"
|
curVFO string // "A" or "B"
|
||||||
|
// Split is confirmed with FR;/FT; because IF's split bit is empty on some
|
||||||
|
// Kenwood-dialect rigs — but that check is THROTTLED so it doesn't run every
|
||||||
|
// poll: the two extra commands tripled the poll time on a slow K3 and made the
|
||||||
|
// frequency (read from IF at the top of the poll) lag by seconds. Between
|
||||||
|
// checks the last result stands.
|
||||||
|
splitCheckAt time.Time
|
||||||
|
splitCached bool
|
||||||
|
splitVFOCached string
|
||||||
|
keyWPM int // CW keyer speed, for pacing the KY buffer (see kenwood_cw.go)
|
||||||
// Commands this rig answered "?;" to — asked once, then never again.
|
// Commands this rig answered "?;" to — asked once, then never again.
|
||||||
unsupported map[string]bool
|
unsupported map[string]bool
|
||||||
|
|
||||||
@@ -269,18 +278,31 @@ func (k *Kenwood) ReadState() (RigState, error) {
|
|||||||
// this costs two short commands per poll only where it actually works.
|
// this costs two short commands per poll only where it actually works.
|
||||||
split := f.Split
|
split := f.Split
|
||||||
if !split {
|
if !split {
|
||||||
|
// Confirm with FR;/FT; only once a second, not every poll. Running the two
|
||||||
|
// extra commands each cycle tripled the poll time on a slow K3, so the
|
||||||
|
// frequency — already read from IF above — only surfaced every couple of
|
||||||
|
// seconds. Between checks the last FR/FT result stands.
|
||||||
|
if time.Since(k.splitCheckAt) >= time.Second {
|
||||||
|
k.splitCheckAt = time.Now()
|
||||||
|
k.splitCached, k.splitVFOCached = false, ""
|
||||||
rxv, rxOK := k.askVFO("FR;")
|
rxv, rxOK := k.askVFO("FR;")
|
||||||
txv, txOK := k.askVFO("FT;")
|
txv, txOK := k.askVFO("FT;")
|
||||||
if rxOK && txOK && rxv != txv {
|
if rxOK && txOK && rxv != txv {
|
||||||
split = true
|
k.splitCached = true
|
||||||
// Trust FR over IF for which VFO is in use: they were asked in the
|
// Trust FR over IF for which VFO is in use: they were asked in the
|
||||||
// same breath, and a rig that leaves the split bit empty may be just
|
// same breath, and a rig that leaves the split bit empty may be just
|
||||||
// as vague about the VFO field.
|
// as vague about the VFO field. The block below picks the TRANSMIT
|
||||||
// f.VFO too, not just the reported state: the block below picks the
|
// VFO as "the other one" from f.VFO, so leaving them disagreeing
|
||||||
// TRANSMIT VFO as "the other one" from f.VFO, and leaving the two
|
// would read the transmit frequency off the wrong dial.
|
||||||
// disagreeing would read the transmit frequency off the wrong dial.
|
|
||||||
if rxv == "A" || rxv == "B" {
|
if rxv == "A" || rxv == "B" {
|
||||||
k.curVFO, s.Vfo, f.VFO = rxv, rxv, rxv
|
k.splitVFOCached = rxv
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if k.splitCached {
|
||||||
|
split = true
|
||||||
|
if k.splitVFOCached != "" {
|
||||||
|
k.curVFO, s.Vfo, f.VFO = k.splitVFOCached, k.splitVFOCached, k.splitVFOCached
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -529,11 +551,11 @@ func kenwoodModeDigit(mode string, hz int64) byte {
|
|||||||
}
|
}
|
||||||
return '2'
|
return '2'
|
||||||
}
|
}
|
||||||
// Any other digital mode rides on the data sideband, which on Kenwood is
|
// Any other digital mode (FT8, PSK, JT…) rides the DATA input, and by universal
|
||||||
// plain USB/LSB with the rig's DATA input selected.
|
// convention that is ALWAYS the UPPER sideband, on every band. The SSB rule
|
||||||
if hz > 0 && hz < 10_000_000 {
|
// (LSB below 10 MHz) must NOT be applied here: doing so put a 40/80 m data spot
|
||||||
return '1'
|
// on LSB, which an Elecraft K3 shows as "DATA REV" — the reversed sideband.
|
||||||
}
|
// (RTTY/FSK is handled above as its own FSK mode, so it isn't affected.)
|
||||||
return '2'
|
return '2'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,198 @@
|
|||||||
|
package cat
|
||||||
|
|
||||||
|
// CW keying through the Kenwood/Elecraft keyer — the KY command.
|
||||||
|
//
|
||||||
|
// Same idea as the Yaesu KY engine and the Icom / Flex keyers: the radio holds
|
||||||
|
// the text and keys it with its own timing, so an Elecraft K3 (or any rig that
|
||||||
|
// speaks this dialect) needs NO WinKeyer and NO second COM port — the single CAT
|
||||||
|
// link does frequency, mode AND CW. That matters on a K3, whose one USB port is
|
||||||
|
// the CAT port; a separate serial keyer would need a second cable OpsLog can't
|
||||||
|
// give it.
|
||||||
|
//
|
||||||
|
// KY; → KYn; n=0 buffer has room, n=1 buffer full
|
||||||
|
// KY <text>; queue up to 24 characters (the space after KY is part
|
||||||
|
// of the command, not padding)
|
||||||
|
// KS nnn; keyer speed in WPM (three digits)
|
||||||
|
// RX; drop to receive — used to abort a send
|
||||||
|
//
|
||||||
|
// KY is the Elecraft-documented CW-over-CAT path on the K3/K4. A rig that refuses
|
||||||
|
// it answers "?;", which SendCW turns into a stated reason rather than silence.
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// kenwoodCWChunk is the most characters one KY command accepts.
|
||||||
|
const kenwoodCWChunk = 24
|
||||||
|
|
||||||
|
// kenwoodCWAllowed is what the keyer can send; anything else is dropped, since an
|
||||||
|
// unsupported byte can abort the buffer and lose the rest of the message.
|
||||||
|
const kenwoodCWAllowed = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 /?.,-=+:;()"
|
||||||
|
|
||||||
|
// SendCW queues a message on the rig's keyer, fed in 24-character pieces, waiting
|
||||||
|
// for buffer room between pieces so a long macro doesn't lose its tail.
|
||||||
|
func (k *Kenwood) SendCW(text string) error {
|
||||||
|
msg := filterKenwoodCW(text)
|
||||||
|
if msg == "" {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
k.mu.Lock()
|
||||||
|
defer k.mu.Unlock()
|
||||||
|
if k.port == nil {
|
||||||
|
return fmt.Errorf("kenwood: not connected")
|
||||||
|
}
|
||||||
|
for len(msg) > 0 {
|
||||||
|
n := kenwoodCWChunk
|
||||||
|
if len(msg) < n {
|
||||||
|
n = len(msg)
|
||||||
|
}
|
||||||
|
chunk := msg[:n]
|
||||||
|
msg = msg[n:]
|
||||||
|
k.waitCWBuffer(3 * time.Second)
|
||||||
|
if err := k.write("KY " + chunk + ";"); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err := k.afterKY(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
// Pace the next piece by how long this one takes to key, so we never overrun
|
||||||
|
// the 24-character buffer (the rig silently drops what doesn't fit).
|
||||||
|
if len(msg) > 0 {
|
||||||
|
time.Sleep(kenwoodCWDuration(chunk, k.keyerWPM()))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// afterKY reads briefly after a KY write. An accepted KY says nothing; a REJECT
|
||||||
|
// answers "?;". Reading it straight off the port (not through the shared rx
|
||||||
|
// buffer) keeps that stray frame from being picked up by the next poll's ask —
|
||||||
|
// which would mis-mark an unrelated command unsupported and desync the link — and
|
||||||
|
// turns a silent non-transmission into a stated reason. The caller holds k.mu.
|
||||||
|
func (k *Kenwood) afterKY() error {
|
||||||
|
deadline := time.Now().Add(150 * time.Millisecond)
|
||||||
|
tmp := make([]byte, 64)
|
||||||
|
var buf []byte
|
||||||
|
for time.Now().Before(deadline) {
|
||||||
|
n, err := k.port.Read(tmp)
|
||||||
|
if err != nil {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
if n > 0 {
|
||||||
|
buf = append(buf, tmp[:n]...)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if strings.Contains(string(buf), "?;") {
|
||||||
|
return fmt.Errorf("this radio rejected CW over CAT (it answered \"?;\" to KY). " +
|
||||||
|
"Switch the keyer engine to the serial-port keyer (DTR=CW) on a COM port instead")
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// waitCWBuffer blocks until the keyer reports room, or the deadline passes. A rig
|
||||||
|
// that never answers the KY; status query is not a reason to refuse to send — we
|
||||||
|
// go ahead, and the per-chunk pacing covers the worst case. The caller holds k.mu.
|
||||||
|
func (k *Kenwood) waitCWBuffer(within time.Duration) {
|
||||||
|
deadline := time.Now().Add(within)
|
||||||
|
for time.Now().Before(deadline) {
|
||||||
|
if k.unsupported["KY"] {
|
||||||
|
return // this rig doesn't report buffer state — pacing covers it
|
||||||
|
}
|
||||||
|
r, err := k.ask("KY;")
|
||||||
|
if err != nil {
|
||||||
|
return // unsupported / timeout — send anyway, pacing covers it
|
||||||
|
}
|
||||||
|
if !kenwoodCWBufferFull(r) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
time.Sleep(50 * time.Millisecond)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// kenwoodCWBufferFull reads the KY; status reply. Deliberately asymmetric: only a
|
||||||
|
// clear "1" after KY means full. Anything else reads as "go ahead" — refusing to
|
||||||
|
// send because a status line was phrased unexpectedly is the worse failure.
|
||||||
|
func kenwoodCWBufferFull(reply string) bool {
|
||||||
|
r := strings.TrimSpace(reply)
|
||||||
|
if !strings.HasPrefix(strings.ToUpper(r), "KY") {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
for _, c := range r[2:] {
|
||||||
|
switch c {
|
||||||
|
case '0':
|
||||||
|
return false
|
||||||
|
case '1':
|
||||||
|
return true
|
||||||
|
case ' ', ';':
|
||||||
|
continue
|
||||||
|
default:
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
// StopCW aborts the message being sent. Kenwood documents no KY buffer-clear, so
|
||||||
|
// this drops the transmitter — RX; forces receive, which is what an operator
|
||||||
|
// pressing Escape wants; anything still queued is not keyed on the air.
|
||||||
|
func (k *Kenwood) StopCW() error {
|
||||||
|
k.mu.Lock()
|
||||||
|
defer k.mu.Unlock()
|
||||||
|
if k.port == nil {
|
||||||
|
return fmt.Errorf("kenwood: not connected")
|
||||||
|
}
|
||||||
|
return k.write("RX;")
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetKeySpeed sets the keyer speed (WPM) via KS and remembers it for pacing.
|
||||||
|
func (k *Kenwood) SetKeySpeed(wpm int) error {
|
||||||
|
if wpm < 4 {
|
||||||
|
wpm = 4
|
||||||
|
}
|
||||||
|
if wpm > 99 {
|
||||||
|
wpm = 99 // KS is three digits but the K3 keyer tops out well below 100
|
||||||
|
}
|
||||||
|
k.mu.Lock()
|
||||||
|
defer k.mu.Unlock()
|
||||||
|
k.keyWPM = wpm
|
||||||
|
if k.port == nil {
|
||||||
|
return fmt.Errorf("kenwood: not connected")
|
||||||
|
}
|
||||||
|
return k.write(fmt.Sprintf("KS%03d;", wpm))
|
||||||
|
}
|
||||||
|
|
||||||
|
// keyerWPM is the speed to pace the buffer by. The caller holds k.mu.
|
||||||
|
func (k *Kenwood) keyerWPM() int {
|
||||||
|
if k.keyWPM >= 4 {
|
||||||
|
return k.keyWPM
|
||||||
|
}
|
||||||
|
return 20
|
||||||
|
}
|
||||||
|
|
||||||
|
// kenwoodCWDuration estimates how long a piece of text takes to key (PARIS
|
||||||
|
// timing: a character averages 10 dits, a dit is 1.2/wpm seconds).
|
||||||
|
func kenwoodCWDuration(text string, wpm int) time.Duration {
|
||||||
|
if wpm < 4 {
|
||||||
|
wpm = 20
|
||||||
|
}
|
||||||
|
ditMs := 1200.0 / float64(wpm)
|
||||||
|
return time.Duration(float64(len(text))*10*ditMs) * time.Millisecond
|
||||||
|
}
|
||||||
|
|
||||||
|
// filterKenwoodCW upper-cases and strips what the keyer cannot send; whitespace
|
||||||
|
// becomes a single word gap.
|
||||||
|
func filterKenwoodCW(text string) string {
|
||||||
|
var b strings.Builder
|
||||||
|
for _, r := range strings.ToUpper(text) {
|
||||||
|
if r == '\t' || r == '\n' || r == '\r' {
|
||||||
|
b.WriteByte(' ')
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if strings.ContainsRune(kenwoodCWAllowed, r) {
|
||||||
|
b.WriteRune(r)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return strings.Join(strings.Fields(b.String()), " ")
|
||||||
|
}
|
||||||
@@ -300,6 +300,11 @@ func TestKenwoodSplitFromFRFT(t *testing.T) {
|
|||||||
|
|
||||||
// Split on, IF still silent about it: receive on A, transmit on B.
|
// Split on, IF still silent about it: receive on A, transmit on B.
|
||||||
rig.split = true
|
rig.split = true
|
||||||
|
// The FR/FT split re-check is throttled to once a second (it tripled the poll
|
||||||
|
// time on a slow K3), so back-to-back reads reuse the last result. Simulate the
|
||||||
|
// recheck window having elapsed — in the field the 250 ms poll covers it inside
|
||||||
|
// a second.
|
||||||
|
k.splitCheckAt = time.Time{}
|
||||||
if s, err = k.ReadState(); err != nil {
|
if s, err = k.ReadState(); err != nil {
|
||||||
t.Fatalf("read: %v", err)
|
t.Fatalf("read: %v", err)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -100,8 +100,8 @@ func TestKenwoodModeDigit(t *testing.T) {
|
|||||||
{"RTTY", 14080000, '6'},
|
{"RTTY", 14080000, '6'},
|
||||||
{"AM", 7150000, '5'},
|
{"AM", 7150000, '5'},
|
||||||
{"FM", 145000000, '4'},
|
{"FM", 145000000, '4'},
|
||||||
{"FT8", 7074000, '1'}, // data rides on the sideband for the band
|
{"FT8", 7074000, '2'}, // data is ALWAYS USB, even below 10 MHz (K3 "DATA REV" otherwise)
|
||||||
{"FT8", 14074000, '2'},
|
{"FT8", 14074000, '2'}, // …and above
|
||||||
{"", 14074000, 0}, // nothing to set
|
{"", 14074000, 0}, // nothing to set
|
||||||
}
|
}
|
||||||
for _, c := range cases {
|
for _, c := range cases {
|
||||||
|
|||||||
+71
-6
@@ -28,6 +28,12 @@ type TCI struct {
|
|||||||
digitalDefault string // surfaced when the rig reports a digital mode (FT8/…)
|
digitalDefault string // surfaced when the rig reports a digital mode (FT8/…)
|
||||||
spotsEnabled bool // mirror cluster spots onto the TCI panorama
|
spotsEnabled bool // mirror cluster spots onto the TCI panorama
|
||||||
|
|
||||||
|
// OnSpotClick is called when the user clicks one of our spots on the TCI
|
||||||
|
// panorama (callsign + freq), so the host can fill the entry form. Set before
|
||||||
|
// Connect. Mirrors the FlexRadio panadapter-click flow.
|
||||||
|
OnSpotClick func(callsign string, freqHz int64)
|
||||||
|
unhandledSeen map[string]bool // log each unknown TCI message type once
|
||||||
|
|
||||||
mu sync.Mutex // guards conn + writes + state
|
mu sync.Mutex // guards conn + writes + state
|
||||||
conn *websocket.Conn
|
conn *websocket.Conn
|
||||||
dialCancel context.CancelFunc // cancels an in-flight Connect dial (Interrupt/Stop)
|
dialCancel context.CancelFunc // cancels an in-flight Connect dial (Interrupt/Stop)
|
||||||
@@ -110,15 +116,32 @@ func (t *TCI) SendSpot(s SpotInfo) error {
|
|||||||
if call == "" || s.FreqHz <= 0 {
|
if call == "" || s.FreqHz <= 0 {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
color := strings.TrimSpace(s.Color)
|
// TCI's SPOT command wants the colour as a signed 32-bit DECIMAL integer in
|
||||||
if color == "" {
|
// 0xAARRGGBB order — NOT a "0x…" hex string (e.g. "spot:UN7GK,cw,14025000,
|
||||||
color = "#FFFFA500" // opaque orange default
|
// -16776961,test;"). ExpertSDR silently drops a spot whose colour field it
|
||||||
|
// can't parse as a number, which is why spots never showed on the panorama
|
||||||
|
// while tuning (a separate command) still worked.
|
||||||
|
hex := strings.TrimPrefix(strings.TrimPrefix(strings.TrimSpace(s.Color), "#"), "0x")
|
||||||
|
if hex == "" {
|
||||||
|
hex = "FFFFA500" // opaque orange default
|
||||||
|
}
|
||||||
|
if len(hex) == 6 {
|
||||||
|
hex = "FF" + hex // add full-opacity alpha when only RGB was supplied
|
||||||
|
}
|
||||||
|
argb, err := strconv.ParseUint(hex, 16, 32)
|
||||||
|
if err != nil {
|
||||||
|
argb = 0xFFFFA500
|
||||||
|
}
|
||||||
|
// Use a valid TCI modulation (usb/lsb/cw/digl…) so ExpertSDR accepts the spot;
|
||||||
|
// fall back to the raw label if we can't map it. The click-to-tune path already
|
||||||
|
// maps the mode separately, so this only affects the spot's displayed mode.
|
||||||
|
mode := adifToTCIMode(s.Mode, s.FreqHz)
|
||||||
|
if mode == "" {
|
||||||
|
mode = strings.ToLower(strings.TrimSpace(s.Mode))
|
||||||
}
|
}
|
||||||
color = "0x" + strings.TrimPrefix(color, "#")
|
|
||||||
mode := strings.ToLower(strings.TrimSpace(s.Mode))
|
|
||||||
// Commas/semicolons would break TCI's comma-separated argument parsing.
|
// Commas/semicolons would break TCI's comma-separated argument parsing.
|
||||||
text := strings.NewReplacer(",", " ", ";", " ").Replace(s.Comment)
|
text := strings.NewReplacer(",", " ", ";", " ").Replace(s.Comment)
|
||||||
return t.send(fmt.Sprintf("spot:%s,%s,%d,%s,%s;", call, mode, s.FreqHz, color, text))
|
return t.send(fmt.Sprintf("spot:%s,%s,%d,%d,%s;", call, mode, s.FreqHz, int32(argb), text))
|
||||||
}
|
}
|
||||||
|
|
||||||
// Disconnect closes the WebSocket; the reader goroutine then exits.
|
// Disconnect closes the WebSocket; the reader goroutine then exits.
|
||||||
@@ -294,6 +317,48 @@ func (t *TCI) handle(msg string) {
|
|||||||
if get(0) == "0" {
|
if get(0) == "0" {
|
||||||
t.tx = get(1) == "true"
|
t.tx = get(1) == "true"
|
||||||
}
|
}
|
||||||
|
default:
|
||||||
|
lname := strings.ToLower(name)
|
||||||
|
// A click on one of our panorama spots comes back as
|
||||||
|
// CLICKED_ON_SPOT:<call>,<hz> (legacy)
|
||||||
|
// RX_CLICKED_ON_SPOT:<rx>,<ch>,<call>,<hz>
|
||||||
|
// Neither name starts with "spot", which is why the click was silently
|
||||||
|
// ignored before. Read the callsign (the one non-numeric field) and the
|
||||||
|
// frequency (the large numeric field) positionally-independently, so both
|
||||||
|
// shapes work without depending on the exact arg order.
|
||||||
|
if strings.Contains(lname, "spot") {
|
||||||
|
var call string
|
||||||
|
var hz int64
|
||||||
|
for _, raw := range f {
|
||||||
|
v := strings.TrimSpace(raw)
|
||||||
|
if v == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if n, err := strconv.ParseInt(v, 10, 64); err == nil {
|
||||||
|
if n >= 10000 { // a real frequency, not an rx/channel index
|
||||||
|
hz = n
|
||||||
|
}
|
||||||
|
} else if call == "" {
|
||||||
|
call = strings.ToUpper(v) // callsigns always carry letters
|
||||||
|
}
|
||||||
|
}
|
||||||
|
debugLog.Printf("TCI: spot click %q → call=%s freq=%d", msg, call, hz)
|
||||||
|
if call != "" && t.OnSpotClick != nil {
|
||||||
|
cb := t.OnSpotClick
|
||||||
|
go cb(call, hz)
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// Log every OTHER unknown message TYPE once, so the protocol (incl. any
|
||||||
|
// spot-click notification named differently) is discoverable from the log
|
||||||
|
// without flooding it with the frequent streamed messages.
|
||||||
|
if t.unhandledSeen == nil {
|
||||||
|
t.unhandledSeen = map[string]bool{}
|
||||||
|
}
|
||||||
|
if !t.unhandledSeen[lname] {
|
||||||
|
t.unhandledSeen[lname] = true
|
||||||
|
debugLog.Printf("TCI: (unhandled once) %s", msg)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -648,6 +648,18 @@ func parseShowDX(line string) (Spot, bool) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func parseSpot(line string) (Spot, bool) {
|
func parseSpot(line string) (Spot, bool) {
|
||||||
|
// A cluster prints its prompt WITHOUT a trailing newline, so the first spot
|
||||||
|
// to arrive gets glued onto it and the line reads
|
||||||
|
// "login: DX de YO2CK-#: 21074.0 PY4PTO FT8 …". The anchor then fails
|
||||||
|
// and the spot is dropped — silently, apart from an UNPARSED log line.
|
||||||
|
//
|
||||||
|
// Cutting everything ahead of "DX de" rather than un-anchoring the pattern:
|
||||||
|
// an un-anchored match would also accept a talk/announce line that merely
|
||||||
|
// QUOTES a spot, and start injecting other people's conversations as real
|
||||||
|
// spots.
|
||||||
|
if i := strings.Index(line, "DX de"); i > 0 {
|
||||||
|
line = line[i:]
|
||||||
|
}
|
||||||
m := spotRE.FindStringSubmatch(line)
|
m := spotRE.FindStringSubmatch(line)
|
||||||
if m == nil {
|
if m == nil {
|
||||||
return Spot{}, false
|
return Spot{}, false
|
||||||
|
|||||||
@@ -14,6 +14,12 @@ func TestParseSpot(t *testing.T) {
|
|||||||
`DX de DK0SWL: 14195.5 W1AW CQ Field Day 1745Z`,
|
`DX de DK0SWL: 14195.5 W1AW CQ Field Day 1745Z`,
|
||||||
"W1AW", 14195.5, "20m", "",
|
"W1AW", 14195.5, "20m", "",
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
// The cluster prints its prompt with no trailing newline, so the
|
||||||
|
// first spot arrives glued to it. Seen live on 2026-08-02.
|
||||||
|
`login: DX de YO2CK-#: 21074.0 PY4PTO FT8 -16 dB 1733Z`,
|
||||||
|
"PY4PTO", 21074.0, "15m", "",
|
||||||
|
},
|
||||||
{
|
{
|
||||||
`DX de F4XYZ-#: 7074.0 3DA0RU FT8 -10 0823Z JN18`,
|
`DX de F4XYZ-#: 7074.0 3DA0RU FT8 -10 0823Z JN18`,
|
||||||
"3DA0RU", 7074.0, "40m", "JN18",
|
"3DA0RU", 7074.0, "40m", "JN18",
|
||||||
|
|||||||
@@ -86,7 +86,13 @@ type Server struct {
|
|||||||
stopped bool
|
stopped bool
|
||||||
mu sync.Mutex
|
mu sync.Mutex
|
||||||
|
|
||||||
lastDialHz int64 // WSJT: dial freq from the last Status, added to Decode offsets
|
// WSJT: dial frequency from the last Status, added to Decode audio offsets —
|
||||||
|
// keyed by the WSJT-X instance id, NOT one value per listener. Two instances
|
||||||
|
// share one multicast group, so a single value was overwritten by whichever
|
||||||
|
// sent Status last: decodes from the 50.313 receiver were placed on the
|
||||||
|
// 50.400 panadapter. WSJT-X requires --rig-name for a second instance, so the
|
||||||
|
// id is distinct whenever there is more than one.
|
||||||
|
dialHz map[string]int64
|
||||||
lastDX string // WSJT: last non-empty DX Call seen, to detect a clear
|
lastDX string // WSJT: last non-empty DX Call seen, to detect a clear
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -211,15 +217,21 @@ func (s *Server) handle(pkt []byte, remote *net.UDPAddr) {
|
|||||||
// offsets can be turned into RF frequencies for the panadapter.
|
// offsets can be turned into RF frequencies for the panadapter.
|
||||||
if w.FreqHz > 0 && !w.IsDecode {
|
if w.FreqHz > 0 && !w.IsDecode {
|
||||||
s.mu.Lock()
|
s.mu.Lock()
|
||||||
s.lastDialHz = w.FreqHz
|
if s.dialHz == nil {
|
||||||
|
s.dialHz = map[string]int64{}
|
||||||
|
}
|
||||||
|
s.dialHz[w.ProgramID] = w.FreqHz
|
||||||
s.mu.Unlock()
|
s.mu.Unlock()
|
||||||
}
|
}
|
||||||
if w.IsDecode {
|
if w.IsDecode {
|
||||||
s.mu.Lock()
|
s.mu.Lock()
|
||||||
dial := s.lastDialHz
|
dial := s.dialHz[w.ProgramID]
|
||||||
s.mu.Unlock()
|
s.mu.Unlock()
|
||||||
if dial <= 0 {
|
if dial <= 0 {
|
||||||
return // no dial freq yet (Status not seen) → can't place the spot
|
// No Status from THIS instance yet. Guessing with another
|
||||||
|
// instance's dial is what produced the wrong-panadapter spots,
|
||||||
|
// so drop the decode and wait — Status arrives every second.
|
||||||
|
return
|
||||||
}
|
}
|
||||||
ev.DecodeCall = w.DecodeCall
|
ev.DecodeCall = w.DecodeCall
|
||||||
ev.DecodeFreqHz = dial + w.DeltaFreqHz
|
ev.DecodeFreqHz = dial + w.DeltaFreqHz
|
||||||
|
|||||||
@@ -0,0 +1,74 @@
|
|||||||
|
# QRZ.com XML API — what a free account returns, and what a subscription adds
|
||||||
|
|
||||||
|
Captured 2026-08-02 on F4BPO's two accounts, same callsign looked up twice
|
||||||
|
within a minute. Kept because the difference is the answer to a question that
|
||||||
|
comes back regularly: *"someone told me their logger gets the 6-character
|
||||||
|
locator from QRZ without paying"*. It does not.
|
||||||
|
|
||||||
|
## Free account — `SubExp: non-subscriber`
|
||||||
|
|
||||||
|
```xml
|
||||||
|
<Callsign>
|
||||||
|
<call>F4BPO</call>
|
||||||
|
<fname>Gregory</fname>
|
||||||
|
<name>Salaun</name>
|
||||||
|
<addr2>Veigy-Foncenex</addr2>
|
||||||
|
<country>France</country>
|
||||||
|
</Callsign>
|
||||||
|
<Session>
|
||||||
|
<SubExp>non-subscriber</SubExp>
|
||||||
|
<Message>A subscription is required to access the complete record.</Message>
|
||||||
|
</Session>
|
||||||
|
```
|
||||||
|
|
||||||
|
**Five fields.** No `grid`, no `lat`/`lon`, no `dxcc`, no zones, no email, no
|
||||||
|
street, no image.
|
||||||
|
|
||||||
|
## Subscriber — `SubExp: Sat Jul 3 21:45:38 2027`
|
||||||
|
|
||||||
|
```xml
|
||||||
|
<Callsign>
|
||||||
|
<call>F4BPO</call> <dxcc>227</dxcc> <nickname>Greg</nickname>
|
||||||
|
<fname>Gregory</fname> <name>Salaun</name>
|
||||||
|
<addr2>Veigy-Foncenex</addr2><zip>74140</zip> <country>France</country>
|
||||||
|
<lat>46.103333</lat> <lon>6.290000</lon> <grid>JN36dc</grid>
|
||||||
|
<ccode>97</ccode> <land>France</land> <class>2</class>
|
||||||
|
<codes>E</codes> <qslmgr>Lotw, Buro, Direct</qslmgr>
|
||||||
|
<email>…</email> <u_views>56966</u_views>
|
||||||
|
<bio>4414</bio> <biodate>2026-07-08 15:30:58</biodate>
|
||||||
|
<image>https://cdn-xml.qrz.com/o/f4bpo/F4BPO_Greg_png.jpg</image>
|
||||||
|
<imageinfo>800:1200:221041</imageinfo>
|
||||||
|
<moddate>2025-08-24 19:55:31</moddate>
|
||||||
|
<eqsl>0</eqsl> <mqsl>1</mqsl> <lotw>1</lotw>
|
||||||
|
<cqzone>14</cqzone> <ituzone>27</ituzone>
|
||||||
|
<geoloc>user</geoloc> <name_fmt>Gregory "Greg" Salaun</name_fmt>
|
||||||
|
<serial>1000134</serial>
|
||||||
|
</Callsign>
|
||||||
|
```
|
||||||
|
|
||||||
|
## Consequences
|
||||||
|
|
||||||
|
- **A free QRZ account can never fill the locator, the coordinates, the zones
|
||||||
|
or the e-mail.** If someone reports a logger doing it on a free account, they
|
||||||
|
are either using HamQTH (free, returns a 6-character `grid`) or they hold an
|
||||||
|
XML subscription without realising it — the QRZ.com account and the "XML
|
||||||
|
Logbook Data" subscription are sold separately. `SubExp` in the session block
|
||||||
|
settles it in one request.
|
||||||
|
- **Profile edits take a few minutes to reach the XML feed.** Changing the grid
|
||||||
|
on the website and looking the callsign up immediately returns the OLD value,
|
||||||
|
which looks exactly like a stale cache. Re-test after a few minutes before
|
||||||
|
suspecting the logger. (This cost an hour on 2026-08-02.)
|
||||||
|
|
||||||
|
## Fields OpsLog does not use yet
|
||||||
|
|
||||||
|
`qrz.go` maps call, name, addr1/2, zip, state, county, country, grid, lat, lon,
|
||||||
|
dxcc, cqzone, ituzone, cont, email, qslmgr and image. Left on the table:
|
||||||
|
|
||||||
|
- **`geoloc`** — `user` when the operator entered the position by hand, versus a
|
||||||
|
geocoded value derived from the postal address. This is a direct statement of
|
||||||
|
how much the coordinates and the locator can be trusted, and it is exactly
|
||||||
|
the question the grid-precision rule in App.tsx tries to answer by comparing
|
||||||
|
string lengths. Worth wiring if the locator ever misbehaves again.
|
||||||
|
- **`eqsl` / `mqsl` / `lotw`** — the station's QSL preferences as flags, more
|
||||||
|
reliable than parsing the free-text `qslmgr`.
|
||||||
|
- `nickname` / `name_fmt`, `class`, `moddate`, `bio`.
|
||||||
@@ -29,6 +29,13 @@ type Info struct {
|
|||||||
IsUser bool `json:"is_user"`
|
IsUser bool `json:"is_user"`
|
||||||
LastUpload string `json:"last_upload,omitempty"` // YYYY-MM-DD
|
LastUpload string `json:"last_upload,omitempty"` // YYYY-MM-DD
|
||||||
DaysAgo int `json:"days_ago"` // days since last upload (-1 if unknown)
|
DaysAgo int `json:"days_ago"` // days since last upload (-1 if unknown)
|
||||||
|
// FeedDate is the newest upload date anywhere in ARRL's file, i.e. when ARRL
|
||||||
|
// last regenerated it, and FeedStale says that date is more than two days old.
|
||||||
|
// Without them "last uploaded 7 days ago" is unreadable: it may mean the
|
||||||
|
// station went quiet, or that the FEED has been frozen for a week — which is
|
||||||
|
// exactly what ARRL served on 2026-08-02, its newest line dated 2026-07-27.
|
||||||
|
FeedDate string `json:"feed_date,omitempty"`
|
||||||
|
FeedStale bool `json:"feed_stale"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// Manager holds the parsed list + cache location.
|
// Manager holds the parsed list + cache location.
|
||||||
@@ -36,6 +43,7 @@ type Manager struct {
|
|||||||
mu sync.RWMutex
|
mu sync.RWMutex
|
||||||
users map[string]time.Time // UPPER(callsign) → last-upload date (UTC)
|
users map[string]time.Time // UPPER(callsign) → last-upload date (UTC)
|
||||||
updated time.Time // when the cache was last refreshed
|
updated time.Time // when the cache was last refreshed
|
||||||
|
newest time.Time // newest upload date in the file = when ARRL built it
|
||||||
dir string
|
dir string
|
||||||
client *http.Client
|
client *http.Client
|
||||||
}
|
}
|
||||||
@@ -100,6 +108,7 @@ func (m *Manager) Download(ctx context.Context) (int, error) {
|
|||||||
// parse loads the CSV bytes into the map and returns the count.
|
// parse loads the CSV bytes into the map and returns the count.
|
||||||
func (m *Manager) parse(data []byte) int {
|
func (m *Manager) parse(data []byte) int {
|
||||||
users := make(map[string]time.Time, 1<<20)
|
users := make(map[string]time.Time, 1<<20)
|
||||||
|
var newest time.Time
|
||||||
sc := bufio.NewScanner(bytes.NewReader(data))
|
sc := bufio.NewScanner(bytes.NewReader(data))
|
||||||
sc.Buffer(make([]byte, 1024*1024), 1024*1024)
|
sc.Buffer(make([]byte, 1024*1024), 1024*1024)
|
||||||
for sc.Scan() {
|
for sc.Scan() {
|
||||||
@@ -120,16 +129,29 @@ func (m *Manager) parse(data []byte) int {
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
users[call] = t
|
users[call] = t
|
||||||
|
if t.After(newest) {
|
||||||
|
newest = t
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if len(users) == 0 {
|
if len(users) == 0 {
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
m.mu.Lock()
|
m.mu.Lock()
|
||||||
m.users = users
|
m.users = users
|
||||||
|
m.newest = newest
|
||||||
m.mu.Unlock()
|
m.mu.Unlock()
|
||||||
return len(users)
|
return len(users)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// feedInfo fills the feed-age fields shared by every Lookup result.
|
||||||
|
func (m *Manager) feedInfo(i Info) Info {
|
||||||
|
if !m.newest.IsZero() {
|
||||||
|
i.FeedDate = m.newest.Format("2006-01-02")
|
||||||
|
i.FeedStale = time.Since(m.newest) > 48*time.Hour
|
||||||
|
}
|
||||||
|
return i
|
||||||
|
}
|
||||||
|
|
||||||
// Lookup reports whether callsign is a LoTW user and how long ago it uploaded.
|
// Lookup reports whether callsign is a LoTW user and how long ago it uploaded.
|
||||||
// Tries the exact call, then (for portable calls like "EA8/DL1ABC" or "F5ABC/P")
|
// Tries the exact call, then (for portable calls like "EA8/DL1ABC" or "F5ABC/P")
|
||||||
// the longest slash-separated segment — the base call LoTW is keyed on.
|
// the longest slash-separated segment — the base call LoTW is keyed on.
|
||||||
@@ -154,13 +176,13 @@ func (m *Manager) Lookup(callsign string) Info {
|
|||||||
t, ok = m.users[base]
|
t, ok = m.users[base]
|
||||||
}
|
}
|
||||||
if !ok {
|
if !ok {
|
||||||
return Info{DaysAgo: -1}
|
return m.feedInfo(Info{DaysAgo: -1})
|
||||||
}
|
}
|
||||||
days := int(time.Since(t).Hours() / 24)
|
days := int(time.Since(t).Hours() / 24)
|
||||||
if days < 0 {
|
if days < 0 {
|
||||||
days = 0
|
days = 0
|
||||||
}
|
}
|
||||||
return Info{IsUser: true, LastUpload: t.Format("2006-01-02"), DaysAgo: days}
|
return m.feedInfo(Info{IsUser: true, LastUpload: t.Format("2006-01-02"), DaysAgo: days})
|
||||||
}
|
}
|
||||||
|
|
||||||
// Count returns how many callsigns are loaded.
|
// Count returns how many callsigns are loaded.
|
||||||
|
|||||||
@@ -24,7 +24,13 @@ const (
|
|||||||
defaultPort = 9008
|
defaultPort = 9008
|
||||||
dialTimeout = 5 * time.Second
|
dialTimeout = 5 * time.Second
|
||||||
ioTimeout = 3 * time.Second
|
ioTimeout = 3 * time.Second
|
||||||
pollEvery = 1500 * time.Millisecond
|
// Poll fast enough that the amp's OWN forward/current figures make a usable
|
||||||
|
// live meter on their own — the UI prefers them over the FlexRadio VITA stream
|
||||||
|
// (which never traverses a public-IP/NAT link), so this direct reading is what
|
||||||
|
// an operator watches when running the amp over the internet. At 250 ms the
|
||||||
|
// SSB envelope is sampled often enough that peak-hold keeps a steady reading
|
||||||
|
// instead of collapsing to ~1 W in the gaps between syllables.
|
||||||
|
pollEvery = 250 * time.Millisecond
|
||||||
reconnectDelay = 2 * time.Second
|
reconnectDelay = 2 * time.Second
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -52,6 +58,7 @@ type Status struct {
|
|||||||
type Client struct {
|
type Client struct {
|
||||||
host string
|
host string
|
||||||
port int
|
port int
|
||||||
|
password string // remote-access code; sent as "auth <code>" when the banner announces AUTH
|
||||||
|
|
||||||
mu sync.Mutex // serialises command send/recv on the connection
|
mu sync.Mutex // serialises command send/recv on the connection
|
||||||
conn net.Conn
|
conn net.Conn
|
||||||
@@ -70,11 +77,11 @@ type Client struct {
|
|||||||
running bool
|
running bool
|
||||||
}
|
}
|
||||||
|
|
||||||
func New(host string, port int) *Client {
|
func New(host string, port int, password string) *Client {
|
||||||
if port <= 0 || port > 65535 {
|
if port <= 0 || port > 65535 {
|
||||||
port = defaultPort
|
port = defaultPort
|
||||||
}
|
}
|
||||||
return &Client{host: host, port: port, stop: make(chan struct{}), status: Status{Host: host}}
|
return &Client{host: host, port: port, password: strings.TrimSpace(password), stop: make(chan struct{}), status: Status{Host: host}}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *Client) Start() error {
|
func (c *Client) Start() error {
|
||||||
@@ -118,9 +125,15 @@ func (c *Client) SetFanMode(mode string) error {
|
|||||||
default:
|
default:
|
||||||
return fmt.Errorf("powergenius: invalid fan mode %q", mode)
|
return fmt.Errorf("powergenius: invalid fan mode %q", mode)
|
||||||
}
|
}
|
||||||
if _, err := c.command("setup fanmode=" + m); err != nil {
|
// Set with the bare "key=value" verb the amp uses for its own status fields
|
||||||
|
// (same convention as "operate=1"). The earlier "setup fanmode=…" carried a
|
||||||
|
// bogus prefix the amp silently ignored, so the fan never changed and the next
|
||||||
|
// status kept reporting the old mode — the revert-to-Contest the operator saw.
|
||||||
|
reply, err := c.command("fanmode=" + m)
|
||||||
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
applog.Printf("pgxl: set fanmode=%s reply=%q", m, reply)
|
||||||
c.statusMu.Lock()
|
c.statusMu.Lock()
|
||||||
c.status.FanMode = m // optimistic
|
c.status.FanMode = m // optimistic
|
||||||
c.fanPending, c.fanPendingAt = m, time.Now()
|
c.fanPending, c.fanPendingAt = m, time.Now()
|
||||||
@@ -177,12 +190,62 @@ func (c *Client) ensureConnected() error {
|
|||||||
}
|
}
|
||||||
c.conn = conn
|
c.conn = conn
|
||||||
c.reader = bufio.NewReader(conn)
|
c.reader = bufio.NewReader(conn)
|
||||||
// Discard the version banner the device sends on connect.
|
// Banner: "V…" (LAN) or "V… AUTH" (remote → authentication required, exactly
|
||||||
|
// like the Tuner Genius / Antenna Genius). Send the remote code when the amp
|
||||||
|
// demands it, otherwise every command comes back "Unauthorized".
|
||||||
_ = conn.SetReadDeadline(time.Now().Add(ioTimeout))
|
_ = conn.SetReadDeadline(time.Now().Add(ioTimeout))
|
||||||
_, _ = c.reader.ReadString('\n')
|
banner, _ := c.reader.ReadString('\n')
|
||||||
|
banner = strings.TrimSpace(banner)
|
||||||
|
applog.Printf("pgxl: connected %s → %s, banner=%q", conn.LocalAddr(), conn.RemoteAddr(), banner)
|
||||||
|
if strings.Contains(banner, "AUTH") {
|
||||||
|
if c.password == "" {
|
||||||
|
applog.Printf("pgxl: device requires AUTH but no remote code set (Settings → Amplifier)")
|
||||||
|
} else if err := c.authLocked(); err != nil {
|
||||||
|
c.conn.Close()
|
||||||
|
c.conn, c.reader = nil, nil
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// authLocked authenticates the remote link. Must be called with c.mu held
|
||||||
|
// (during ensureConnected). 4O3A boxes want "auth code=<pw>" and reply
|
||||||
|
// "R<seq>|<hex>|" with an EMPTY message — hex "0" means accepted, so the response
|
||||||
|
// CODE decides, not the text. The device also rejects the FIRST attempt (R|FF)
|
||||||
|
// and accepts a retry, so resend a few times before giving up.
|
||||||
|
func (c *Client) authLocked() error {
|
||||||
|
var lastHex string
|
||||||
|
for try := 1; try <= 4; try++ {
|
||||||
|
id := c.cmdID.Add(1)
|
||||||
|
_ = c.conn.SetWriteDeadline(time.Now().Add(ioTimeout))
|
||||||
|
if _, err := fmt.Fprintf(c.conn, "C%d|auth code=%s\n", id, c.password); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
_ = c.conn.SetReadDeadline(time.Now().Add(ioTimeout))
|
||||||
|
line, err := c.reader.ReadString('\n')
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
line = strings.TrimSpace(line)
|
||||||
|
applog.Printf("pgxl: auth reply=%q (try %d)", line, try)
|
||||||
|
hex, msg := "", ""
|
||||||
|
if p := strings.SplitN(line, "|", 3); len(p) >= 2 {
|
||||||
|
hex = strings.TrimSpace(p[1])
|
||||||
|
if len(p) == 3 {
|
||||||
|
msg = strings.TrimSpace(p[2])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// hex "0" is the standard accept; also treat an explicit OK message as success.
|
||||||
|
if hex == "0" || (msg != "" && strings.Contains(strings.ToLower(msg), "ok")) {
|
||||||
|
applog.Printf("pgxl: authenticated")
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
lastHex = hex
|
||||||
|
}
|
||||||
|
return fmt.Errorf("powergenius: authentication failed after 4 tries (R|%s|) — check the remote code", lastHex)
|
||||||
|
}
|
||||||
|
|
||||||
func (c *Client) dropConn() {
|
func (c *Client) dropConn() {
|
||||||
c.mu.Lock()
|
c.mu.Lock()
|
||||||
if c.conn != nil {
|
if c.conn != nil {
|
||||||
@@ -237,9 +300,10 @@ func (c *Client) parse(resp string) {
|
|||||||
c.statusMu.Lock()
|
c.statusMu.Lock()
|
||||||
c.status.Connected = true
|
c.status.Connected = true
|
||||||
c.status.LastError = ""
|
c.status.LastError = ""
|
||||||
// One raw frame per session is enough to learn the field set — the frames
|
// Log the first REAL status frame (one that carries "key=value" fields) so the
|
||||||
// carry live meter values, so "log on change" logged every frame.
|
// field set is visible — even if an earlier reply was junk like "Unauthorized"
|
||||||
if c.lastRaw == "" {
|
// (which would otherwise latch lastRaw and hide the real frame).
|
||||||
|
if strings.Contains(data, "=") && !strings.Contains(c.lastRaw, "=") {
|
||||||
c.lastRaw = data
|
c.lastRaw = data
|
||||||
applog.Printf("pgxl: status raw=%q", data)
|
applog.Printf("pgxl: status raw=%q", data)
|
||||||
}
|
}
|
||||||
|
|||||||
+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.23.1"
|
appVersion = "0.23.3"
|
||||||
|
|
||||||
// posthogHost is the PostHog ingestion endpoint. EU cloud by default; change
|
// posthogHost is the PostHog ingestion endpoint. EU cloud by default; change
|
||||||
// to https://us.i.posthog.com for a US project.
|
// to https://us.i.posthog.com for a US project.
|
||||||
|
|||||||
Reference in New Issue
Block a user