Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2fd9845b37 | ||
|
|
e851bd97e0 | ||
|
|
b487ca1145 | ||
|
|
27b342a5e7 | ||
|
|
c1cd76bbcf | ||
|
|
4a28b51ade | ||
|
|
130c4e72e0 | ||
|
|
980c54a616 | ||
|
|
1201b44908 | ||
|
|
9c7983b13e | ||
|
|
01d0b8f22b | ||
|
|
dad71e9e4f | ||
|
|
fbe01bf19d | ||
|
|
fc79be7c05 | ||
|
|
4c2638a7e5 | ||
|
|
a501366cbf | ||
|
|
afde919e5b | ||
|
|
98c49f6bbc | ||
|
|
8b9c835ca1 | ||
|
|
37b436f543 | ||
|
|
656af9dae4 | ||
|
|
eff412a9a9 | ||
|
|
ff7227af5b | ||
|
|
3013a2ba08 | ||
|
|
de95a437bb | ||
|
|
85872f8379 | ||
|
|
55a643d9a4 | ||
|
|
949b92d7e7 | ||
|
|
37e9e288ba | ||
|
|
2b8ebd73cb | ||
|
|
f9f8380ece | ||
|
|
10e1504531 | ||
|
|
2e3464104d | ||
|
|
dc8f9c5099 | ||
|
|
08905a1680 | ||
|
|
fd939797dd |
@@ -43,6 +43,7 @@ import (
|
|||||||
"hamlog/internal/geo"
|
"hamlog/internal/geo"
|
||||||
"hamlog/internal/gridcache"
|
"hamlog/internal/gridcache"
|
||||||
"hamlog/internal/integrations/udp"
|
"hamlog/internal/integrations/udp"
|
||||||
|
"hamlog/internal/kpa"
|
||||||
"hamlog/internal/lookup"
|
"hamlog/internal/lookup"
|
||||||
"hamlog/internal/lotwusers"
|
"hamlog/internal/lotwusers"
|
||||||
"hamlog/internal/netctl"
|
"hamlog/internal/netctl"
|
||||||
@@ -12738,6 +12739,21 @@ func (a *App) enrichContactedFromCtyForce(q *qso.QSO) bool {
|
|||||||
if a.dxcc == nil || q.Callsign == "" {
|
if a.dxcc == nil || q.Callsign == "" {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
// A DELETED ENTITY IS LEFT ALONE, whatever cty.dat says about the callsign
|
||||||
|
// today.
|
||||||
|
//
|
||||||
|
// cty.dat answers "where is this call now". For a contact made before an
|
||||||
|
// entity was deleted that is the wrong question: R1MVI was Malyj Vysotskij
|
||||||
|
// (151) until 2012 and resolves to European Russia (54) today, so forcing
|
||||||
|
// the lookup onto a 2004 QSO destroys a credit that can never be worked
|
||||||
|
// again — the place does not exist to be worked. Reported from a Logger32
|
||||||
|
// export whose <DXCC:3>151 came back as 54.
|
||||||
|
//
|
||||||
|
// Nothing is corrected here rather than only the number: the country name
|
||||||
|
// and the zones of a deleted entity are equally beyond cty.dat's knowledge.
|
||||||
|
if q.DXCC != nil && dxcc.IsDeleted(*q.DXCC) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
m, ok := a.dxcc.Lookup(q.Callsign)
|
m, ok := a.dxcc.Lookup(q.Callsign)
|
||||||
if !ok || m.Entity == nil {
|
if !ok || m.Entity == nil {
|
||||||
return false
|
return false
|
||||||
@@ -18075,6 +18091,7 @@ type ampInst struct {
|
|||||||
pgxl *powergenius.Client
|
pgxl *powergenius.Client
|
||||||
spe *spe.Client
|
spe *spe.Client
|
||||||
acom *acom.Client
|
acom *acom.Client
|
||||||
|
kpa *kpa.Client
|
||||||
catemu *catemu.Server // Kenwood-format responder for band-follow (ACOM)
|
catemu *catemu.Server // Kenwood-format responder for band-follow (ACOM)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -18088,6 +18105,9 @@ func (i *ampInst) stopAll() {
|
|||||||
if i.acom != nil {
|
if i.acom != nil {
|
||||||
i.acom.Stop()
|
i.acom.Stop()
|
||||||
}
|
}
|
||||||
|
if i.kpa != nil {
|
||||||
|
i.kpa.Stop()
|
||||||
|
}
|
||||||
if i.catemu != nil {
|
if i.catemu != nil {
|
||||||
i.catemu.Stop()
|
i.catemu.Stop()
|
||||||
}
|
}
|
||||||
@@ -18101,7 +18121,9 @@ func ampTypeLabel(t string) string {
|
|||||||
case strings.HasPrefix(t, "spe"):
|
case strings.HasPrefix(t, "spe"):
|
||||||
return "SPE " + map[string]string{"spe13": "1.3K-FA", "spe15": "1.5K-FA", "spe2k": "2K-FA"}[t]
|
return "SPE " + map[string]string{"spe13": "1.3K-FA", "spe15": "1.5K-FA", "spe2k": "2K-FA"}[t]
|
||||||
case strings.HasPrefix(t, "acom"):
|
case strings.HasPrefix(t, "acom"):
|
||||||
return "ACOM " + strings.TrimPrefix(t, "acom") + "S"
|
return "Acom " + strings.TrimPrefix(t, "acom") + "S"
|
||||||
|
case strings.HasPrefix(t, "kpa"):
|
||||||
|
return "Elecraft " + strings.ToUpper(t)
|
||||||
}
|
}
|
||||||
return t
|
return t
|
||||||
}
|
}
|
||||||
@@ -18213,6 +18235,19 @@ func (a *App) startAmps() {
|
|||||||
if a.acom == nil {
|
if a.acom == nil {
|
||||||
a.acom = inst.acom
|
a.acom = inst.acom
|
||||||
}
|
}
|
||||||
|
case strings.HasPrefix(c.Type, "kpa"):
|
||||||
|
// A KPA500 has no network port at all, so a configuration asking for
|
||||||
|
// one is a mistake worth naming rather than a connection that never
|
||||||
|
// succeeds.
|
||||||
|
if strings.EqualFold(c.Type, "kpa500") && c.Transport == "tcp" {
|
||||||
|
applog.Printf("amp %s: a KPA500 has no network connection — use its serial port", c.Name)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
inst.kpa = kpa.New(kpa.Config{
|
||||||
|
Model: strings.ToUpper(c.Type), Transport: c.Transport,
|
||||||
|
ComPort: c.ComPort, Baud: c.Baud, Host: c.Host, Port: c.Port,
|
||||||
|
})
|
||||||
|
_ = inst.kpa.Start()
|
||||||
default: // spe*
|
default: // spe*
|
||||||
inst.spe = spe.New(spe.Config{Transport: c.Transport, ComPort: c.ComPort, Baud: c.Baud, Host: c.Host, Port: c.Port})
|
inst.spe = spe.New(spe.Config{Transport: c.Transport, ComPort: c.ComPort, Baud: c.Baud, Host: c.Host, Port: c.Port})
|
||||||
_ = inst.spe.Start()
|
_ = inst.spe.Start()
|
||||||
@@ -18258,6 +18293,22 @@ func (a *App) feedAmpBandFollow(s cat.RigState) {
|
|||||||
inst.catemu.SetFrequency(s.FreqHz)
|
inst.catemu.SetFrequency(s.FreqHz)
|
||||||
inst.catemu.SetMode(s.Mode)
|
inst.catemu.SetMode(s.Mode)
|
||||||
}
|
}
|
||||||
|
// A KPA is TOLD its band, on the link it is already on.
|
||||||
|
//
|
||||||
|
// The emulator above exists because an Acom polls a transceiver and has
|
||||||
|
// no command to be given a band; the KPA has one (^BN), so it needs
|
||||||
|
// neither a second serial port nor a pretend rig. Sent from a goroutine
|
||||||
|
// because this runs on the CAT state-change path, and nothing about the
|
||||||
|
// rig should wait on an amplifier's link.
|
||||||
|
// Asked for, like every other write to somebody's station. The option is
|
||||||
|
// the same one an Acom uses — "keep the amplifier on the radio's band" is
|
||||||
|
// one idea to an operator, whatever it takes underneath — and it is off
|
||||||
|
// for the operator who has wired the amplifier straight to the rig and
|
||||||
|
// does not want a second voice telling it where to be.
|
||||||
|
if inst.kpa != nil && inst.cfg.FreqOut && s.Band != "" {
|
||||||
|
k, band := inst.kpa, s.Band
|
||||||
|
go func() { _ = k.SetBand(band) }()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -18284,6 +18335,7 @@ type AmpStatus struct {
|
|||||||
PGXL *powergenius.Status `json:"pgxl,omitempty"`
|
PGXL *powergenius.Status `json:"pgxl,omitempty"`
|
||||||
SPE *spe.Status `json:"spe,omitempty"`
|
SPE *spe.Status `json:"spe,omitempty"`
|
||||||
ACOM *acom.Status `json:"acom,omitempty"`
|
ACOM *acom.Status `json:"acom,omitempty"`
|
||||||
|
KPA *kpa.Status `json:"kpa,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetAmpStatuses returns the live state of every ENABLED amplifier, in the
|
// GetAmpStatuses returns the live state of every ENABLED amplifier, in the
|
||||||
@@ -18310,6 +18362,9 @@ func (a *App) GetAmpStatuses() []AmpStatus {
|
|||||||
case inst.acom != nil:
|
case inst.acom != nil:
|
||||||
v := inst.acom.GetStatus()
|
v := inst.acom.GetStatus()
|
||||||
st.ACOM = &v
|
st.ACOM = &v
|
||||||
|
case inst.kpa != nil:
|
||||||
|
v := inst.kpa.GetStatus()
|
||||||
|
st.KPA = &v
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
out = append(out, st)
|
out = append(out, st)
|
||||||
@@ -18391,6 +18446,8 @@ func (a *App) ampOperateOne(id string, on bool) error {
|
|||||||
return inst.spe.Operate(on)
|
return inst.spe.Operate(on)
|
||||||
case inst.acom != nil:
|
case inst.acom != nil:
|
||||||
return inst.acom.Operate(on)
|
return inst.acom.Operate(on)
|
||||||
|
case inst.kpa != nil:
|
||||||
|
return inst.kpa.Operate(on)
|
||||||
}
|
}
|
||||||
return fmt.Errorf("amplifier not running")
|
return fmt.Errorf("amplifier not running")
|
||||||
}
|
}
|
||||||
@@ -18427,6 +18484,11 @@ func (a *App) ampPowerOne(id string, on, linked bool) error {
|
|||||||
return inst.acom.PowerOn()
|
return inst.acom.PowerOn()
|
||||||
}
|
}
|
||||||
return inst.acom.PowerOff()
|
return inst.acom.PowerOff()
|
||||||
|
case inst.kpa != nil:
|
||||||
|
// OFF is a real power-down on a KPA1500: the main supplies drop and the
|
||||||
|
// way back on is the front panel or Wake-on-LAN. The button that reaches
|
||||||
|
// this asks first — see the UI — because "off" here is not standby.
|
||||||
|
return inst.kpa.PowerOn(on)
|
||||||
}
|
}
|
||||||
// Not an error worth surfacing when linked: a PGXL alongside two SPEs simply
|
// Not an error worth surfacing when linked: a PGXL alongside two SPEs simply
|
||||||
// has no power command on its direct link, and reporting that as a failure
|
// has no power command on its direct link, and reporting that as a failure
|
||||||
@@ -18522,7 +18584,7 @@ func (a *App) GetACOMStatus() acom.Status {
|
|||||||
// protocol has explicit commands for each, unlike the SPE's toggle key.
|
// protocol has explicit commands for each, unlike the SPE's toggle key.
|
||||||
func (a *App) ACOMSetOperate(on bool) error {
|
func (a *App) ACOMSetOperate(on bool) error {
|
||||||
if a.acom == nil {
|
if a.acom == nil {
|
||||||
return fmt.Errorf("ACOM amplifier not connected — enable it in Settings → Amplifier")
|
return fmt.Errorf("Acom amplifier not connected — enable it in Settings → Amplifier")
|
||||||
}
|
}
|
||||||
return a.acom.Operate(on)
|
return a.acom.Operate(on)
|
||||||
}
|
}
|
||||||
@@ -18531,7 +18593,7 @@ func (a *App) ACOMSetOperate(on bool) error {
|
|||||||
// the power-on pins wired in the cable) or off (false, the OFF data command).
|
// the power-on pins wired in the cable) or off (false, the OFF data command).
|
||||||
func (a *App) ACOMSetPower(on bool) error {
|
func (a *App) ACOMSetPower(on bool) error {
|
||||||
if a.acom == nil {
|
if a.acom == nil {
|
||||||
return fmt.Errorf("ACOM amplifier not connected — enable it in Settings → Amplifier")
|
return fmt.Errorf("Acom amplifier not connected — enable it in Settings → Amplifier")
|
||||||
}
|
}
|
||||||
if on {
|
if on {
|
||||||
return a.acom.PowerOn()
|
return a.acom.PowerOn()
|
||||||
@@ -20075,7 +20137,27 @@ func (a *App) IsNewUSCounty(state, cnty string) bool {
|
|||||||
// native ones: an operator on OmniRig or Flex gets the same server.
|
// native ones: an operator on OmniRig or Flex gets the same server.
|
||||||
type catShareRig struct{ a *App }
|
type catShareRig struct{ a *App }
|
||||||
|
|
||||||
func (r catShareRig) Freq() int64 { return r.a.cat.State().FreqHz }
|
// Freq is what a rigctl client gets for "f": the frequency of the VFO in use,
|
||||||
|
// which is where we LISTEN.
|
||||||
|
//
|
||||||
|
// This returned FreqHz, and RigState follows ADIF where FreqHz is the TRANSMIT
|
||||||
|
// frequency — so with split on, every client asking "what frequency is the
|
||||||
|
// radio on" was told VFO B. Reported from a station running an IC-7850: turning
|
||||||
|
// VFO B moved VFO A. Nothing in OpsLog was writing to the radio; a client was
|
||||||
|
// reading the dial, being handed the wrong VFO, and writing it back.
|
||||||
|
//
|
||||||
|
// The split TX frequency is a separate question, and Hamlib has a separate
|
||||||
|
// command for it ("i" / get_split_freq) which Split() below answers.
|
||||||
|
func (r catShareRig) Freq() int64 { return shareRXFreq(r.a.cat.State()) }
|
||||||
|
|
||||||
|
// shareRXFreq is that rule on its own, so it can be pinned by a test: it is one
|
||||||
|
// line, it was wrong, and being wrong cost a station its VFO A.
|
||||||
|
func shareRXFreq(st cat.RigState) int64 {
|
||||||
|
if st.Split && st.RxFreqHz > 0 {
|
||||||
|
return st.RxFreqHz
|
||||||
|
}
|
||||||
|
return st.FreqHz
|
||||||
|
}
|
||||||
func (r catShareRig) Mode() string { return r.a.cat.State().Mode }
|
func (r catShareRig) Mode() string { return r.a.cat.State().Mode }
|
||||||
|
|
||||||
// Split reports the flag and the OTHER VFO's frequency. RigState follows ADIF —
|
// Split reports the flag and the OTHER VFO's frequency. RigState follows ADIF —
|
||||||
|
|||||||
@@ -0,0 +1,118 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
// The TCI control console — bindings.
|
||||||
|
//
|
||||||
|
// Thin on purpose: the state is a snapshot the radio pushed and the setters are
|
||||||
|
// one command each. Everything interesting is in internal/cat/tci_panel.go.
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"hamlog/internal/cat"
|
||||||
|
)
|
||||||
|
|
||||||
|
// GetTCIPanel returns the console state. Connected=false when the active CAT
|
||||||
|
// backend is not a TCI radio, so the frontend has one thing to look at rather
|
||||||
|
// than an error to distinguish from a disconnected radio.
|
||||||
|
func (a *App) GetTCIPanel() cat.TCIPanelState {
|
||||||
|
if a.cat == nil {
|
||||||
|
return cat.TCIPanelState{}
|
||||||
|
}
|
||||||
|
st, _ := a.cat.TCIPanelState()
|
||||||
|
return st
|
||||||
|
}
|
||||||
|
|
||||||
|
// tciDo is the shape every setter below takes.
|
||||||
|
func (a *App) tciDo(fn func(cat.TCIPanelController) error) error {
|
||||||
|
if a.cat == nil {
|
||||||
|
return fmt.Errorf("CAT not initialized")
|
||||||
|
}
|
||||||
|
return a.cat.TCIPanelDo(fn)
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetTCIDrive sets the transmit drive (0-100).
|
||||||
|
func (a *App) SetTCIDrive(v int) error {
|
||||||
|
return a.tciDo(func(t cat.TCIPanelController) error { return t.SetDrive(v) })
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetTCITuneDrive sets the drive TUNE uses (0-100).
|
||||||
|
func (a *App) SetTCITuneDrive(v int) error {
|
||||||
|
return a.tciDo(func(t cat.TCIPanelController) error { return t.SetTuneDrive(v) })
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetTCIMicLevel sets the microphone gain (0-100).
|
||||||
|
func (a *App) SetTCIMicLevel(v int) error {
|
||||||
|
return a.tciDo(func(t cat.TCIPanelController) error { return t.SetMicLevel(v) })
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetTCIVolume sets the receive volume in dB (0 down to -60).
|
||||||
|
func (a *App) SetTCIVolume(db int) error {
|
||||||
|
return a.tciDo(func(t cat.TCIPanelController) error { return t.SetVolume(db) })
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetTCIMute mutes or unmutes the receiver.
|
||||||
|
func (a *App) SetTCIMute(on bool) error {
|
||||||
|
return a.tciDo(func(t cat.TCIPanelController) error { return t.SetMute(on) })
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetTCIAGC picks the AGC speed: off, long, slow, med, fast.
|
||||||
|
func (a *App) SetTCIAGC(mode string) error {
|
||||||
|
return a.tciDo(func(t cat.TCIPanelController) error { return t.SetAGC(mode) })
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetTCISquelch turns the squelch on or off.
|
||||||
|
func (a *App) SetTCISquelch(on bool) error {
|
||||||
|
return a.tciDo(func(t cat.TCIPanelController) error { return t.SetSquelch(on) })
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetTCISquelchLevel sets the squelch threshold in dBm.
|
||||||
|
func (a *App) SetTCISquelchLevel(v int) error {
|
||||||
|
return a.tciDo(func(t cat.TCIPanelController) error { return t.SetSquelchLevel(v) })
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetTCINB, SetTCINR, SetTCIANF and SetTCIAPF switch the receive processing.
|
||||||
|
func (a *App) SetTCINB(on bool) error {
|
||||||
|
return a.tciDo(func(t cat.TCIPanelController) error { return t.SetNB(on) })
|
||||||
|
}
|
||||||
|
func (a *App) SetTCINR(on bool) error {
|
||||||
|
return a.tciDo(func(t cat.TCIPanelController) error { return t.SetNR(on) })
|
||||||
|
}
|
||||||
|
func (a *App) SetTCIANF(on bool) error {
|
||||||
|
return a.tciDo(func(t cat.TCIPanelController) error { return t.SetANF(on) })
|
||||||
|
}
|
||||||
|
func (a *App) SetTCIAPF(on bool) error {
|
||||||
|
return a.tciDo(func(t cat.TCIPanelController) error { return t.SetAPF(on) })
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetTCIFilter sets the passband edges in Hz.
|
||||||
|
func (a *App) SetTCIFilter(lo, hi int) error {
|
||||||
|
return a.tciDo(func(t cat.TCIPanelController) error { return t.SetFilter(lo, hi) })
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetTCIRIT / SetTCIXIT switch the offsets on; the Offset calls move them.
|
||||||
|
func (a *App) SetTCIRIT(on bool) error {
|
||||||
|
return a.tciDo(func(t cat.TCIPanelController) error { return t.SetRIT(on) })
|
||||||
|
}
|
||||||
|
func (a *App) SetTCIXIT(on bool) error {
|
||||||
|
return a.tciDo(func(t cat.TCIPanelController) error { return t.SetXIT(on) })
|
||||||
|
}
|
||||||
|
func (a *App) SetTCIRITOffset(hz int) error {
|
||||||
|
return a.tciDo(func(t cat.TCIPanelController) error { return t.SetRITOffset(hz) })
|
||||||
|
}
|
||||||
|
func (a *App) SetTCIXITOffset(hz int) error {
|
||||||
|
return a.tciDo(func(t cat.TCIPanelController) error { return t.SetXITOffset(hz) })
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetTCILock locks the radio's VFO knob.
|
||||||
|
func (a *App) SetTCILock(on bool) error {
|
||||||
|
return a.tciDo(func(t cat.TCIPanelController) error { return t.SetLock(on) })
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetTCITune starts or stops the tune carrier.
|
||||||
|
//
|
||||||
|
// IT TRANSMITS, and at tune_drive rather than at drive — which is why the panel
|
||||||
|
// shows those two numbers next to the button rather than hiding one of them in
|
||||||
|
// a menu.
|
||||||
|
func (a *App) SetTCITune(on bool) error {
|
||||||
|
return a.tciDo(func(t cat.TCIPanelController) error { return t.SetTune(on) })
|
||||||
|
}
|
||||||
@@ -0,0 +1,66 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"hamlog/internal/cat"
|
||||||
|
)
|
||||||
|
|
||||||
|
// What a rigctl client is told when it asks "what frequency is the radio on".
|
||||||
|
//
|
||||||
|
// Hamlib's "f" means the VFO IN USE — where the operator is listening. RigState
|
||||||
|
// follows ADIF, where FreqHz is where we TRANSMIT, and the two are the same
|
||||||
|
// number until split is engaged. They were handed over unchanged, so with split
|
||||||
|
// on every client asking for the dial was given VFO B.
|
||||||
|
//
|
||||||
|
// Reported from a station running an IC-7850 over USB: turning VFO B moved
|
||||||
|
// VFO A. OpsLog was writing nothing to that radio — a client read the dial, was
|
||||||
|
// handed the transmit VFO, and wrote it back as the dial.
|
||||||
|
func TestShareRXFreqAnswersTheListeningVFO(t *testing.T) {
|
||||||
|
const rx, tx = 14195000, 14200500
|
||||||
|
cases := []struct {
|
||||||
|
name string
|
||||||
|
st cat.RigState
|
||||||
|
want int64
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "simplex — the one frequency there is",
|
||||||
|
st: cat.RigState{FreqHz: rx},
|
||||||
|
want: rx,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "split — the RX VFO, not the TX one",
|
||||||
|
st: cat.RigState{Split: true, FreqHz: tx, RxFreqHz: rx},
|
||||||
|
want: rx,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
// A backend that reports split without ever filling RxFreqHz would
|
||||||
|
// otherwise be answered with 0, and a client told the radio is on
|
||||||
|
// 0 Hz does something worse than nothing with it.
|
||||||
|
name: "split claimed but no RX frequency known",
|
||||||
|
st: cat.RigState{Split: true, FreqHz: tx},
|
||||||
|
want: tx,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
for _, c := range cases {
|
||||||
|
t.Run(c.name, func(t *testing.T) {
|
||||||
|
if got := shareRXFreq(c.st); got != c.want {
|
||||||
|
t.Errorf("shareRXFreq(%+v) = %d, want %d", c.st, got, c.want)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// And the pair, stated together: the two questions must not return the same
|
||||||
|
// answer while split is on, or the distinction has been lost somewhere.
|
||||||
|
func TestShareSplitReportsTheOtherVFO(t *testing.T) {
|
||||||
|
st := cat.RigState{Split: true, FreqHz: 14200500, RxFreqHz: 14195000}
|
||||||
|
rxAnswer := shareRXFreq(st)
|
||||||
|
txAnswer := st.FreqHz // what Split() hands back for "i" / get_split_freq
|
||||||
|
if rxAnswer == txAnswer {
|
||||||
|
t.Fatalf("get_freq and get_split_freq both answered %d — a client cannot tell the VFOs apart", rxAnswer)
|
||||||
|
}
|
||||||
|
if rxAnswer != st.RxFreqHz || txAnswer != st.FreqHz {
|
||||||
|
t.Errorf("got rx=%d tx=%d, want rx=%d tx=%d", rxAnswer, txAnswer, st.RxFreqHz, st.FreqHz)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,4 +1,48 @@
|
|||||||
[
|
[
|
||||||
|
{
|
||||||
|
"version": "0.26.18",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"Awards: the band matrix shows the bands you have contacts on — no more, and no longer capped at 70cm. It used to list every band the award permits, so DDFM stood there with empty 6m and 70cm columns, and it could not show 23cm at all whatever the award said.",
|
||||||
|
"Elecraft KPA500 and KPA1500 amplifiers, over serial or — on the KPA1500 — over the network. Operate/standby, on/off, power, SWR, temperature, supply voltage and current, the band, and faults named in plain words rather than as a code. They join the SPE, the Acom and the PowerGenius, so linking several amplifiers works on them too. NEW, AND NOT YET TESTED ON A REAL AMPLIFIER: it is written from Elecraft's programming reference, so please report what it does.",
|
||||||
|
"The Elecraft amplifiers follow the radio's band by themselves, on the link already open — they have a band command of their own, so no second serial port is involved. It can be turned off for an amplifier wired straight to the radio.",
|
||||||
|
"The Light and Voyager maps came up stamped 'API KEY REQUIRED' across the middle. Carto now watermarks its key-free tiles, so both views move to Esri, the provider already behind Street and Satellite. Light looks the same; Voyager is now a topographic map and is named Topo — anyone who had it selected keeps it.",
|
||||||
|
"Ultrabeam / SteppIR over USB: the COM port can be picked from the list again. It used a field you could also type into, and the list could not be selected from at all.",
|
||||||
|
"A control console for SunSDR / ExpertSDR3, as a tab and as a docked pane: drive and tune drive, mic gain, TUNE, power and SWR while transmitting, volume, mute, squelch, NB, NR, ANF, APF in CW, AGC, filters chosen per mode, RIT and XIT, the VFO lock, and an S-meter reading real dBm. Levels can be dragged, scrolled, stepped or typed. It follows the radio's own window — TCI announces every change, whoever made it.",
|
||||||
|
"The Elecraft console can be docked as a main-view pane. It always could; the setting simply never listed it.",
|
||||||
|
"Spot alerts name the right mode. A 30 m FT8 spot raised an alert saying SSB while the cluster list beside it said DATA: the alert engine had its own, coarser band plan, which called everything above 10.130 phone. Both now read the same table, and a frequency the plan does not cover is left unnamed rather than guessed at.",
|
||||||
|
"Awards: editing an award now refreshes its statistics as well as its grid. Changing which confirmations count — LoTW only, LoTW plus cards — left the whole matrix showing the previous rule's numbers, with nothing to say they were stale.",
|
||||||
|
"The DXCC statistics show the Challenge, and say what the two totals mean. The Challenge counts confirmed band-slots on ten bands and 60 m is not one of them — which is the whole of the gap against LoTW's figure. The Total column is entities, the last column is band-slots, and both now say so when hovered.",
|
||||||
|
"Deleted DXCC entities survive an import. A QSO carrying an entity the ARRL has since deleted — Malyj Vysotskij, Czechoslovakia, the German DR and the rest — was being re-stamped from cty.dat, which only knows where a callsign is TODAY: a 2004 R1MVI came back as European Russia and the credit was gone, for a place that can never be worked again. The number in the file is now left alone for those entities."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Diplômes : la matrice des bandes affiche les bandes sur lesquelles on a des contacts — pas davantage, et sans s'arrêter au 70cm. Elle listait toutes les bandes autorisées par le diplôme, si bien que le DDFM restait avec des colonnes 6m et 70cm vides, et ne pouvait pas afficher le 23cm quoi que dise le diplôme.",
|
||||||
|
"Amplificateurs Elecraft KPA500 et KPA1500, en série ou — pour le KPA1500 — par le réseau. Operate/standby, marche/arrêt, puissance, ROS, température, tension et courant d'alimentation, la bande, et les défauts nommés en clair plutôt qu'en code. Ils rejoignent le SPE, l'Acom et le PowerGenius, donc le couplage de plusieurs amplificateurs fonctionne aussi avec eux. NOUVEAU, ET PAS ENCORE TESTÉ SUR UN VRAI AMPLIFICATEUR : c'est écrit d'après la documentation de programmation d'Elecraft, donc merci de signaler ce que ça donne.",
|
||||||
|
"Les amplificateurs Elecraft suivent tout seuls la bande de la radio, sur la liaison déjà ouverte — ils ont leur propre commande de bande, donc aucun second port série n'intervient. Désactivable pour un amplificateur câblé directement à la radio.",
|
||||||
|
"Les cartes Light et Voyager s'affichaient barrées d'un « API KEY REQUIRED ». Carto marque désormais ses tuiles sans clé, donc les deux vues passent chez Esri, le fournisseur déjà derrière Street et Satellite. Light garde son allure ; Voyager devient une carte topographique et s'appelle Topo — ceux qui l'avaient choisie la conservent.",
|
||||||
|
"Ultrabeam / SteppIR en USB : le port COM se choisit à nouveau dans la liste. Le champ était de ceux où l'on peut aussi taper, et la liste ne se laissait pas sélectionner.",
|
||||||
|
"Une console de contrôle pour SunSDR / ExpertSDR3, en onglet et en volet ancré : puissance et puissance d'accord, gain micro, ACCORD, puissance et ROS pendant l'émission, volume, muet, squelch, NB, NR, ANF, APF en CW, AGC, filtres proposés selon le mode, RIT et XIT, verrouillage du VFO, et un S-mètre en vrais dBm. Les niveaux se règlent à la souris, à la molette, par pas ou en tapant la valeur. Elle suit la fenêtre de la radio — TCI annonce chaque changement, quel qu'en soit l'auteur.",
|
||||||
|
"La console Elecraft peut être ancrée comme volet de la vue principale. Elle le pouvait depuis toujours ; le réglage ne la proposait tout simplement pas.",
|
||||||
|
"Les alertes de spot nomment le bon mode. Un spot FT8 sur 30 m déclenchait une alerte annonçant SSB alors que la liste du cluster juste à côté affichait DATA : le moteur d'alertes avait son propre plan de bandes, plus grossier, qui appelait « phonie » tout ce qui dépassait 10,130. Les deux lisent désormais la même table, et une fréquence hors plan reste sans mode plutôt que devinée.",
|
||||||
|
"Diplômes : modifier un diplôme actualise désormais ses statistiques et pas seulement sa grille. Changer les confirmations qui comptent — LoTW seul, LoTW plus cartes — laissait toute la matrice afficher les chiffres de la règle précédente, sans rien pour dire qu'ils étaient périmés.",
|
||||||
|
"Les statistiques DXCC affichent le Challenge et disent ce que sont les deux totaux. Le Challenge compte les créneaux bande confirmés sur dix bandes, dont le 60 m ne fait pas partie — c'est là tout l'écart avec le chiffre de LoTW. La colonne Total, ce sont les entités ; la dernière, les créneaux bande ; les deux le disent au survol.",
|
||||||
|
"Les entités DXCC supprimées survivent à un import. Un QSO portant une entité depuis supprimée par l'ARRL — Malyj Vysotskij, la Tchécoslovaquie, la RDA et les autres — était réécrit d'après cty.dat, qui ne sait que où se trouve un indicatif AUJOURD'HUI : un R1MVI de 2004 revenait en Russie d'Europe et le crédit disparaissait, pour un endroit qu'on ne pourra plus jamais contacter. Le numéro du fichier est désormais conservé pour ces entités."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.26.17",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"Awards, RDA district comparison: each disagreement can now be settled on its own row. Click the district you keep — the log's or the database's — and apply. It is written into the contact's CNTY and its award reference, and the settled rows leave the list.",
|
||||||
|
"The band/mode matrix: a confirmed slot now shows as confirmed. A callsign worked and not confirmed was outranking an entity CONFIRMED on the same band and mode, so a slot that needs nothing was painted as if it still did.",
|
||||||
|
"CAT sharing: a program connected to OpsLog's rigctl server is told the frequency it is LISTENING on. With split engaged it was given the transmit VFO instead, so a client that reads the dial and writes it back — WSJT-X and its like — could move VFO A when VFO B was turned."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Diplômes, comparaison des districts RDA : chaque divergence se règle désormais sur sa propre ligne. Cliquer le district qu'on garde — celui du log ou celui de la base — puis appliquer. Il est écrit dans le CNTY du contact et dans sa référence de diplôme, et les lignes réglées quittent la liste.",
|
||||||
|
"Matrice bandes/modes : une case confirmée s'affiche enfin comme confirmée. Un indicatif travaillé et non confirmé l'emportait sur une entité CONFIRMÉE sur la même bande et le même mode, si bien qu'une case qui ne demandait plus rien était peinte comme s'il manquait encore quelque chose.",
|
||||||
|
"Partage CAT : un programme connecté au serveur rigctl d'OpsLog reçoit la fréquence sur laquelle on ÉCOUTE. En split, c'était le VFO d'émission qui lui était donné, si bien qu'un client qui lit le VFO et le réécrit — WSJT-X et consorts — pouvait déplacer le VFO A quand on tournait le VFO B."
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"version": "0.26.16",
|
"version": "0.26.16",
|
||||||
"date": "",
|
"date": "",
|
||||||
|
|||||||
+21
-2
@@ -78,6 +78,7 @@ import { WorldMap, LocatorMap } from '@/components/MainMap';
|
|||||||
import { FlexPanel } from '@/components/FlexPanel';
|
import { FlexPanel } from '@/components/FlexPanel';
|
||||||
import { IcomPanel } from '@/components/IcomPanel';
|
import { IcomPanel } from '@/components/IcomPanel';
|
||||||
import { YaesuPanel } from '@/components/YaesuPanel';
|
import { YaesuPanel } from '@/components/YaesuPanel';
|
||||||
|
import { TCIPanel } from '@/components/TCIPanel';
|
||||||
import { ElecraftPanel } from '@/components/ElecraftPanel';
|
import { ElecraftPanel } from '@/components/ElecraftPanel';
|
||||||
import { AntGeniusPanel, type AGStatus } from '@/components/AntGeniusPanel';
|
import { AntGeniusPanel, type AGStatus } from '@/components/AntGeniusPanel';
|
||||||
import { MotorAntennaWidget, type AntStatus } from '@/components/MotorAntennaWidget';
|
import { MotorAntennaWidget, type AntStatus } from '@/components/MotorAntennaWidget';
|
||||||
@@ -1920,7 +1921,7 @@ export default function App() {
|
|||||||
// so it's loaded async on mount and re-read on profile:changed below.
|
// so it's loaded async on mount and re-read on profile:changed below.
|
||||||
// 'none' is only ever stored for the third and fourth panes: the first two are
|
// 'none' is only ever stored for the third and fourth panes: the first two are
|
||||||
// the Main view, and a layout with no panes at all is not a layout.
|
// the Main view, and a layout with no panes at all is not a layout.
|
||||||
type MainPaneKind = 'map1' | 'map2' | 'cluster' | 'worked' | 'flex' | 'recent' | 'icom' | 'yaesu' | 'elecraft' | 'netcontrol' | 'decodes' | 'none';
|
type MainPaneKind = 'map1' | 'map2' | 'cluster' | 'worked' | 'flex' | 'recent' | 'icom' | 'yaesu' | 'elecraft' | 'tci' | 'netcontrol' | 'decodes' | 'none';
|
||||||
const [mapZoomSignal, setMapZoomSignal] = useState(0); // bump → world map auto-zooms now
|
const [mapZoomSignal, setMapZoomSignal] = useState(0); // bump → world map auto-zooms now
|
||||||
const [mainPaneLeft, setMainPaneLeft] = useState<MainPaneKind>('map1');
|
const [mainPaneLeft, setMainPaneLeft] = useState<MainPaneKind>('map1');
|
||||||
const [mainPaneRight, setMainPaneRight] = useState<MainPaneKind>('map2');
|
const [mainPaneRight, setMainPaneRight] = useState<MainPaneKind>('map2');
|
||||||
@@ -1931,7 +1932,7 @@ export default function App() {
|
|||||||
// quarter-width map is unreadable.
|
// quarter-width map is unreadable.
|
||||||
const [mainLayout4, setMainLayout4] = useState<'cols' | 'quad'>('quad');
|
const [mainLayout4, setMainLayout4] = useState<'cols' | 'quad'>('quad');
|
||||||
const loadMainPanes = useCallback(async () => {
|
const loadMainPanes = useCallback(async () => {
|
||||||
const valid = (v: string): v is MainPaneKind => v === 'map1' || v === 'map2' || v === 'cluster' || v === 'worked' || v === 'flex' || v === 'recent' || v === 'icom' || v === 'yaesu' || v === 'elecraft' || v === 'netcontrol' || v === 'decodes';
|
const valid = (v: string): v is MainPaneKind => v === 'map1' || v === 'map2' || v === 'cluster' || v === 'worked' || v === 'flex' || v === 'recent' || v === 'icom' || v === 'yaesu' || v === 'elecraft' || v === 'tci' || v === 'netcontrol' || v === 'decodes';
|
||||||
const [l, r, p3, p4, lay] = await Promise.all([
|
const [l, r, p3, p4, lay] = await Promise.all([
|
||||||
GetUIPref('mainPaneLeft').catch(() => ''),
|
GetUIPref('mainPaneLeft').catch(() => ''),
|
||||||
GetUIPref('mainPaneRight').catch(() => ''),
|
GetUIPref('mainPaneRight').catch(() => ''),
|
||||||
@@ -6174,6 +6175,12 @@ export default function App() {
|
|||||||
<ElecraftPanel onReportRST={(r) => { setRstSent(r); rstUserEditedRef.current = true; }} />
|
<ElecraftPanel onReportRST={(r) => { setRstSent(r); rstUserEditedRef.current = true; }} />
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
case 'tci':
|
||||||
|
return (
|
||||||
|
<div className="h-full w-full min-h-0 rounded-lg overflow-hidden border border-border">
|
||||||
|
<TCIPanel onReportRST={(r) => { setRstSent(r); rstUserEditedRef.current = true; }} />
|
||||||
|
</div>
|
||||||
|
);
|
||||||
case 'icom':
|
case 'icom':
|
||||||
return (
|
return (
|
||||||
<div className="h-full w-full min-h-0 rounded-lg overflow-hidden border border-border">
|
<div className="h-full w-full min-h-0 rounded-lg overflow-hidden border border-border">
|
||||||
@@ -7452,6 +7459,7 @@ export default function App() {
|
|||||||
{catState.backend === 'icom' && <TabsTrigger value="icom">Icom Console</TabsTrigger>}
|
{catState.backend === 'icom' && <TabsTrigger value="icom">Icom Console</TabsTrigger>}
|
||||||
{catState.backend === 'yaesu' && <TabsTrigger value="yaesu">Yaesu Console</TabsTrigger>}
|
{catState.backend === 'yaesu' && <TabsTrigger value="yaesu">Yaesu Console</TabsTrigger>}
|
||||||
{(catState.backend === 'elecraft' || catState.backend === 'kenwood') && <TabsTrigger value="elecraft">{t('k3.console')}</TabsTrigger>}
|
{(catState.backend === 'elecraft' || catState.backend === 'kenwood') && <TabsTrigger value="elecraft">{t('k3.console')}</TabsTrigger>}
|
||||||
|
{catState.backend === 'tci' && <TabsTrigger value="tci">{t('tcip.console')}</TabsTrigger>}
|
||||||
{statsTabOpen && (
|
{statsTabOpen && (
|
||||||
<TabsTrigger value="stats" className="gap-1.5">
|
<TabsTrigger value="stats" className="gap-1.5">
|
||||||
{t('stats.tab')}
|
{t('stats.tab')}
|
||||||
@@ -8140,6 +8148,15 @@ export default function App() {
|
|||||||
</TabsContent>
|
</TabsContent>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
{/* The SunSDR console. Everything on it is state the radio pushes
|
||||||
|
over TCI unasked, so unlike the serial consoles it costs nothing
|
||||||
|
to keep open. */}
|
||||||
|
{catState.backend === 'tci' && (
|
||||||
|
<TabsContent value="tci" className="flex-1 min-h-0 p-0">
|
||||||
|
<TCIPanel onReportRST={(r) => { setRstSent(r); rstUserEditedRef.current = true; }} />
|
||||||
|
</TabsContent>
|
||||||
|
)}
|
||||||
|
|
||||||
{catState.backend === 'icom' && (
|
{catState.backend === 'icom' && (
|
||||||
<TabsContent value="icom" className="flex-1 min-h-0 p-0">
|
<TabsContent value="icom" className="flex-1 min-h-0 p-0">
|
||||||
<IcomPanel isNetwork={catBackend === 'icom-net'} onReportRST={(r) => { setRstSent(r); rstUserEditedRef.current = true; }} />
|
<IcomPanel isNetwork={catBackend === 'icom-net'} onReportRST={(r) => { setRstSent(r); rstUserEditedRef.current = true; }} />
|
||||||
@@ -8538,6 +8555,8 @@ export default function App() {
|
|||||||
flexAvailable={catState.backend === 'flex'}
|
flexAvailable={catState.backend === 'flex'}
|
||||||
icomAvailable={catState.backend === 'icom'}
|
icomAvailable={catState.backend === 'icom'}
|
||||||
yaesuAvailable={catState.backend === 'yaesu'}
|
yaesuAvailable={catState.backend === 'yaesu'}
|
||||||
|
elecraftAvailable={catState.backend === 'elecraft' || catState.backend === 'kenwood'}
|
||||||
|
tciAvailable={catState.backend === 'tci'}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ function powerLevelLabel(pl?: string): string {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
type Amp = { id: string; name: string; type?: string; spe?: any; acom?: any; pgxl?: any };
|
type Amp = { id: string; name: string; type?: string; spe?: any; acom?: any; kpa?: any; pgxl?: any };
|
||||||
|
|
||||||
export function AmpCard({ amp, flex, t }: { amp: Amp; flex: any; t: (k: string, v?: any) => string }) {
|
export function AmpCard({ amp, flex, t }: { amp: Amp; flex: any; t: (k: string, v?: any) => string }) {
|
||||||
// Peak-hold so the jittery VITA-49 meters read steadily (own ref per card).
|
// Peak-hold so the jittery VITA-49 meters read steadily (own ref per card).
|
||||||
@@ -64,6 +64,7 @@ export function AmpCard({ amp, flex, t }: { amp: Amp; flex: any; t: (k: string,
|
|||||||
|
|
||||||
const isSPE = !!amp.spe;
|
const isSPE = !!amp.spe;
|
||||||
const isACOM = !!amp.acom;
|
const isACOM = !!amp.acom;
|
||||||
|
const isKPA = !!amp.kpa;
|
||||||
|
|
||||||
if (isSPE) {
|
if (isSPE) {
|
||||||
const spe = amp.spe;
|
const spe = amp.spe;
|
||||||
@@ -127,7 +128,7 @@ export function AmpCard({ amp, flex, t }: { amp: Amp; flex: any; t: (k: string,
|
|||||||
if (isACOM) {
|
if (isACOM) {
|
||||||
const acom = amp.acom;
|
const acom = amp.acom;
|
||||||
return (
|
return (
|
||||||
<Card icon={Flame} ckey="amplifier" title={`${t('flxp.amplifier')} · ${amp.name || `ACOM${acom.model ? ' ' + acom.model : ''}`}`} accent="#ea580c">
|
<Card icon={Flame} ckey="amplifier" title={`${t('flxp.amplifier')} · ${amp.name || `Acom${acom.model ? ' ' + acom.model : ''}`}`} accent="#ea580c">
|
||||||
<div className="flex items-center gap-3 flex-wrap">
|
<div className="flex items-center gap-3 flex-wrap">
|
||||||
<button type="button" disabled={!acom.connected}
|
<button type="button" disabled={!acom.connected}
|
||||||
onClick={() => AmpOperate(amp.id, !acom.operate).catch(() => {})}
|
onClick={() => AmpOperate(amp.id, !acom.operate).catch(() => {})}
|
||||||
@@ -168,6 +169,53 @@ export function AmpCard({ amp, flex, t }: { amp: Amp; flex: any; t: (k: string,
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (isKPA) {
|
||||||
|
const kpa = amp.kpa;
|
||||||
|
return (
|
||||||
|
<Card icon={Flame} ckey="amplifier" title={`${t('flxp.amplifier')} · ${amp.name || kpa.model || 'Elecraft'}`} accent="#ea580c">
|
||||||
|
<div className="flex items-center gap-3 flex-wrap">
|
||||||
|
<button type="button" disabled={!kpa.connected}
|
||||||
|
onClick={() => AmpOperate(amp.id, !kpa.operate).catch(() => {})}
|
||||||
|
title={kpa.fault_text ? t('flxp.kpaClearsFault') : undefined}
|
||||||
|
className={cn('px-4 py-2 rounded-lg text-sm font-extrabold tracking-wide border-2 transition-all disabled:opacity-30',
|
||||||
|
kpa.operate ? 'bg-warning text-warning-foreground border-warning shadow-[0_0_14px] shadow-warning/50' : 'bg-card text-warning border-warning hover:bg-warning-muted')}>
|
||||||
|
{kpa.operate ? 'OPERATE' : 'STANDBY'}
|
||||||
|
</button>
|
||||||
|
{/* The amplifier answers while its main supplies are off — a sleeping
|
||||||
|
microcontroller stays awake for exactly that — so ON is offered
|
||||||
|
over the network as well, unlike the SPE and Acom. */}
|
||||||
|
<div className="inline-flex rounded-lg overflow-hidden border-2 border-success/70">
|
||||||
|
<button type="button" disabled={!kpa.connected}
|
||||||
|
onClick={() => AmpPower(amp.id, true).catch(() => {})}
|
||||||
|
className="px-3 py-2 text-sm font-bold bg-card text-success hover:bg-success/15 disabled:opacity-30">ON</button>
|
||||||
|
<button type="button" disabled={!kpa.connected}
|
||||||
|
onClick={() => AmpPower(amp.id, false).catch(() => {})}
|
||||||
|
className="px-3 py-2 text-sm font-bold bg-card text-danger border-l-2 border-success/70 hover:bg-danger/15 disabled:opacity-30">OFF</button>
|
||||||
|
</div>
|
||||||
|
<span className={cn('inline-flex items-center gap-1.5 text-sm', kpa.connected ? 'text-muted-foreground' : 'text-danger')}>
|
||||||
|
<span className={cn('size-2 rounded-full', kpa.connected ? 'bg-success' : 'bg-danger')} />
|
||||||
|
{kpa.connected ? (kpa.tuning ? t('flxp.kpaTuning') : (kpa.power_on ? 'ON' : 'OFF')) : t('flxp.acomOffline')}
|
||||||
|
</span>
|
||||||
|
{kpa.connected && (
|
||||||
|
<span className="text-sm font-mono text-muted-foreground tabular-nums">
|
||||||
|
{kpa.band ? `${kpa.band} · ` : ''}{kpa.fwd_w}W · SWR {Number(kpa.swr ?? 0).toFixed(1)} · {kpa.temp_c}°C · {kpa.volt_v}V {kpa.cur_a}A
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
<div className="flex-1" />
|
||||||
|
{kpa.fault_text && (
|
||||||
|
<span className="px-2 py-1 rounded bg-danger-muted text-danger-muted-foreground text-xs font-bold">⚠ {kpa.fault_text}</span>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
{kpa.connected && (
|
||||||
|
<MeterBar label={t('flxp.outputPower')} value={Number(kpa.fwd_w) || 0} unit="W"
|
||||||
|
lo={0} hi={String(kpa.model).includes('500') ? 500 : 1500}
|
||||||
|
display={`${Number(kpa.fwd_w) || 0} W`}
|
||||||
|
segColor={(f) => (f > 0.9 ? '#dc2626' : f > 0.75 ? '#f59e0b' : '#ea580c')} />
|
||||||
|
)}
|
||||||
|
</Card>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
// PowerGenius XL — OPERATE + meters ride on the Flex; fan mode on the GSCP link.
|
// PowerGenius XL — OPERATE + meters ride on the Flex; fan mode on the GSCP link.
|
||||||
const pg = amp.pgxl || {};
|
const pg = amp.pgxl || {};
|
||||||
const viaFlex = !!flex?.amp_available;
|
const viaFlex = !!flex?.amp_available;
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ import { AmpOperate, AmpPower, AmpPowerLevel, AmpFanMode, FlexAmpOperate } from
|
|||||||
// With several amplifiers configured the caller passes a selection ("all" or an
|
// With several amplifiers configured the caller passes a selection ("all" or an
|
||||||
// amp id) chosen from the toolbar icon's dropdown.
|
// amp id) chosen from the toolbar icon's dropdown.
|
||||||
|
|
||||||
type Amp = { id: string; name: string; type?: string; spe?: any; acom?: any; pgxl?: any };
|
type Amp = { id: string; name: string; type?: string; spe?: any; acom?: any; kpa?: any; pgxl?: any };
|
||||||
|
|
||||||
// Full-scale watts for the output bar, from the model string.
|
// Full-scale watts for the output bar, from the model string.
|
||||||
function maxW(model?: string, fallback = 1300): number {
|
function maxW(model?: string, fallback = 1300): number {
|
||||||
@@ -92,27 +92,39 @@ function OperateButton({ operate, disabled, onClick, t }: {
|
|||||||
function AmpBlock({ amp, flex, showName, t }: {
|
function AmpBlock({ amp, flex, showName, t }: {
|
||||||
amp: Amp; flex: any; showName: boolean; t: (k: string, v?: any) => string;
|
amp: Amp; flex: any; showName: boolean; t: (k: string, v?: any) => string;
|
||||||
}) {
|
}) {
|
||||||
const spe = amp.spe, acom = amp.acom;
|
const spe = amp.spe, acom = amp.acom, kpaAmp = amp.kpa;
|
||||||
const hold = usePeakHold();
|
const hold = usePeakHold();
|
||||||
|
|
||||||
if (spe || acom) {
|
// One block for the three amplifiers OpsLog drives over its own link. They
|
||||||
const s = spe || acom;
|
// report the same handful of things under different names, so the differences
|
||||||
|
// are named here rather than spread through the markup.
|
||||||
|
if (spe || acom || kpaAmp) {
|
||||||
|
const s = spe || acom || kpaAmp;
|
||||||
// The amp reports zero watts on receive, so its TX flag clears the meter as
|
// The amp reports zero watts on receive, so its TX flag clears the meter as
|
||||||
// soon as the operator lets go — and the radio's own flag, when we have one,
|
// soon as the operator lets go — and the radio's own flag, when we have one,
|
||||||
// gets there first (the amp is polled on its own slower cycle).
|
// gets there first (the amp is polled on its own slower cycle).
|
||||||
const txing = typeof flex?.transmitting === 'boolean' ? flex.transmitting : s.tx !== false;
|
const txing = typeof flex?.transmitting === 'boolean' ? flex.transmitting : s.tx !== false;
|
||||||
const w = hold('w', Number(spe ? s.output_w : s.fwd_w) || 0, txing);
|
const w = hold('w', Number(spe ? s.output_w : s.fwd_w) || 0, txing);
|
||||||
const swr = Number(spe ? s.swr_ant : s.swr) || 0;
|
const swr = Number(spe ? s.swr_ant : s.swr) || 0;
|
||||||
const hi = spe ? maxW(s.model) : (Number(s.max_w) || 800);
|
// The full-scale mark. A KPA500 reading against a 1500 W scale would look
|
||||||
|
// idle at full output, so the model decides it.
|
||||||
|
const hi = spe ? maxW(s.model)
|
||||||
|
: kpaAmp ? (String(s.model).includes('500') ? 500 : 1500)
|
||||||
|
: (Number(s.max_w) || 800);
|
||||||
// Power ON drives the remote-on control lines, so it stays available while
|
// Power ON drives the remote-on control lines, so it stays available while
|
||||||
// the amplifier is off and reporting nothing — but only over a serial link.
|
// the amplifier is off and reporting nothing — but only over a serial link.
|
||||||
const canPowerOn = spe ? (s.connected || s.transport === 'serial') : (s.port_open && s.transport === 'serial');
|
// A KPA answers ^ON while its main supplies are off — the sleeping
|
||||||
|
// microcontroller stays awake for exactly that — so power-on is available
|
||||||
|
// whenever the link itself is up, over serial and over the network alike.
|
||||||
|
const canPowerOn = spe ? (s.connected || s.transport === 'serial')
|
||||||
|
: kpaAmp ? !!s.connected
|
||||||
|
: (s.port_open && s.transport === 'serial');
|
||||||
return (
|
return (
|
||||||
<div className="h-full flex flex-col gap-1.5">
|
<div className="h-full flex flex-col gap-1.5">
|
||||||
{showName && (
|
{showName && (
|
||||||
<div className="flex items-center gap-1.5">
|
<div className="flex items-center gap-1.5">
|
||||||
<span className={cn('size-1.5 rounded-full shrink-0', s.connected ? 'bg-success shadow-[0_0_6px_rgba(16,185,129,0.8)]' : 'bg-danger')} />
|
<span className={cn('size-1.5 rounded-full shrink-0', s.connected ? 'bg-success shadow-[0_0_6px_rgba(16,185,129,0.8)]' : 'bg-danger')} />
|
||||||
<span className="text-[10px] font-bold uppercase tracking-wider truncate">{amp.name || (spe ? 'SPE' : 'ACOM')}</span>
|
<span className="text-[10px] font-bold uppercase tracking-wider truncate">{amp.name || (spe ? 'SPE' : kpaAmp ? (s.model || 'KPA') : 'Acom')}</span>
|
||||||
{s.connected && s.band && <span className="ml-auto text-[9px] text-muted-foreground shrink-0">{s.band}</span>}
|
{s.connected && s.band && <span className="ml-auto text-[9px] text-muted-foreground shrink-0">{s.band}</span>}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
@@ -155,11 +167,17 @@ function AmpBlock({ amp, flex, showName, t }: {
|
|||||||
) : (
|
) : (
|
||||||
<div className="text-[10px] text-center text-muted-foreground italic py-1">{t('ampw.offline')}</div>
|
<div className="text-[10px] text-center text-muted-foreground italic py-1">{t('ampw.offline')}</div>
|
||||||
)}
|
)}
|
||||||
{(s.warnings || s.alarms || s.err_text) && (
|
{(s.warnings || s.alarms || s.err_text || s.fault_text) && (
|
||||||
<div className="rounded-md border border-danger-border bg-danger-muted text-danger-muted-foreground text-[9px] px-1.5 py-0.5 text-center break-words">
|
<div className="rounded-md border border-danger-border bg-danger-muted text-danger-muted-foreground text-[9px] px-1.5 py-0.5 text-center break-words">
|
||||||
{s.err_text || `${s.warnings || ''} ${s.alarms || ''}`.trim()}
|
{s.fault_text || s.err_text || `${s.warnings || ''} ${s.alarms || ''}`.trim()}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
{/* Said where the fault is read, because it is the way out of it: on a
|
||||||
|
KPA, going to OPERATE clears the current fault — everything except
|
||||||
|
temperature, which clears by cooling. */}
|
||||||
|
{kpaAmp && s.fault_text && (
|
||||||
|
<div className="text-[9px] text-center text-muted-foreground">{t('ampw.kpaClear')}</div>
|
||||||
|
)}
|
||||||
<PowerMeter label={t('flxp.outputPower')} watts={s.connected ? w : 0} maxWatts={hi} />
|
<PowerMeter label={t('flxp.outputPower')} watts={s.connected ? w : 0} maxWatts={hi} />
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -29,7 +29,32 @@ type AwardResult = {
|
|||||||
type AwardStatRow = { label: string; cells: number[]; total: number; grand_total: number };
|
type AwardStatRow = { label: string; cells: number[]; total: number; grand_total: number };
|
||||||
type AwardStats = { code: string; bands: string[]; rows: AwardStatRow[] };
|
type AwardStats = { code: string; bands: string[]; rows: AwardStatRow[] };
|
||||||
|
|
||||||
// Fixed band columns for the matrix view (Log4OM-style).
|
// Every band the matrix can show, in the order they belong in.
|
||||||
|
//
|
||||||
|
// The columns are the intersection of this with what the award covers, so a
|
||||||
|
// band missing HERE cannot appear at all whatever the award says — which is how
|
||||||
|
// DDFM, a French award worked well into the microwaves, ended at 70cm with no
|
||||||
|
// 23cm column and no way to ask for one.
|
||||||
|
//
|
||||||
|
// Mirrors bandOrder in internal/award — the same list in frequency order. The
|
||||||
|
// two are kept apart because they answer different questions (that one sorts an
|
||||||
|
// award's own band counts, this one lays out columns), but a band added to one
|
||||||
|
// belongs in the other.
|
||||||
|
// The DXCC Challenge counts one point per CONFIRMED entity per band, over ten
|
||||||
|
// bands — and 60 m is NOT one of them. That is the whole of the gap an operator
|
||||||
|
// notices between OpsLog and LoTW: 3229 here against 3004 there, and 224 of the
|
||||||
|
// difference is the 60 m column.
|
||||||
|
//
|
||||||
|
// Worked out from the confirmed row rather than asked of the backend, because
|
||||||
|
// that row IS the answer: the Challenge is its sum over these ten bands.
|
||||||
|
const CHALLENGE_BANDS = ['160m', '80m', '40m', '30m', '20m', '17m', '15m', '12m', '10m', '6m'];
|
||||||
|
|
||||||
|
const ALL_BANDS = ['2190m','630m','160m','80m','60m','40m','30m','20m','17m','15m','12m','10m',
|
||||||
|
'6m','4m','2m','1.25m','70cm','33cm','23cm','13cm','9cm','6cm','3cm','1.25cm','6mm','4mm','2.5mm','2mm','1mm'];
|
||||||
|
|
||||||
|
// What to show when there is nothing to narrow it down: an award with no band
|
||||||
|
// list and no contacts yet. The classic set — the whole of ALL_BANDS would be
|
||||||
|
// twenty-nine columns of mostly nothing.
|
||||||
const GRID_BANDS = ['160m','80m','60m','40m','30m','20m','17m','15m','12m','10m','6m','2m','70cm'];
|
const GRID_BANDS = ['160m','80m','60m','40m','30m','20m','17m','15m','12m','10m','6m','2m','70cm'];
|
||||||
|
|
||||||
// Per-band status for a reference, highest first.
|
// Per-band status for a reference, highest first.
|
||||||
@@ -180,26 +205,46 @@ export function AwardsPanel({ onEditQSO, onAwardsChanged, onPaperQSL }: {
|
|||||||
useEffect(() => { if (selected) compute(selected); /* eslint-disable-next-line react-hooks/exhaustive-deps */ }, [modeFilter]);
|
useEffect(() => { if (selected) compute(selected); /* eslint-disable-next-line react-hooks/exhaustive-deps */ }, [modeFilter]);
|
||||||
|
|
||||||
// Bands relevant to the selected award, used by BOTH the grid and the stats
|
// Bands relevant to the selected award, used by BOTH the grid and the stats
|
||||||
// matrix so neither is padded with bands the award doesn't use. Rule: the
|
// matrix so neither is padded with bands nothing was worked on. Rule: the
|
||||||
// award's explicit valid_bands if it has any (e.g. WAPC = 40/20/15/10m); else
|
// bands this operator HAS contacts on for this award; failing that, the
|
||||||
// the bands the operator actually has contacts on (so DXCC, which has no band
|
// award's own list of permitted bands. Empty set = no basis at all → callers
|
||||||
// restriction, shows 160m–6m instead of empty VHF/UHF columns). Empty set =
|
// fall back to the classic columns.
|
||||||
// no basis yet → callers fall back to all bands.
|
|
||||||
const awardBands = useMemo(() => {
|
const awardBands = useMemo(() => {
|
||||||
const vb = (awardList.find((a) => a.code === selected)?.bands ?? []).map((b) => b.toLowerCase());
|
// The bands with CONTACTS on them come first, whatever the award declares.
|
||||||
if (vb.length > 0) return new Set(vb);
|
//
|
||||||
const worked = (current?.bands ?? [])
|
// It used to take the declared list when there was one, which put up a
|
||||||
|
// column for every band the award permits — DDFM allows 6m and 70cm, so
|
||||||
|
// both stood there empty on a station that has never worked a French
|
||||||
|
// department on either. An always-blank column reads as a gap in the log
|
||||||
|
// rather than as a band the operator never tried.
|
||||||
|
const worked = new Set((current?.bands ?? [])
|
||||||
.filter((b) => (b.worked ?? 0) > 0)
|
.filter((b) => (b.worked ?? 0) > 0)
|
||||||
.map((b) => String(b.band).toLowerCase());
|
.map((b) => String(b.band).toLowerCase()));
|
||||||
return new Set(worked);
|
if (worked.size > 0) return worked;
|
||||||
|
// Nothing worked yet: the award's own list is the honest answer — it says
|
||||||
|
// what this award is played on, which is the only thing there is to show.
|
||||||
|
return new Set((awardList.find((a) => a.code === selected)?.bands ?? []).map((b) => b.toLowerCase()));
|
||||||
}, [awardList, selected, current]);
|
}, [awardList, selected, current]);
|
||||||
|
|
||||||
const gridBands = useMemo(() => {
|
const gridBands = useMemo(() => {
|
||||||
if (awardBands.size === 0) return GRID_BANDS;
|
if (awardBands.size === 0) return GRID_BANDS;
|
||||||
const filtered = GRID_BANDS.filter((b) => awardBands.has(b));
|
// Filtered from ALL_BANDS, so a band the award covers gets its column even
|
||||||
|
// when it is one the classic set never listed.
|
||||||
|
const filtered = ALL_BANDS.filter((b) => awardBands.has(b));
|
||||||
return filtered.length ? filtered : GRID_BANDS;
|
return filtered.length ? filtered : GRID_BANDS;
|
||||||
}, [awardBands]);
|
}, [awardBands]);
|
||||||
|
|
||||||
|
const challenge = useMemo(() => {
|
||||||
|
if (!stats || selected.toUpperCase() !== 'DXCC') return null;
|
||||||
|
const row = stats.rows.find((r) => r.label === 'CONFIRMED');
|
||||||
|
if (!row) return null;
|
||||||
|
let total = 0;
|
||||||
|
stats.bands.forEach((b, i) => {
|
||||||
|
if (CHALLENGE_BANDS.includes(String(b).toLowerCase())) total += Number(row.cells[i]) || 0;
|
||||||
|
});
|
||||||
|
return total;
|
||||||
|
}, [stats, selected]);
|
||||||
|
|
||||||
// Stats rows to show: drop the mode-category rows (CW / DIGITAL / PHONE) the
|
// Stats rows to show: drop the mode-category rows (CW / DIGITAL / PHONE) the
|
||||||
// award doesn't cover. The "ALL" rows (no suffix) always show; a category row
|
// award doesn't cover. The "ALL" rows (no suffix) always show; a category row
|
||||||
// shows only when the award has no emission restriction or lists that emission.
|
// shows only when the award has no emission restriction or lists that emission.
|
||||||
@@ -319,7 +364,13 @@ export function AwardsPanel({ onEditQSO, onAwardsChanged, onPaperQSL }: {
|
|||||||
{t('awp.rescan')}
|
{t('awp.rescan')}
|
||||||
</Button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
<AwardEditor open={editing} onClose={() => setEditing(false)} onSaved={() => { setByCode({}); loadList(); onAwardsChanged?.(); }} />
|
{/* setRescanTick as well as setByCode. The grid was refreshed on save
|
||||||
|
and the statistics matrix was not, so changing which confirmations
|
||||||
|
count — LoTW only, LoTW plus cards — left the whole table showing
|
||||||
|
the previous rule's numbers with nothing to say they were stale.
|
||||||
|
That is how a setting comes to look as though it does nothing. */}
|
||||||
|
<AwardEditor open={editing} onClose={() => setEditing(false)}
|
||||||
|
onSaved={() => { setByCode({}); setRescanTick((t) => t + 1); loadList(); onAwardsChanged?.(); }} />
|
||||||
{/* Quick selector — scales when there are many awards. */}
|
{/* Quick selector — scales when there are many awards. */}
|
||||||
{awardList.length > 0 && (
|
{awardList.length > 0 && (
|
||||||
<div className="px-2 py-2 border-b border-border/40">
|
<div className="px-2 py-2 border-b border-border/40">
|
||||||
@@ -473,8 +524,8 @@ export function AwardsPanel({ onEditQSO, onAwardsChanged, onPaperQSL }: {
|
|||||||
<tr className="bg-card">
|
<tr className="bg-card">
|
||||||
<th className="sticky left-0 z-20 bg-card text-left py-1.5 pr-3 font-medium border-b border-border">{t('awp.statistic')}</th>
|
<th className="sticky left-0 z-20 bg-card text-left py-1.5 pr-3 font-medium border-b border-border">{t('awp.statistic')}</th>
|
||||||
{statsBandIdx.map((i) => <th key={stats.bands[i]} className="py-1.5 px-1 font-mono font-medium border-b border-border text-center w-11">{stats.bands[i]}</th>)}
|
{statsBandIdx.map((i) => <th key={stats.bands[i]} className="py-1.5 px-1 font-mono font-medium border-b border-border text-center w-11">{stats.bands[i]}</th>)}
|
||||||
<th className="py-1.5 px-2 font-medium border-b border-border text-center">{t('awp.total')}</th>
|
<th className="py-1.5 px-2 font-medium border-b border-border text-center" title={t('awp.totalHint')}>{t('awp.total')}</th>
|
||||||
<th className="py-1.5 px-2 font-medium border-b border-border text-center">{t('awp.grand')}</th>
|
<th className="py-1.5 px-2 font-medium border-b border-border text-center" title={t('awp.grandHint')}>{t('awp.grand')}</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
@@ -493,6 +544,19 @@ export function AwardsPanel({ onEditQSO, onAwardsChanged, onPaperQSL }: {
|
|||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
</tbody>
|
</tbody>
|
||||||
|
{challenge !== null && (
|
||||||
|
<tfoot>
|
||||||
|
<tr>
|
||||||
|
<td className="sticky left-0 bg-card py-1.5 pr-3 font-semibold whitespace-nowrap" title={t('awp.challengeHint')}>
|
||||||
|
{t('awp.challenge')}
|
||||||
|
</td>
|
||||||
|
<td colSpan={statsBandIdx.length} className="py-1.5 text-[11px] text-muted-foreground">
|
||||||
|
{t('awp.challengeBands')}
|
||||||
|
</td>
|
||||||
|
<td className="text-center py-1.5 px-2 font-mono font-bold text-success" colSpan={2}>{challenge}</td>
|
||||||
|
</tr>
|
||||||
|
</tfoot>
|
||||||
|
)}
|
||||||
</table>
|
</table>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -14,6 +14,8 @@ import {
|
|||||||
import { cn } from '@/lib/utils';
|
import { cn } from '@/lib/utils';
|
||||||
import { useI18n } from '@/lib/i18n';
|
import { useI18n } from '@/lib/i18n';
|
||||||
import { sMeterRST } from '@/lib/rst';
|
import { sMeterRST } from '@/lib/rst';
|
||||||
|
import { MeterBar } from '@/components/MeterBar';
|
||||||
|
import { ShiftRow } from '@/components/ShiftRow';
|
||||||
|
|
||||||
type IcomState = {
|
type IcomState = {
|
||||||
available: boolean; model?: string; mode?: string;
|
available: boolean; model?: string; mode?: string;
|
||||||
@@ -248,39 +250,6 @@ function Meter({ label, value, accent, scale, onClick, title }: { label: string;
|
|||||||
return <div className="flex items-center gap-2">{body}</div>;
|
return <div className="flex items-center gap-2">{body}</div>;
|
||||||
}
|
}
|
||||||
|
|
||||||
// ShiftRow — a RIT / ΔTX offset control: on/off chip + a wheel-adjustable signed
|
|
||||||
// offset (±10 Hz per notch or per ± button) + a clear (0) button.
|
|
||||||
function ShiftRow({ label, on, hz, accent, onToggle, onDelta, onClear }: {
|
|
||||||
label: string; on: boolean; hz: number; accent: string;
|
|
||||||
onToggle: () => void; onDelta: (d: number) => void; onClear: () => void;
|
|
||||||
}) {
|
|
||||||
const ref = useRef<HTMLDivElement>(null);
|
|
||||||
const cb = useRef(onDelta); cb.current = onDelta;
|
|
||||||
useEffect(() => {
|
|
||||||
const el = ref.current;
|
|
||||||
if (!el) return;
|
|
||||||
const onWheel = (e: WheelEvent) => { e.preventDefault(); cb.current(e.deltaY < 0 ? 10 : -10); };
|
|
||||||
el.addEventListener('wheel', onWheel, { passive: false });
|
|
||||||
return () => el.removeEventListener('wheel', onWheel);
|
|
||||||
}, []);
|
|
||||||
return (
|
|
||||||
<div className="flex items-center gap-2">
|
|
||||||
<Chip on={on} onClick={onToggle} label={label} />
|
|
||||||
<div ref={ref} title="Wheel / ± to shift"
|
|
||||||
className={cn('flex-1 flex items-center justify-between rounded-md border px-1 py-0.5 select-none cursor-ns-resize',
|
|
||||||
on ? 'border-border bg-muted/40' : 'border-border/60 bg-muted/20 opacity-60')}>
|
|
||||||
<button type="button" onClick={() => onDelta(-10)} className="px-2 text-sm font-bold text-muted-foreground hover:text-foreground">−</button>
|
|
||||||
<span className="text-sm font-mono font-bold tabular-nums" style={{ color: on ? accent : undefined }}>
|
|
||||||
{hz > 0 ? '+' : hz < 0 ? '−' : ''}{Math.abs(hz)} Hz
|
|
||||||
</span>
|
|
||||||
<button type="button" onClick={() => onDelta(10)} className="px-2 text-sm font-bold text-muted-foreground hover:text-foreground">+</button>
|
|
||||||
</div>
|
|
||||||
<button type="button" onClick={onClear}
|
|
||||||
className="w-8 shrink-0 py-1 rounded-md text-[11px] font-bold border border-border bg-card text-muted-foreground hover:bg-muted">0</button>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
// sParts turns the raw 0-100 S-meter into S-unit + dB-over-S9 (S9 ≈ 47% on the
|
// sParts turns the raw 0-100 S-meter into S-unit + dB-over-S9 (S9 ≈ 47% on the
|
||||||
// CI-V 0-255 scale, +60 dB near full scale). Used for both the display label and
|
// CI-V 0-255 scale, +60 dB near full scale). Used for both the display label and
|
||||||
// the RST-tx value on click.
|
// the RST-tx value on click.
|
||||||
@@ -797,10 +766,10 @@ export function IcomPanel({ onReportRST, isNetwork = false }: { onReportRST?: (r
|
|||||||
<Card icon={SlidersHorizontal} title={t('icmp.clarifiers')} accent="#8b5cf6">
|
<Card icon={SlidersHorizontal} title={t('icmp.clarifiers')} accent="#8b5cf6">
|
||||||
<ShiftRow label="RIT" accent="#8b5cf6" on={st.rit_on} hz={st.rit_hz}
|
<ShiftRow label="RIT" accent="#8b5cf6" on={st.rit_on} hz={st.rit_hz}
|
||||||
onToggle={() => set({ rit_on: !st.rit_on }, () => IcomSetRITOn(!st.rit_on))}
|
onToggle={() => set({ rit_on: !st.rit_on }, () => IcomSetRITOn(!st.rit_on))}
|
||||||
onDelta={(d) => setRit(st.rit_hz + d)} onClear={() => setRit(0)} />
|
onSet={setRit} />
|
||||||
<ShiftRow label="ΔTX" accent="#f59e0b" on={st.xit_on} hz={st.rit_hz}
|
<ShiftRow label="ΔTX" accent="#f59e0b" on={st.xit_on} hz={st.rit_hz}
|
||||||
onToggle={() => set({ xit_on: !st.xit_on }, () => IcomSetXITOn(!st.xit_on))}
|
onToggle={() => set({ xit_on: !st.xit_on }, () => IcomSetXITOn(!st.xit_on))}
|
||||||
onDelta={(d) => setRit(st.rit_hz + d)} onClear={() => setRit(0)} />
|
onSet={setRit} />
|
||||||
<p className="text-[11px] text-muted-foreground">{t('icmp.ritHint')}</p>
|
<p className="text-[11px] text-muted-foreground">{t('icmp.ritHint')}</p>
|
||||||
</Card>
|
</Card>
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,72 @@
|
|||||||
|
import { useState } from 'react';
|
||||||
|
import { cn } from '@/lib/utils';
|
||||||
|
import { WheelRange } from '@/components/WheelRange';
|
||||||
|
|
||||||
|
// LevelRow — a named level with a slider, a value you can type into, and ±.
|
||||||
|
//
|
||||||
|
// Shared, like ShiftRow, and for the same complaint: the consoles each drew
|
||||||
|
// their levels their own way. This is the wide shape — one row per level, the
|
||||||
|
// slider taking the width it needs — rather than two half-width sliders side by
|
||||||
|
// side, which is what "c'est laid et elles sont toutes petites" was about.
|
||||||
|
//
|
||||||
|
// Four ways to move it, so nobody has to learn ours: drag, wheel over the
|
||||||
|
// track, ± for one step, or click the number and type. Typing matters for the
|
||||||
|
// levels TCI reports in real units — a squelch at -95 dBm is a value an
|
||||||
|
// operator knows, not a position to hunt for with a mouse.
|
||||||
|
export function LevelRow({
|
||||||
|
label, value, min = 0, max = 100, step = 1, unit = '', accent, disabled, onSet,
|
||||||
|
}: {
|
||||||
|
label: string;
|
||||||
|
value: number;
|
||||||
|
min?: number;
|
||||||
|
max?: number;
|
||||||
|
step?: number;
|
||||||
|
unit?: string;
|
||||||
|
accent?: string;
|
||||||
|
disabled?: boolean;
|
||||||
|
onSet: (v: number) => void;
|
||||||
|
}) {
|
||||||
|
const [editing, setEditing] = useState<string | null>(null);
|
||||||
|
const clamp = (v: number) => Math.max(min, Math.min(max, v));
|
||||||
|
const commit = (raw: string) => {
|
||||||
|
setEditing(null);
|
||||||
|
const v = parseInt(raw.replace(/[^0-9+-]/g, ''), 10);
|
||||||
|
if (!Number.isNaN(v)) onSet(clamp(v));
|
||||||
|
};
|
||||||
|
return (
|
||||||
|
<div className="flex items-center gap-3">
|
||||||
|
<span className="w-24 shrink-0 text-[11px] font-bold uppercase tracking-wider text-muted-foreground">
|
||||||
|
{label}
|
||||||
|
</span>
|
||||||
|
<WheelRange
|
||||||
|
min={min} max={max} step={step} value={value} disabled={disabled} accent={accent}
|
||||||
|
onChange={onSet}
|
||||||
|
className="h-2.5 flex-1 [&::-webkit-slider-thumb]:size-4"
|
||||||
|
/>
|
||||||
|
<div className={cn('flex items-center gap-0.5 shrink-0', disabled && 'opacity-40')}>
|
||||||
|
<button type="button" disabled={disabled} onClick={() => onSet(clamp(value - step))}
|
||||||
|
className="px-1.5 text-sm font-bold text-muted-foreground hover:text-foreground disabled:opacity-40">−</button>
|
||||||
|
{editing !== null ? (
|
||||||
|
<input
|
||||||
|
autoFocus
|
||||||
|
value={editing}
|
||||||
|
onChange={(e) => setEditing(e.target.value)}
|
||||||
|
onBlur={(e) => commit(e.target.value)}
|
||||||
|
onKeyDown={(e) => {
|
||||||
|
if (e.key === 'Enter') commit((e.target as HTMLInputElement).value);
|
||||||
|
else if (e.key === 'Escape') setEditing(null);
|
||||||
|
}}
|
||||||
|
className="w-14 rounded border border-border bg-background px-1 text-right text-xs font-mono tabular-nums outline-none"
|
||||||
|
/>
|
||||||
|
) : (
|
||||||
|
<button type="button" disabled={disabled} onClick={() => setEditing(String(value))}
|
||||||
|
className="w-14 text-right text-xs font-mono tabular-nums hover:text-primary disabled:cursor-default">
|
||||||
|
{value}{unit}
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
<button type="button" disabled={disabled} onClick={() => onSet(clamp(value + step))}
|
||||||
|
className="px-1.5 text-sm font-bold text-muted-foreground hover:text-foreground disabled:opacity-40">+</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -42,8 +42,18 @@ function unwrapLon(ring: [number, number][]): [number, number][] {
|
|||||||
return out;
|
return out;
|
||||||
}
|
}
|
||||||
|
|
||||||
const CARTO_LIGHT = 'https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}{r}.png';
|
// CARTO IS GONE, and it went the same way OpenStreetMap did.
|
||||||
const CARTO_ATTR = '© OpenStreetMap © CARTO';
|
//
|
||||||
|
// Their key-free basemaps now serve tiles stamped "API KEY REQUIRED" across
|
||||||
|
// the middle of the map — reported by an operator whose Light and Voyager views
|
||||||
|
// came up watermarked. They still answer 200 with a real image, which is why
|
||||||
|
// nothing here could detect it: the map looks like it is working and simply
|
||||||
|
// says otherwise in large grey letters.
|
||||||
|
//
|
||||||
|
// So both are replaced by Esri layers, the same provider already behind Street
|
||||||
|
// and Satellite. That is deliberate: a second key-free provider is a second
|
||||||
|
// chance to be cut off, and this one has already been serving the other two
|
||||||
|
// views for as long as OpsLog has had a map.
|
||||||
|
|
||||||
// NOT tile.openstreetmap.org. Those are OpenStreetMap's VOLUNTEER-run servers,
|
// NOT tile.openstreetmap.org. Those are OpenStreetMap's VOLUNTEER-run servers,
|
||||||
// and their usage policy does not cover a desktop application handed to an
|
// and their usage policy does not cover a desktop application handed to an
|
||||||
@@ -55,17 +65,33 @@ const CARTO_ATTR = '© OpenStreetMap © CARTO';
|
|||||||
// still credits OpenStreetMap) and Esri. Anything added here later must be
|
// still credits OpenStreetMap) and Esri. Anything added here later must be
|
||||||
// checked the same way — a free tile URL is not the same thing as a tile URL we
|
// checked the same way — a free tile URL is not the same thing as a tile URL we
|
||||||
// are allowed to ship.
|
// are allowed to ship.
|
||||||
const ESRI_STREET = 'https://server.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer/tile/{z}/{y}/{x}';
|
const ESRI = 'https://server.arcgisonline.com/ArcGIS/rest/services';
|
||||||
|
const ESRI_STREET = ESRI + '/World_Street_Map/MapServer/tile/{z}/{y}/{x}';
|
||||||
const ESRI_STREET_ATTR = 'Tiles © Esri — Source: Esri, HERE, Garmin, © OpenStreetMap contributors';
|
const ESRI_STREET_ATTR = 'Tiles © Esri — Source: Esri, HERE, Garmin, © OpenStreetMap contributors';
|
||||||
|
|
||||||
|
// The plain background the old Carto "Light" was: a pale canvas that lets the
|
||||||
|
// paths and the spots carry the colour. Its names come on a separate
|
||||||
|
// transparent layer, the same arrangement the satellite view already uses.
|
||||||
|
const ESRI_LIGHT = ESRI + '/Canvas/World_Light_Gray_Base/MapServer/tile/{z}/{y}/{x}';
|
||||||
|
const ESRI_LIGHT_LABELS = ESRI + '/Canvas/World_Light_Gray_Reference/MapServer/tile/{z}/{y}/{x}';
|
||||||
|
const ESRI_LIGHT_ATTR = 'Tiles © Esri — Esri, DeLorme, NAVTEQ';
|
||||||
|
|
||||||
// Selectable basemaps for the world (great-circle) map. All key-free and all
|
// Selectable basemaps for the world (great-circle) map. All key-free and all
|
||||||
// LABELLED (country/continent names). `labelsUrl` adds a transparent place-name
|
// LABELLED (country/continent names). `labelsUrl` adds a transparent place-name
|
||||||
// overlay on top of an imagery basemap (so satellite keeps its names too).
|
// overlay on top of an imagery basemap (so satellite keeps its names too).
|
||||||
export type BasemapKey = 'light' | 'voyager' | 'street' | 'satellite';
|
export type BasemapKey = 'light' | 'voyager' | 'street' | 'satellite';
|
||||||
export const BASEMAPS: Record<BasemapKey, { label: string; url: string; attr: string; subdomains?: string; labelsUrl?: string }> = {
|
// maxNativeZoom is where a layer RUNS OUT of tiles. Leaflet then upscales the
|
||||||
light: { label: 'Light', url: CARTO_LIGHT, attr: CARTO_ATTR, subdomains: 'abcd' },
|
// last real one instead of asking for a level that does not exist, which is the
|
||||||
voyager: { label: 'Voyager', url: 'https://{s}.basemaps.cartocdn.com/rastertiles/voyager/{z}/{x}/{y}{r}.png',
|
// difference between a slightly soft map and a blank grey square: the light
|
||||||
attr: CARTO_ATTR, subdomains: 'abcd' },
|
// canvas stops at 16 where the imagery and the topo go on to 19.
|
||||||
|
export const BASEMAPS: Record<BasemapKey, { label: string; url: string; attr: string; subdomains?: string; labelsUrl?: string; maxNativeZoom?: number }> = {
|
||||||
|
light: { label: 'Light', url: ESRI_LIGHT, attr: ESRI_LIGHT_ATTR, labelsUrl: ESRI_LIGHT_LABELS, maxNativeZoom: 16 },
|
||||||
|
// The key is still "voyager" so that everyone who chose it keeps their view
|
||||||
|
// rather than being silently moved to another one. What it draws is Esri's
|
||||||
|
// topographic map: terrain under the labels, which is what made Voyager worth
|
||||||
|
// choosing over the plain canvas.
|
||||||
|
voyager: { label: 'Topo', url: ESRI + '/World_Topo_Map/MapServer/tile/{z}/{y}/{x}',
|
||||||
|
attr: 'Tiles © Esri — Esri, HERE, Garmin, USGS, NGA, © OpenStreetMap contributors' },
|
||||||
street: { label: 'Street', url: ESRI_STREET, attr: ESRI_STREET_ATTR },
|
street: { label: 'Street', url: ESRI_STREET, attr: ESRI_STREET_ATTR },
|
||||||
satellite: { label: 'Satellite', url: 'https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}',
|
satellite: { label: 'Satellite', url: 'https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}',
|
||||||
attr: 'Tiles © Esri — Source: Esri, Maxar, Earthstar Geographics',
|
attr: 'Tiles © Esri — Source: Esri, Maxar, Earthstar Geographics',
|
||||||
@@ -100,7 +126,8 @@ export function addBasemap(
|
|||||||
if (labels.current) { m.removeLayer(labels.current); labels.current = null; }
|
if (labels.current) { m.removeLayer(labels.current); labels.current = null; }
|
||||||
const bm = BASEMAPS[key];
|
const bm = BASEMAPS[key];
|
||||||
const tileOpts: L.TileLayerOptions = {
|
const tileOpts: L.TileLayerOptions = {
|
||||||
maxZoom: 19, updateWhenIdle: true, updateWhenZooming: false, keepBuffer: 1,
|
maxZoom: 19, maxNativeZoom: bm.maxNativeZoom ?? 19,
|
||||||
|
updateWhenIdle: true, updateWhenZooming: false, keepBuffer: 1,
|
||||||
noWrap: !!opts?.noWrap,
|
noWrap: !!opts?.noWrap,
|
||||||
...(opts?.bounds ? { bounds: opts.bounds } : {}),
|
...(opts?.bounds ? { bounds: opts.bounds } : {}),
|
||||||
};
|
};
|
||||||
@@ -448,8 +475,12 @@ export function LocatorMap({ toGrid, toLabel }: LocatorProps) {
|
|||||||
// single ring of buffer tiles. Requesting tiles as fast as the pointer
|
// single ring of buffer tiles. Requesting tiles as fast as the pointer
|
||||||
// moves is what gets an app blocked, and the next provider is under no
|
// moves is what gets an app blocked, and the next provider is under no
|
||||||
// more obligation to tolerate it than the last one was.
|
// more obligation to tolerate it than the last one was.
|
||||||
L.tileLayer(CARTO_LIGHT, {
|
L.tileLayer(ESRI_LIGHT, {
|
||||||
attribution: CARTO_ATTR, subdomains: 'abcd', maxZoom: 19,
|
attribution: ESRI_LIGHT_ATTR, maxZoom: 19, maxNativeZoom: 16,
|
||||||
|
updateWhenIdle: true, updateWhenZooming: false, keepBuffer: 1,
|
||||||
|
}).addTo(m);
|
||||||
|
L.tileLayer(ESRI_LIGHT_LABELS, {
|
||||||
|
maxZoom: 19, maxNativeZoom: 16,
|
||||||
updateWhenIdle: true, updateWhenZooming: false, keepBuffer: 1,
|
updateWhenIdle: true, updateWhenZooming: false, keepBuffer: 1,
|
||||||
}).addTo(m);
|
}).addTo(m);
|
||||||
locatorOverlay.current = L.layerGroup().addTo(m);
|
locatorOverlay.current = L.layerGroup().addTo(m);
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ import {
|
|||||||
ListProfiles, GetActiveProfile, SaveProfile, DeleteProfile, ActivateProfile, DuplicateProfile,
|
ListProfiles, GetActiveProfile, SaveProfile, DeleteProfile, ActivateProfile, DuplicateProfile,
|
||||||
GetRotators, SaveRotators, TestRotatorDevice, RotatorPark, RotatorStop,
|
GetRotators, SaveRotators, TestRotatorDevice, RotatorPark, RotatorStop,
|
||||||
GetRotorPresets, SaveRotorPresets, ResetRotorPresets,
|
GetRotorPresets, SaveRotorPresets, ResetRotorPresets,
|
||||||
GetUltrabeamSettings, SaveUltrabeamSettings, TestUltrabeam, CompactDatabase, CheckHamlogKey, CompareRDASources,
|
GetUltrabeamSettings, SaveUltrabeamSettings, TestUltrabeam, CompactDatabase, CheckHamlogKey, CompareRDASources, ApplyRDAChoices,
|
||||||
GetAntGeniusSettings, SaveAntGeniusSettings,
|
GetAntGeniusSettings, SaveAntGeniusSettings,
|
||||||
GetTunerGeniusSettings, SaveTunerGeniusSettings,
|
GetTunerGeniusSettings, SaveTunerGeniusSettings,
|
||||||
GetPSUSettings, SavePSUSettings,
|
GetPSUSettings, SavePSUSettings,
|
||||||
@@ -175,6 +175,8 @@ interface Props {
|
|||||||
flexAvailable?: boolean; // CAT backend is FlexRadio → offer it as a Main pane
|
flexAvailable?: boolean; // CAT backend is FlexRadio → offer it as a Main pane
|
||||||
icomAvailable?: boolean; // CAT backend is Icom → offer the Icom console as a Main pane
|
icomAvailable?: boolean; // CAT backend is Icom → offer the Icom console as a Main pane
|
||||||
yaesuAvailable?: boolean; // CAT backend is Yaesu → offer the Yaesu console as a Main pane
|
yaesuAvailable?: boolean; // CAT backend is Yaesu → offer the Yaesu console as a Main pane
|
||||||
|
elecraftAvailable?: boolean; // CAT backend is Elecraft/Kenwood → the K3/K4 console
|
||||||
|
tciAvailable?: boolean; // CAT backend is TCI → the SunSDR console
|
||||||
// Opens a QSO in the editor. Settings is not where a log is edited — but the
|
// Opens a QSO in the editor. Settings is not where a log is edited — but the
|
||||||
// RDA comparison lists contacts whose district is in dispute, and a list of
|
// RDA comparison lists contacts whose district is in dispute, and a list of
|
||||||
// things to fix that cannot be acted on is a list to write down and look up
|
// things to fix that cannot be acted on is a list to write down and look up
|
||||||
@@ -905,9 +907,10 @@ function AmpStatusCard({ id }: { id: string }) {
|
|||||||
const t = window.setInterval(tick, 1000);
|
const t = window.setInterval(tick, 1000);
|
||||||
return () => { alive = false; window.clearInterval(t); };
|
return () => { alive = false; window.clearInterval(t); };
|
||||||
}, [id]);
|
}, [id]);
|
||||||
const st: any = amp?.spe ?? amp?.acom ?? amp?.pgxl ?? { connected: false };
|
const st: any = amp?.spe ?? amp?.acom ?? amp?.kpa ?? amp?.pgxl ?? { connected: false };
|
||||||
const isSPE = !!amp?.spe;
|
const isSPE = !!amp?.spe;
|
||||||
const isACOM = !!amp?.acom;
|
const isACOM = !!amp?.acom;
|
||||||
|
const isKPA = !!amp?.kpa;
|
||||||
const operate = !!st.operate;
|
const operate = !!st.operate;
|
||||||
return (
|
return (
|
||||||
<div className="rounded-md border border-border p-3 space-y-2 text-xs max-w-xl">
|
<div className="rounded-md border border-border p-3 space-y-2 text-xs max-w-xl">
|
||||||
@@ -948,7 +951,23 @@ function AmpStatusCard({ id }: { id: string }) {
|
|||||||
{st.err_text && <div className="col-span-4 text-warning">⚠ {st.err_text} ({st.err_code})</div>}
|
{st.err_text && <div className="col-span-4 text-warning">⚠ {st.err_text} ({st.err_code})</div>}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
{st.connected && !isSPE && !isACOM && (
|
{st.connected && isKPA && (
|
||||||
|
<div className="grid grid-cols-4 gap-x-3 gap-y-1 font-mono text-[11px]">
|
||||||
|
<div>{st.power_on ? 'ON' : 'OFF'}</div>
|
||||||
|
<div>Band {st.band || '—'}</div>
|
||||||
|
<div>{st.fwd_w} W</div>
|
||||||
|
<div>SWR {Number(st.swr ?? 0).toFixed(1)}</div>
|
||||||
|
<div>{st.volt_v} V</div>
|
||||||
|
<div>{st.cur_a} A</div>
|
||||||
|
<div>{st.temp_c}°C</div>
|
||||||
|
<div>{st.tuning ? 'TUNING' : ''}</div>
|
||||||
|
{/* A fault has already put the amplifier in standby by itself, so it
|
||||||
|
is the one thing worth the width — and OPERATE is the way out of
|
||||||
|
it, which the button above already is. */}
|
||||||
|
{st.fault_text && <div className="col-span-4 text-warning">⚠ {st.fault_text}</div>}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
{st.connected && !isSPE && !isACOM && !isKPA && (
|
||||||
<div className="grid grid-cols-3 gap-x-3 gap-y-1 font-mono text-[11px]">
|
<div className="grid grid-cols-3 gap-x-3 gap-y-1 font-mono text-[11px]">
|
||||||
<div>{st.state || ''}</div>
|
<div>{st.state || ''}</div>
|
||||||
<div>Fan {st.fan_mode || '—'}</div>
|
<div>Fan {st.fan_mode || '—'}</div>
|
||||||
@@ -1068,7 +1087,7 @@ function RelayAutoPanel() {
|
|||||||
// profile-prefixed). Self-contained so it owns its async-loaded state.
|
// profile-prefixed). Self-contained so it owns its async-loaded state.
|
||||||
const MAIN_PANE_VALUES = ['map1', 'map2', 'cluster', 'worked', 'recent', 'netcontrol', 'decodes'];
|
const MAIN_PANE_VALUES = ['map1', 'map2', 'cluster', 'worked', 'recent', 'netcontrol', 'decodes'];
|
||||||
const PANE_NONE = 'none';
|
const PANE_NONE = 'none';
|
||||||
function MainViewPanes({ onChanged, flexAvailable, icomAvailable, yaesuAvailable }: { onChanged?: (side: 'left' | 'right' | 'p3' | 'p4' | 'layout', value: string) => void; flexAvailable?: boolean; icomAvailable?: boolean; yaesuAvailable?: boolean }) {
|
function MainViewPanes({ onChanged, flexAvailable, icomAvailable, yaesuAvailable, elecraftAvailable, tciAvailable }: { onChanged?: (side: 'left' | 'right' | 'p3' | 'p4' | 'layout', value: string) => void; flexAvailable?: boolean; icomAvailable?: boolean; yaesuAvailable?: boolean; elecraftAvailable?: boolean; tciAvailable?: boolean }) {
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const [panes, setPanes] = useState<Record<string, string>>({ left: 'map1', right: 'map2', p3: PANE_NONE, p4: PANE_NONE });
|
const [panes, setPanes] = useState<Record<string, string>>({ left: 'map1', right: 'map2', p3: PANE_NONE, p4: PANE_NONE });
|
||||||
const [layout, setLayout] = useState('quad');
|
const [layout, setLayout] = useState('quad');
|
||||||
@@ -1078,11 +1097,16 @@ function MainViewPanes({ onChanged, flexAvailable, icomAvailable, yaesuAvailable
|
|||||||
...(flexAvailable ? ['flex'] : []),
|
...(flexAvailable ? ['flex'] : []),
|
||||||
...(icomAvailable ? ['icom'] : []),
|
...(icomAvailable ? ['icom'] : []),
|
||||||
...(yaesuAvailable ? ['yaesu'] : []),
|
...(yaesuAvailable ? ['yaesu'] : []),
|
||||||
|
// The Elecraft console could be docked from the start — App has always had
|
||||||
|
// the pane — but it was never offered here, so the only way to reach it was
|
||||||
|
// the tab. Listed with the others now.
|
||||||
|
...(elecraftAvailable ? ['elecraft'] : []),
|
||||||
|
...(tciAvailable ? ['tci'] : []),
|
||||||
].map((value) => ({ value, label: t(`settings.pane.${value}`) }))
|
].map((value) => ({ value, label: t(`settings.pane.${value}`) }))
|
||||||
.sort((a, b) => a.label.localeCompare(b.label));
|
.sort((a, b) => a.label.localeCompare(b.label));
|
||||||
const KEYS: Record<string, string> = { left: 'mainPaneLeft', right: 'mainPaneRight', p3: 'mainPane3', p4: 'mainPane4' };
|
const KEYS: Record<string, string> = { left: 'mainPaneLeft', right: 'mainPaneRight', p3: 'mainPane3', p4: 'mainPane4' };
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const valid = (v: string) => v === 'flex' || v === 'icom' || v === 'yaesu' || MAIN_PANE_VALUES.includes(v);
|
const valid = (v: string) => v === 'flex' || v === 'icom' || v === 'yaesu' || v === 'elecraft' || v === 'tci' || MAIN_PANE_VALUES.includes(v);
|
||||||
Promise.all([
|
Promise.all([
|
||||||
...Object.values(KEYS).map((k) => GetUIPref(k).catch(() => '')),
|
...Object.values(KEYS).map((k) => GetUIPref(k).catch(() => '')),
|
||||||
GetUIPref('mainPaneLayout').catch(() => ''),
|
GetUIPref('mainPaneLayout').catch(() => ''),
|
||||||
@@ -1536,7 +1560,7 @@ function brandOfBackend(backend: string, kenwoodLink?: string): { brand: string;
|
|||||||
// memo() cuts that off. It only works if the props hold still, which is why
|
// memo() cuts that off. It only works if the props hold still, which is why
|
||||||
// App passes callbacks that do not change identity on every render — see the
|
// App passes callbacks that do not change identity on every render — see the
|
||||||
// useCallback wrappers there.
|
// useCallback wrappers there.
|
||||||
function SettingsModalImpl({ onClose, onSaved, initialSection, onMainPaneChanged, flexAvailable, icomAvailable, yaesuAvailable, onEditQSO }: Props) {
|
function SettingsModalImpl({ onClose, onSaved, initialSection, onMainPaneChanged, flexAvailable, icomAvailable, yaesuAvailable, elecraftAvailable, tciAvailable, onEditQSO }: Props) {
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const [selected, setSelected] = useState<SectionId>((initialSection as SectionId) || 'station');
|
const [selected, setSelected] = useState<SectionId>((initialSection as SectionId) || 'station');
|
||||||
const [loading, setLoading] = useState(true);
|
const [loading, setLoading] = useState(true);
|
||||||
@@ -1946,6 +1970,11 @@ function SettingsModalImpl({ onClose, onSaved, initialSection, onMainPaneChanged
|
|||||||
// nobody had pressed, and the one that had been pressed showed nothing at
|
// nobody had pressed, and the one that had been pressed showed nothing at
|
||||||
// all, which reads as "the button does nothing".
|
// all, which reads as "the button does nothing".
|
||||||
const [rdaCmpMsg, setRdaCmpMsg] = useState<string>('');
|
const [rdaCmpMsg, setRdaCmpMsg] = useState<string>('');
|
||||||
|
// Which source the operator kept, per QSO id. By id and not by row: a second
|
||||||
|
// comparison rebuilds the list, and a choice that followed a row number would
|
||||||
|
// then be applied to somebody else's contact.
|
||||||
|
const [rdaPick, setRdaPick] = useState<Record<number, 'log' | 'db'>>({});
|
||||||
|
const [rdaApplyBusy, setRdaApplyBusy] = useState(false);
|
||||||
const runRDACompare = async () => {
|
const runRDACompare = async () => {
|
||||||
setRdaCmpBusy(true); setRdaCmp(null); setRdaCmpMsg('');
|
setRdaCmpBusy(true); setRdaCmp(null); setRdaCmpMsg('');
|
||||||
try {
|
try {
|
||||||
@@ -3778,23 +3807,25 @@ function SettingsModalImpl({ onClose, onSaved, initialSection, onMainPaneChanged
|
|||||||
<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>{t('hw.motorCom')}{!isSteppir && <span className="ml-1.5 font-normal text-muted-foreground">{t('hw.motorComUb')}</span>}</Label>
|
<Label>{t('hw.motorCom')}{!isSteppir && <span className="ml-1.5 font-normal text-muted-foreground">{t('hw.motorComUb')}</span>}</Label>
|
||||||
{/* A list AND a text field, which is why this is a Combobox and
|
{/* THE SAME Select every other serial device uses.
|
||||||
not the Select the other serial devices use: the port for a
|
This was a Combobox — a list you could also type into — so
|
||||||
USB adapter that is currently unplugged does not appear in
|
that the port of an adapter currently unplugged could still
|
||||||
the list, and refusing to accept it typed means the antenna
|
be configured. In practice the list could not be picked from
|
||||||
cannot be configured until the adapter is in. The detected
|
at all, which is a worse failure than the one it was avoiding:
|
||||||
ports are offered; anything else is still accepted. */}
|
the port an operator wants is nearly always one that is
|
||||||
|
plugged in and detected. A configured port that has since
|
||||||
|
gone missing is added to the list so it stays selected and
|
||||||
|
visible rather than silently disappearing. */}
|
||||||
<div className="flex items-center gap-1">
|
<div className="flex items-center gap-1">
|
||||||
<Combobox
|
<Select value={ultrabeam.com || undefined}
|
||||||
value={ultrabeam.com ?? ''}
|
onValueChange={(v) => setUltrabeam((s) => ({ ...s, com: v }))}>
|
||||||
options={wkPorts}
|
<SelectTrigger className="h-9 font-mono flex-1"><SelectValue placeholder="COM3" /></SelectTrigger>
|
||||||
allowFreeText
|
<SelectContent>
|
||||||
commitOnType
|
{wkPorts.length === 0 && !ultrabeam.com && <SelectItem value="_" disabled>{t('cat.noPorts')}</SelectItem>}
|
||||||
showToggle
|
{[...wkPorts, ...(ultrabeam.com && !wkPorts.includes(ultrabeam.com) ? [ultrabeam.com] : [])]
|
||||||
placeholder="COM3"
|
.map((pt) => <SelectItem key={pt} value={pt}>{pt}</SelectItem>)}
|
||||||
className="font-mono flex-1"
|
</SelectContent>
|
||||||
onChange={(v) => setUltrabeam((s) => ({ ...s, com: v.trim().toUpperCase() }))}
|
</Select>
|
||||||
/>
|
|
||||||
<Button type="button" variant="outline" size="sm" className="shrink-0"
|
<Button type="button" variant="outline" size="sm" className="shrink-0"
|
||||||
onClick={() => ListSerialPorts().then((ps) => setWkPorts((ps ?? []) as string[])).catch(() => {})}>↻</Button>
|
onClick={() => ListSerialPorts().then((ps) => setWkPorts((ps ?? []) as string[])).catch(() => {})}>↻</Button>
|
||||||
</div>
|
</div>
|
||||||
@@ -3943,7 +3974,7 @@ function SettingsModalImpl({ onClose, onSaved, initialSection, onMainPaneChanged
|
|||||||
<p className="text-xs text-muted-foreground pl-6">{t('hw.motorTxInhibitHint')}</p>
|
<p className="text-xs text-muted-foreground pl-6">{t('hw.motorTxInhibitHint')}</p>
|
||||||
</div>
|
</div>
|
||||||
<div className="flex items-center gap-2 pt-2">
|
<div className="flex items-center gap-2 pt-2">
|
||||||
<Button variant="outline" size="sm" onClick={testUltrabeam} disabled={ubTesting || (isSerial ? !ultrabeam.com.trim() : !ultrabeam.host.trim())}>
|
<Button variant="outline" size="sm" onClick={testUltrabeam} disabled={ubTesting || (isSerial ? !(ultrabeam.com || '').trim() : !(ultrabeam.host || '').trim())}>
|
||||||
{ubTesting ? t('hw.connecting') : t('hw.testConn')}
|
{ubTesting ? t('hw.connecting') : t('hw.testConn')}
|
||||||
</Button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
@@ -4137,15 +4168,28 @@ function SettingsModalImpl({ onClose, onSaved, initialSection, onMainPaneChanged
|
|||||||
{ value: 'acom1200', label: '1200S' },
|
{ value: 'acom1200', label: '1200S' },
|
||||||
{ value: 'acom2020', label: '2020S' },
|
{ value: 'acom2020', label: '2020S' },
|
||||||
],
|
],
|
||||||
|
kpa: [
|
||||||
|
{ value: 'kpa1500', label: 'KPA1500' },
|
||||||
|
{ value: 'kpa500', label: 'KPA500' },
|
||||||
|
],
|
||||||
};
|
};
|
||||||
const brandOf = (ty: string) => (!ty || ty === 'pgxl') ? 'pgxl' : ty.startsWith('acom') ? 'acom' : 'spe';
|
const brandOf = (ty: string) => (!ty || ty === 'pgxl') ? 'pgxl'
|
||||||
|
: ty.startsWith('acom') ? 'acom'
|
||||||
|
: ty.startsWith('kpa') ? 'kpa' : 'spe';
|
||||||
const patchAmp = (i: number, patch: Partial<AmpUI>) => setAmps((l) => l.map((a, j) => (j === i ? { ...a, ...patch } : a)));
|
const patchAmp = (i: number, patch: Partial<AmpUI>) => setAmps((l) => l.map((a, j) => (j === i ? { ...a, ...patch } : a)));
|
||||||
// Each family has a fixed serial speed: SPE talks 115200, the ACOM S-series is
|
// Each family has a fixed serial speed: SPE talks 115200, the ACOM S-series is
|
||||||
// 9600 8N1 — preset it so switching brand just works. PGXL is TCP-only.
|
// 9600 8N1 — preset it so switching brand just works. PGXL is TCP-only.
|
||||||
|
// Each family has its own fixed serial speed and its own default port, so
|
||||||
|
// switching model leaves a working configuration rather than one the
|
||||||
|
// operator has to repair. A KPA500 has no network side at all — it is put
|
||||||
|
// on serial here rather than being allowed to sit on a TCP setting that
|
||||||
|
// could never connect.
|
||||||
const applyType = (i: number, v: string) => patchAmp(i, {
|
const applyType = (i: number, v: string) => patchAmp(i, {
|
||||||
type: v,
|
type: v,
|
||||||
transport: v === 'pgxl' ? 'tcp' : amps[i].transport,
|
freq_out: v.startsWith('kpa') ? true : amps[i].freq_out,
|
||||||
baud: v.startsWith('acom') ? 9600 : v.startsWith('spe') ? 115200 : amps[i].baud,
|
transport: v === 'pgxl' ? 'tcp' : v === 'kpa500' ? 'serial' : amps[i].transport,
|
||||||
|
baud: v.startsWith('acom') ? 9600 : v.startsWith('spe') ? 115200 : v.startsWith('kpa') ? 38400 : amps[i].baud,
|
||||||
|
port: v === 'kpa1500' ? 1500 : amps[i].port,
|
||||||
});
|
});
|
||||||
const addAmp = () => setAmps((l) => [...l, {
|
const addAmp = () => setAmps((l) => [...l, {
|
||||||
id: '', name: '', enabled: true, type: 'spe13', transport: 'tcp', host: '', port: 9008, com_port: '', baud: 115200,
|
id: '', name: '', enabled: true, type: 'spe13', transport: 'tcp', host: '', port: 9008, com_port: '', baud: 115200,
|
||||||
@@ -4162,6 +4206,7 @@ function SettingsModalImpl({ onClose, onSaved, initialSection, onMainPaneChanged
|
|||||||
const brand = brandOf(amp.type);
|
const brand = brandOf(amp.type);
|
||||||
const isPGXL = brand === 'pgxl';
|
const isPGXL = brand === 'pgxl';
|
||||||
const isACOM = brand === 'acom';
|
const isACOM = brand === 'acom';
|
||||||
|
const isKPA = brand === 'kpa';
|
||||||
const isSerial = !isPGXL && amp.transport === 'serial';
|
const isSerial = !isPGXL && amp.transport === 'serial';
|
||||||
return (
|
return (
|
||||||
<div key={amp.id || `new-${i}`} className="rounded-lg border border-border p-3 space-y-3">
|
<div key={amp.id || `new-${i}`} className="rounded-lg border border-border p-3 space-y-3">
|
||||||
@@ -4189,7 +4234,8 @@ function SettingsModalImpl({ onClose, onSaved, initialSection, onMainPaneChanged
|
|||||||
<SelectContent>
|
<SelectContent>
|
||||||
<SelectItem value="pgxl">4O3A</SelectItem>
|
<SelectItem value="pgxl">4O3A</SelectItem>
|
||||||
<SelectItem value="spe">SPE</SelectItem>
|
<SelectItem value="spe">SPE</SelectItem>
|
||||||
<SelectItem value="acom">ACOM</SelectItem>
|
<SelectItem value="acom">Acom</SelectItem>
|
||||||
|
<SelectItem value="kpa">Elecraft</SelectItem>
|
||||||
</SelectContent>
|
</SelectContent>
|
||||||
</Select>
|
</Select>
|
||||||
</div>
|
</div>
|
||||||
@@ -4279,10 +4325,27 @@ function SettingsModalImpl({ onClose, onSaved, initialSection, onMainPaneChanged
|
|||||||
)}
|
)}
|
||||||
|
|
||||||
{/* 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
|
||||||
driven over its network protocol. A SECOND serial port,
|
driven over its network protocol. A SECOND serial port,
|
||||||
separate from the metering one above. */}
|
separate from the metering one above.
|
||||||
{!isPGXL && (
|
Never a KPA either: it has a band command of its own (^BN),
|
||||||
|
so OpsLog tells it directly on the link it is already using.
|
||||||
|
Offering a second serial port and a transceiver emulator for
|
||||||
|
that would be a workaround for a problem this amplifier does
|
||||||
|
not have. */}
|
||||||
|
{isKPA && (
|
||||||
|
<div className="border-t border-border/60 pt-3 space-y-1">
|
||||||
|
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
||||||
|
<Checkbox
|
||||||
|
checked={!!amp.freq_out}
|
||||||
|
onCheckedChange={(c) => patchAmp(i, { freq_out: !!c })}
|
||||||
|
/>
|
||||||
|
{t('amp.kpaBandFollow')}
|
||||||
|
</label>
|
||||||
|
<p className="text-[11px] text-muted-foreground">{t('amp.kpaBandFollowHint')}</p>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
{!isPGXL && !isKPA && (
|
||||||
<div className="border-t border-border/60 pt-3 space-y-3">
|
<div className="border-t border-border/60 pt-3 space-y-3">
|
||||||
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
||||||
<Checkbox
|
<Checkbox
|
||||||
@@ -6710,6 +6773,13 @@ function SettingsModalImpl({ onClose, onSaved, initialSection, onMainPaneChanged
|
|||||||
xiegu: t('cat.optXiegu'),
|
xiegu: t('cat.optXiegu'),
|
||||||
} as Record<string, string>)[catCfg.backend] ?? '';
|
} as Record<string, string>)[catCfg.backend] ?? '';
|
||||||
|
|
||||||
|
// The radio-over-network entry, which ListAudioInputDevices and
|
||||||
|
// ListAudioOutputDevices add when the CAT link can carry audio. It is a
|
||||||
|
// real choice for two of the four fields and nonsense for the other two.
|
||||||
|
const NET_DEVICE = 'net:radio';
|
||||||
|
const soundCardsOnly = (devs: AudioDev[]) => devs.filter((d) => d.id !== NET_DEVICE);
|
||||||
|
const fromRadioIsNetwork = audioCfg.from_radio === NET_DEVICE;
|
||||||
|
|
||||||
const deviceSelect = (
|
const deviceSelect = (
|
||||||
field: keyof AudioSettings,
|
field: keyof AudioSettings,
|
||||||
devices: AudioDev[],
|
devices: AudioDev[],
|
||||||
@@ -6744,10 +6814,16 @@ function SettingsModalImpl({ onClose, onSaved, initialSection, onMainPaneChanged
|
|||||||
{deviceSelect('from_radio', audioInputs, t('aud.phFromRadio'))}
|
{deviceSelect('from_radio', audioInputs, t('aud.phFromRadio'))}
|
||||||
<Label className="text-sm">{t('aud.toRadio')}</Label>
|
<Label className="text-sm">{t('aud.toRadio')}</Label>
|
||||||
{deviceSelect('to_radio', audioOutputs, t('aud.phToRadio'))}
|
{deviceSelect('to_radio', audioOutputs, t('aud.phToRadio'))}
|
||||||
|
{/* The radio is offered for the two fields it can BE — where the
|
||||||
|
received audio comes from, and where the voice keyer sends
|
||||||
|
its messages — and taken out of the other two. It is not a
|
||||||
|
microphone: choosing it here would record the station you are
|
||||||
|
listening to instead of your own voice. And it is not a pair of
|
||||||
|
speakers: the audio going that way is transmit audio. */}
|
||||||
<Label className="text-sm">{t('aud.recMic')}</Label>
|
<Label className="text-sm">{t('aud.recMic')}</Label>
|
||||||
{deviceSelect('recording_device', audioInputs, t('aud.phRecMic'))}
|
{deviceSelect('recording_device', soundCardsOnly(audioInputs), t('aud.phRecMic'))}
|
||||||
<Label className="text-sm">{t('aud.listening')}</Label>
|
<Label className="text-sm">{t('aud.listening')}</Label>
|
||||||
{deviceSelect('listening_device', audioOutputs, t('aud.phListening'))}
|
{deviceSelect('listening_device', soundCardsOnly(audioOutputs), t('aud.phListening'))}
|
||||||
</div>
|
</div>
|
||||||
<p className="text-[11px] text-muted-foreground">
|
<p className="text-[11px] text-muted-foreground">
|
||||||
<strong>{t('aud.fromRadioShort')}</strong> {t('aud.explainFrom')}{' '}
|
<strong>{t('aud.fromRadioShort')}</strong> {t('aud.explainFrom')}{' '}
|
||||||
@@ -6765,8 +6841,8 @@ function SettingsModalImpl({ onClose, onSaved, initialSection, onMainPaneChanged
|
|||||||
size="sm"
|
size="sm"
|
||||||
className="h-8"
|
className="h-8"
|
||||||
onClick={toggleMonitor}
|
onClick={toggleMonitor}
|
||||||
disabled={!monitorOn && !audioCfg.from_radio}
|
disabled={!monitorOn && (!audioCfg.from_radio || fromRadioIsNetwork)}
|
||||||
title={t('aud.monitorTitle')}
|
title={fromRadioIsNetwork ? t('aud.monitorNoTci') : t('aud.monitorTitle')}
|
||||||
>
|
>
|
||||||
{monitorOn ? t('aud.stopListening') : t('aud.listenRadio')}
|
{monitorOn ? t('aud.stopListening') : t('aud.listenRadio')}
|
||||||
</Button>
|
</Button>
|
||||||
@@ -7059,7 +7135,7 @@ function SettingsModalImpl({ onClose, onSaved, initialSection, onMainPaneChanged
|
|||||||
</label>
|
</label>
|
||||||
<TelemetryToggle />
|
<TelemetryToggle />
|
||||||
|
|
||||||
<MainViewPanes onChanged={onMainPaneChanged} flexAvailable={flexAvailable} icomAvailable={icomAvailable} yaesuAvailable={yaesuAvailable} />
|
<MainViewPanes onChanged={onMainPaneChanged} flexAvailable={flexAvailable} icomAvailable={icomAvailable} yaesuAvailable={yaesuAvailable} elecraftAvailable={elecraftAvailable} tciAvailable={tciAvailable} />
|
||||||
|
|
||||||
<div className="border-t border-border/60 pt-4 space-y-2">
|
<div className="border-t border-border/60 pt-4 space-y-2">
|
||||||
<h4 className="text-sm font-semibold text-foreground">{t('gen.pwEnc')}</h4>
|
<h4 className="text-sm font-semibold text-foreground">{t('gen.pwEnc')}</h4>
|
||||||
@@ -7517,6 +7593,7 @@ function SettingsModalImpl({ onClose, onSaved, initialSection, onMainPaneChanged
|
|||||||
<th className="py-1 pr-2 font-medium">{t('rda.cmpFromLog')}</th>
|
<th className="py-1 pr-2 font-medium">{t('rda.cmpFromLog')}</th>
|
||||||
<th className="py-1 pr-2 font-medium">{t('rda.cmpFromDb')}</th>
|
<th className="py-1 pr-2 font-medium">{t('rda.cmpFromDb')}</th>
|
||||||
<th className="py-1 pr-2 font-medium">{t('rda.cmpKind')}</th>
|
<th className="py-1 pr-2 font-medium">{t('rda.cmpKind')}</th>
|
||||||
|
<th className="py-1 pr-2 font-medium text-center">{t('rda.cmpKeep')}</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
@@ -7541,11 +7618,100 @@ function SettingsModalImpl({ onClose, onSaved, initialSection, onMainPaneChanged
|
|||||||
<td className="py-1 pr-2 text-muted-foreground">
|
<td className="py-1 pr-2 text-muted-foreground">
|
||||||
{c.dated ? t('rda.cmpDated') : t('rda.cmpCurrent')}
|
{c.dated ? t('rda.cmpDated') : t('rda.cmpCurrent')}
|
||||||
</td>
|
</td>
|
||||||
|
{/* Which one wins, on the row that shows the two values.
|
||||||
|
Two buttons rather than a tick box: a tick box would
|
||||||
|
have to mean one of the sources silently, and an
|
||||||
|
operator arbitrating between "RO-19" and "KO-05"
|
||||||
|
should be picking the value they can read, not
|
||||||
|
remembering what a checked box stands for. */}
|
||||||
|
<td className="py-1 pr-2 whitespace-nowrap text-center">
|
||||||
|
<div className="inline-flex rounded border border-border overflow-hidden">
|
||||||
|
{(['log', 'db'] as const).map((side) => (
|
||||||
|
<button
|
||||||
|
key={side}
|
||||||
|
type="button"
|
||||||
|
onClick={() => setRdaPick((p) => {
|
||||||
|
const next = { ...p };
|
||||||
|
if (next[c.qso_id] === side) delete next[c.qso_id];
|
||||||
|
else next[c.qso_id] = side;
|
||||||
|
return next;
|
||||||
|
})}
|
||||||
|
className={`px-2 py-0.5 font-mono text-[10px] ${rdaPick[c.qso_id] === side
|
||||||
|
? 'bg-primary text-primary-foreground'
|
||||||
|
: 'hover:bg-muted'}`}
|
||||||
|
title={side === 'log' ? t('rda.cmpKeepLog') : t('rda.cmpKeepDb')}
|
||||||
|
>
|
||||||
|
{side === 'log' ? c.from_log : c.from_db}
|
||||||
|
</button>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
))}
|
))}
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
|
{/* Applying is a separate, deliberate act. Clicking through two
|
||||||
|
hundred rows and having each one written as it is clicked would
|
||||||
|
make a slip permanent before the operator had finished
|
||||||
|
reading. */}
|
||||||
|
<div className="flex items-center gap-3 flex-wrap">
|
||||||
|
<Button size="sm" variant="secondary" disabled={rdaApplyBusy || Object.keys(rdaPick).length === 0}
|
||||||
|
onClick={async () => {
|
||||||
|
setRdaApplyBusy(true);
|
||||||
|
try {
|
||||||
|
const choices = rdaCmp.conflicts
|
||||||
|
.filter((c: any) => rdaPick[c.qso_id])
|
||||||
|
.map((c: any) => ({
|
||||||
|
qso_id: c.qso_id,
|
||||||
|
district: rdaPick[c.qso_id] === 'log' ? c.from_log : c.from_db,
|
||||||
|
}));
|
||||||
|
const r: any = await ApplyRDAChoices(choices);
|
||||||
|
setRdaCmpMsg(r?.message || '');
|
||||||
|
setRdaPick({});
|
||||||
|
// The settled rows leave the list, and the counters follow.
|
||||||
|
//
|
||||||
|
// They used to stay, which made a working button look like a
|
||||||
|
// broken one: the operator decided a hundred contacts, the
|
||||||
|
// hundred rows stayed exactly as they were, and there was
|
||||||
|
// nothing anywhere to say the writing had happened. Dropping
|
||||||
|
// them here rather than re-running the comparison, because
|
||||||
|
// that reads the whole log — seconds of silence on a remote
|
||||||
|
// database, to be told what is already known.
|
||||||
|
if (r?.applied > 0) {
|
||||||
|
const settled = new Set(choices.map((c: any) => c.qso_id));
|
||||||
|
setRdaCmp((prev: any) => prev && ({
|
||||||
|
...prev,
|
||||||
|
disagree: Math.max(0, (prev.disagree ?? 0) - r.applied),
|
||||||
|
agree: (prev.agree ?? 0) + r.applied,
|
||||||
|
conflicts: (prev.conflicts ?? []).filter((c: any) => !settled.has(c.qso_id)),
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
} catch (e: any) {
|
||||||
|
setRdaCmpMsg(String(e?.message ?? e));
|
||||||
|
} finally {
|
||||||
|
setRdaApplyBusy(false);
|
||||||
|
}
|
||||||
|
}}>
|
||||||
|
{rdaApplyBusy ? <Loader2 className="size-3.5 animate-spin mr-1.5" /> : null}
|
||||||
|
{t('rda.cmpApply', { n: Object.keys(rdaPick).length })}
|
||||||
|
</Button>
|
||||||
|
<button type="button" className="text-[11px] underline decoration-dotted hover:text-primary"
|
||||||
|
onClick={() => setRdaPick(Object.fromEntries(rdaCmp.conflicts.map((c: any) => [c.qso_id, 'db'])))}>
|
||||||
|
{t('rda.cmpAllDb')}
|
||||||
|
</button>
|
||||||
|
<button type="button" className="text-[11px] underline decoration-dotted hover:text-primary"
|
||||||
|
onClick={() => setRdaPick(Object.fromEntries(rdaCmp.conflicts.map((c: any) => [c.qso_id, 'log'])))}>
|
||||||
|
{t('rda.cmpAllLog')}
|
||||||
|
</button>
|
||||||
|
{Object.keys(rdaPick).length > 0 && (
|
||||||
|
<button type="button" className="text-[11px] underline decoration-dotted hover:text-primary"
|
||||||
|
onClick={() => setRdaPick({})}>
|
||||||
|
{t('rda.cmpClear')}
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
<p className="text-[11px] text-muted-foreground">{t('rda.cmpApplyHint')}</p>
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -0,0 +1,91 @@
|
|||||||
|
import { useEffect, useRef, useState } from 'react';
|
||||||
|
import { cn } from '@/lib/utils';
|
||||||
|
|
||||||
|
// ShiftRow — the RIT / XIT offset control, shared by the radio consoles.
|
||||||
|
//
|
||||||
|
// It began inside the Icom panel and is here because the next console needed
|
||||||
|
// exactly it. Consoles that each invent their own way of nudging an offset make
|
||||||
|
// an operator learn the same thing twice, which is the complaint that moved it:
|
||||||
|
// "none of the consoles look alike".
|
||||||
|
//
|
||||||
|
// Three ways to move it, because operators reach for different ones: the ± keys,
|
||||||
|
// the wheel over the number, and TYPING a value straight in. The last one is
|
||||||
|
// what a button row cannot do — 'put me 300 Hz down' is one keystroke sequence,
|
||||||
|
// not thirty clicks.
|
||||||
|
export function ShiftRow({ label, on, hz, accent, disabled, step = 10, onToggle, onSet }: {
|
||||||
|
label: string;
|
||||||
|
on: boolean;
|
||||||
|
hz: number;
|
||||||
|
accent: string;
|
||||||
|
disabled?: boolean;
|
||||||
|
step?: number;
|
||||||
|
onToggle: () => void;
|
||||||
|
onSet: (hz: number) => void;
|
||||||
|
}) {
|
||||||
|
const ref = useRef<HTMLDivElement>(null);
|
||||||
|
const [editing, setEditing] = useState<string | null>(null);
|
||||||
|
const cb = useRef(onSet); cb.current = onSet;
|
||||||
|
const cur = useRef({ hz, on, disabled }); cur.current = { hz, on, disabled };
|
||||||
|
|
||||||
|
// Wheel over the row. A native non-passive listener, because React's onWheel
|
||||||
|
// is passive and cannot preventDefault — without that the panel scrolls under
|
||||||
|
// the pointer while the number changes.
|
||||||
|
useEffect(() => {
|
||||||
|
const el = ref.current;
|
||||||
|
if (!el) return;
|
||||||
|
const onWheel = (e: WheelEvent) => {
|
||||||
|
const c = cur.current;
|
||||||
|
if (c.disabled || !c.on) return;
|
||||||
|
e.preventDefault();
|
||||||
|
cb.current(c.hz + (e.deltaY < 0 ? step : -step));
|
||||||
|
};
|
||||||
|
el.addEventListener('wheel', onWheel, { passive: false });
|
||||||
|
return () => el.removeEventListener('wheel', onWheel);
|
||||||
|
}, [step]);
|
||||||
|
|
||||||
|
const commit = (raw: string) => {
|
||||||
|
setEditing(null);
|
||||||
|
const v = parseInt(raw.replace(/[^0-9+-]/g, ''), 10);
|
||||||
|
if (!Number.isNaN(v)) onSet(v);
|
||||||
|
};
|
||||||
|
|
||||||
|
const dead = disabled || !on;
|
||||||
|
return (
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<button type="button" onClick={onToggle} disabled={disabled}
|
||||||
|
className={cn('w-14 shrink-0 px-2 py-1 rounded-md text-[11px] font-bold border transition-colors disabled:opacity-30',
|
||||||
|
on ? 'bg-success border-success text-success-foreground' : 'bg-card text-muted-foreground border-border hover:bg-muted')}>
|
||||||
|
{label}
|
||||||
|
</button>
|
||||||
|
<div ref={ref} title="Wheel, ± or type"
|
||||||
|
className={cn('flex-1 flex items-center justify-between rounded-md border px-1 py-0.5 select-none',
|
||||||
|
dead ? 'border-border/60 bg-muted/20 opacity-60' : 'border-border bg-muted/40 cursor-ns-resize')}>
|
||||||
|
<button type="button" disabled={dead} onClick={() => onSet(hz - step)}
|
||||||
|
className="px-2 text-sm font-bold text-muted-foreground hover:text-foreground disabled:opacity-40">−</button>
|
||||||
|
{editing !== null ? (
|
||||||
|
<input
|
||||||
|
autoFocus
|
||||||
|
value={editing}
|
||||||
|
onChange={(e) => setEditing(e.target.value)}
|
||||||
|
onBlur={(e) => commit(e.target.value)}
|
||||||
|
onKeyDown={(e) => {
|
||||||
|
if (e.key === 'Enter') commit((e.target as HTMLInputElement).value);
|
||||||
|
else if (e.key === 'Escape') setEditing(null);
|
||||||
|
}}
|
||||||
|
className="w-20 bg-transparent text-center text-sm font-mono font-bold tabular-nums outline-none"
|
||||||
|
/>
|
||||||
|
) : (
|
||||||
|
<button type="button" disabled={dead} onClick={() => setEditing(String(hz))}
|
||||||
|
className="text-sm font-mono font-bold tabular-nums disabled:cursor-default"
|
||||||
|
style={{ color: on ? accent : undefined }}>
|
||||||
|
{hz > 0 ? '+' : hz < 0 ? '−' : ''}{Math.abs(hz)} Hz
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
<button type="button" disabled={dead} onClick={() => onSet(hz + step)}
|
||||||
|
className="px-2 text-sm font-bold text-muted-foreground hover:text-foreground disabled:opacity-40">+</button>
|
||||||
|
</div>
|
||||||
|
<button type="button" disabled={dead} onClick={() => onSet(0)}
|
||||||
|
className="w-8 shrink-0 py-1 rounded-md text-[11px] font-bold border border-border bg-card text-muted-foreground hover:bg-muted disabled:opacity-30">0</button>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,411 @@
|
|||||||
|
import { useEffect, useRef, useState } from 'react';
|
||||||
|
import { Radio, Activity, AudioLines, SlidersHorizontal, Mic } from 'lucide-react';
|
||||||
|
import {
|
||||||
|
GetTCIPanel, GetCATState,
|
||||||
|
SetTCIDrive, SetTCITuneDrive, SetTCIMicLevel, SetTCIVolume, SetTCIMute,
|
||||||
|
SetTCIAGC, SetTCISquelch, SetTCISquelchLevel,
|
||||||
|
SetTCINB, SetTCINR, SetTCIANF, SetTCIAPF, SetTCIFilter,
|
||||||
|
SetTCIRIT, SetTCIXIT, SetTCIRITOffset, SetTCIXITOffset, SetTCILock, SetTCITune,
|
||||||
|
} from '../../wailsjs/go/main/App';
|
||||||
|
import { cn } from '@/lib/utils';
|
||||||
|
import { useI18n } from '@/lib/i18n';
|
||||||
|
import { sMeterRST } from '@/lib/rst';
|
||||||
|
import { MeterBar } from '@/components/MeterBar';
|
||||||
|
import { WheelRange } from '@/components/WheelRange';
|
||||||
|
import { ShiftRow } from '@/components/ShiftRow';
|
||||||
|
import { LevelRow } from '@/components/LevelRow';
|
||||||
|
|
||||||
|
type TCIState = {
|
||||||
|
connected: boolean; device?: string; protocol?: string;
|
||||||
|
drive: number; tune_drive: number; mic_level: number; tx_enabled: boolean; tx: boolean; tuning: boolean;
|
||||||
|
volume: number; mute: boolean; agc?: string; squelch_on: boolean; squelch: number;
|
||||||
|
nb: boolean; nr: boolean; anf: boolean; apf: boolean;
|
||||||
|
filter_lo: number; filter_hi: number;
|
||||||
|
rit: boolean; rit_offset: number; xit: boolean; xit_offset: number; lock: boolean; split: boolean;
|
||||||
|
smeter: number; modulations?: string[];
|
||||||
|
tx_power_w: number; tx_swr: number;
|
||||||
|
};
|
||||||
|
|
||||||
|
const ZERO: TCIState = {
|
||||||
|
connected: false, drive: 0, tune_drive: 0, mic_level: 0, tx_enabled: false, tx: false, tuning: false,
|
||||||
|
volume: 0, mute: false, squelch_on: false, squelch: 0,
|
||||||
|
nb: false, nr: false, anf: false, apf: false, filter_lo: 0, filter_hi: 0,
|
||||||
|
rit: false, rit_offset: 0, xit: false, xit_offset: 0, lock: false, split: false, smeter: 0,
|
||||||
|
tx_power_w: 0, tx_swr: 0,
|
||||||
|
};
|
||||||
|
|
||||||
|
// The widths worth a button, PER MODE — because 250 Hz is useless in SSB and
|
||||||
|
// 2.8 kHz is useless in CW, and a row offering both is a row where half the
|
||||||
|
// buttons are never pressed.
|
||||||
|
//
|
||||||
|
// CW gets the narrow end, where the difference between 250 and 500 is the
|
||||||
|
// difference between one signal and three. Voice gets the range a passband is
|
||||||
|
// actually shaped over. Digital sits between: wide enough for a whole FT8
|
||||||
|
// sub-band, narrow enough for RTTY.
|
||||||
|
const WIDTHS_CW = [100, 250, 400, 500, 700, 1000, 1800];
|
||||||
|
const WIDTHS_SSB = [1800, 2100, 2400, 2700, 2800, 3000, 3500];
|
||||||
|
const WIDTHS_DIGI = [500, 1000, 1800, 2400, 2800, 3000, 3500];
|
||||||
|
|
||||||
|
// widthsFor picks the row from the mode the radio reports.
|
||||||
|
function widthsFor(mode: string): number[] {
|
||||||
|
if (/CW/i.test(mode)) return WIDTHS_CW;
|
||||||
|
if (/SSB|USB|LSB|AM|FM/i.test(mode)) return WIDTHS_SSB;
|
||||||
|
return WIDTHS_DIGI;
|
||||||
|
}
|
||||||
|
|
||||||
|
// isCW says whether the CW-only controls belong on screen at all.
|
||||||
|
function isCW(mode: string): boolean { return /CW/i.test(mode); }
|
||||||
|
|
||||||
|
function widthLabel(w: number): string {
|
||||||
|
return w >= 1000 ? `${(w / 1000).toFixed(1)}k` : String(w);
|
||||||
|
}
|
||||||
|
|
||||||
|
// edgesFor turns a width into the pair TCI wants: 0 to the width, and nothing
|
||||||
|
// clever.
|
||||||
|
//
|
||||||
|
// It centred narrow filters on the CW note first — 250 became 575-825 — on the
|
||||||
|
// reasoning that a CW filter should contain the note. That reasoning may even be
|
||||||
|
// right for a radio, but it is not what the button says, and a button that does
|
||||||
|
// not do what it says is worse than one that does something simple. 250 means
|
||||||
|
// 0-250. The two edges are editable underneath for anything else.
|
||||||
|
function edgesFor(w: number, _mode: string): { lo: number; hi: number } {
|
||||||
|
return { lo: 0, hi: w };
|
||||||
|
}
|
||||||
|
|
||||||
|
// dBm → S units. TCI reports a real signal level rather than a meter position,
|
||||||
|
// which is the useful way round: S9 is -73 dBm by the IARU definition and every
|
||||||
|
// S unit below it is 6 dB, so this is arithmetic rather than a calibration
|
||||||
|
// table — nothing here is provisional the way the K3's meter reading is.
|
||||||
|
function sParts(dbm: number): { s: number; over: number; label: string } {
|
||||||
|
if (dbm === 0) return { s: 0, over: 0, label: '—' };
|
||||||
|
if (dbm >= -73) {
|
||||||
|
const over = Math.round((dbm + 73) / 10) * 10;
|
||||||
|
return { s: 9, over, label: over > 0 ? `S9+${over}` : 'S9' };
|
||||||
|
}
|
||||||
|
const s = Math.max(0, Math.min(9, Math.round(9 + (dbm + 73) / 6)));
|
||||||
|
return { s, over: 0, label: `S${s}` };
|
||||||
|
}
|
||||||
|
|
||||||
|
// The meter bar wants 0-100; -127 dBm is the bottom of the scale and -13 dBm
|
||||||
|
// (S9+60) the top.
|
||||||
|
function sBar(dbm: number): number {
|
||||||
|
if (dbm === 0) return 0;
|
||||||
|
return Math.max(0, Math.min(100, ((dbm + 127) / 114) * 100));
|
||||||
|
}
|
||||||
|
|
||||||
|
function sSegColor(frac: number): string {
|
||||||
|
return frac > 0.75 ? '#dc2626' : frac > 0.55 ? '#f59e0b' : '#16a34a';
|
||||||
|
}
|
||||||
|
|
||||||
|
function Card({ icon: Icon, title, children }: { icon: any; title: string; children: React.ReactNode }) {
|
||||||
|
return (
|
||||||
|
<div className="rounded-xl border border-border bg-card shadow-sm overflow-hidden">
|
||||||
|
<div className="flex items-center gap-2 px-3 py-2 border-b border-border/60 bg-muted/30">
|
||||||
|
<Icon className="size-4 text-primary" />
|
||||||
|
<span className="text-xs font-bold uppercase tracking-wider text-foreground/80">{title}</span>
|
||||||
|
</div>
|
||||||
|
<div className="p-3 space-y-3">{children}</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// One button shape for every on/off control, as on the other consoles.
|
||||||
|
function Toggle({ label, on, off, onClick, title }: {
|
||||||
|
label: string; on: boolean; off: boolean; onClick: () => void; title?: string;
|
||||||
|
}) {
|
||||||
|
return (
|
||||||
|
<button type="button" disabled={off} onClick={onClick} title={title}
|
||||||
|
className={cn('rounded-lg border-2 px-2 py-1.5 text-xs font-bold transition-all disabled:opacity-30',
|
||||||
|
on ? 'bg-primary text-primary-foreground border-primary shadow-[0_0_10px] shadow-primary/40'
|
||||||
|
: 'bg-card text-muted-foreground border-border hover:bg-muted')}>
|
||||||
|
{label}
|
||||||
|
</button>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function Row({ label, value, children }: { label: string; value: string; children: React.ReactNode }) {
|
||||||
|
return (
|
||||||
|
<div className="space-y-1">
|
||||||
|
<div className="flex items-baseline justify-between">
|
||||||
|
<span className="text-[10px] font-bold uppercase tracking-wider text-muted-foreground">{label}</span>
|
||||||
|
<span className="text-xs font-mono tabular-nums">{value}</span>
|
||||||
|
</div>
|
||||||
|
{children}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function TCIPanel({ onReportRST }: { onReportRST?: (rst: string) => void } = {}) {
|
||||||
|
const { t } = useI18n();
|
||||||
|
const [st, setSt] = useState<TCIState>(ZERO);
|
||||||
|
const [freqHz, setFreqHz] = useState(0);
|
||||||
|
const [mode, setMode] = useState('');
|
||||||
|
const [err, setErr] = useState('');
|
||||||
|
|
||||||
|
// OPTIMISTIC, like the Icom console — and for a reason found on a real radio.
|
||||||
|
//
|
||||||
|
// This panel used to show only what the radio reported back, on the principle
|
||||||
|
// that the radio is the truth. But ExpertSDR3 does not echo every setting it
|
||||||
|
// is given: press MED and the radio changes, says nothing, and the button
|
||||||
|
// stays lit on SLOW. Waiting for an answer that never comes reads as a dead
|
||||||
|
// control.
|
||||||
|
//
|
||||||
|
// So a change is shown at once and held for a moment. Whatever the radio
|
||||||
|
// announces afterwards — the new value, or a refusal that leaves the old one
|
||||||
|
// — wins once the hold expires, which keeps a clamped or rejected setting
|
||||||
|
// honest without making every working one look broken.
|
||||||
|
// Held UNTIL THE RADIO SPEAKS, not for a fixed moment.
|
||||||
|
//
|
||||||
|
// A timeout was wrong in both directions. Too short and a setting the radio
|
||||||
|
// never echoes — AGC is one — snapped back to its old value a second after
|
||||||
|
// the click. Too long and a setting the radio REFUSES looked accepted: a real
|
||||||
|
// log shows this one answering 'sql_enable:0,false' and then, eighty
|
||||||
|
// milliseconds later, 'sql_enable:0,true' — it puts the squelch straight back
|
||||||
|
// on. Holding through that would have shown the operator a lie.
|
||||||
|
//
|
||||||
|
// So the requested value stands while the radio says nothing about it, and
|
||||||
|
// the instant it reports ANY change for that setting, its word replaces ours.
|
||||||
|
const holdRef = useRef<Record<string, { v: any; reported: any }>>({});
|
||||||
|
const [, forceRender] = useState(0);
|
||||||
|
const hold = <T,>(key: string, reported: T): T => {
|
||||||
|
const h = holdRef.current[key];
|
||||||
|
if (!h) return reported;
|
||||||
|
// The radio has said something different from what it was saying when the
|
||||||
|
// click happened — whether that is our value or a refusal, it is now the
|
||||||
|
// truth and the hold is over.
|
||||||
|
if (reported !== h.reported) {
|
||||||
|
delete holdRef.current[key];
|
||||||
|
return reported;
|
||||||
|
}
|
||||||
|
return h.v as T;
|
||||||
|
};
|
||||||
|
const setHold = (key: string, v: any, reported: any) => {
|
||||||
|
holdRef.current[key] = { v, reported };
|
||||||
|
forceRender((n) => n + 1);
|
||||||
|
};
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
let alive = true;
|
||||||
|
const tick = async () => {
|
||||||
|
try {
|
||||||
|
const p: any = await GetTCIPanel();
|
||||||
|
if (!alive) return;
|
||||||
|
setSt(p as TCIState);
|
||||||
|
const cs: any = await GetCATState();
|
||||||
|
if (!alive) return;
|
||||||
|
setFreqHz(Number(cs?.rx_freq_hz) || Number(cs?.freq_hz) || 0);
|
||||||
|
setMode(String(cs?.mode || ''));
|
||||||
|
} catch (e: any) {
|
||||||
|
if (alive) setErr(String(e?.message ?? e));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
tick();
|
||||||
|
const id = window.setInterval(tick, 400);
|
||||||
|
return () => { alive = false; window.clearInterval(id); };
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const off = !st.connected;
|
||||||
|
|
||||||
|
const call = (fn: () => Promise<any>) => { fn().catch((e: any) => setErr(String(e?.message ?? e))); };
|
||||||
|
|
||||||
|
const drive = hold('drive', st.drive);
|
||||||
|
const tuneDrive = hold('tune_drive', st.tune_drive);
|
||||||
|
const mic = hold('mic', st.mic_level);
|
||||||
|
const vol = hold('vol', st.volume);
|
||||||
|
const sql = hold('sql', st.squelch);
|
||||||
|
const agc = hold('agc', st.agc || '');
|
||||||
|
const nb = hold('nb', st.nb), nr = hold('nr', st.nr);
|
||||||
|
const anf = hold('anf', st.anf), apf = hold('apf', st.apf);
|
||||||
|
const sqlOn = hold('sql_on', st.squelch_on), muted = hold('mute', st.mute);
|
||||||
|
const rit = hold('rit', st.rit), xit = hold('xit', st.xit);
|
||||||
|
const ritHz = hold('rit_hz', st.rit_offset), xitHz = hold('xit_hz', st.xit_offset);
|
||||||
|
const s = sParts(st.smeter);
|
||||||
|
|
||||||
|
// Ctrl+Left/Right shifts the RIT by ±10 Hz, the same keys the Icom console
|
||||||
|
// uses. Two consoles for two radios should not need two habits.
|
||||||
|
const ritRef = useRef({ on: false, hz: 0, off: true });
|
||||||
|
ritRef.current = { on: rit, hz: ritHz, off };
|
||||||
|
useEffect(() => {
|
||||||
|
const onKey = (e: KeyboardEvent) => {
|
||||||
|
if (!e.ctrlKey || (e.key !== 'ArrowLeft' && e.key !== 'ArrowRight')) return;
|
||||||
|
const r = ritRef.current;
|
||||||
|
if (r.off || !r.on) return;
|
||||||
|
e.preventDefault();
|
||||||
|
const v = r.hz + (e.key === 'ArrowRight' ? 10 : -10);
|
||||||
|
setHold('rit_hz', v, ritRef.current.hz);
|
||||||
|
SetTCIRITOffset(v).catch(() => {});
|
||||||
|
};
|
||||||
|
window.addEventListener('keydown', onKey);
|
||||||
|
return () => window.removeEventListener('keydown', onKey);
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="h-full min-h-0 overflow-auto bg-background">
|
||||||
|
{/* Capped and centred, like the Elecraft, Yaesu, Icom and Flex consoles.
|
||||||
|
Stretched across a wide window a console puts each slider a hand's
|
||||||
|
width from its own label and stops reading as one instrument. */}
|
||||||
|
<div className="max-w-5xl mx-auto p-3 space-y-3">
|
||||||
|
{/* VFO + identity */}
|
||||||
|
<div className="rounded-xl border border-border bg-card shadow-sm px-4 py-3 flex items-center justify-between gap-3 flex-wrap">
|
||||||
|
<div>
|
||||||
|
<div className="text-[10px] font-bold uppercase tracking-wider text-muted-foreground flex items-center gap-1.5">
|
||||||
|
<Radio className="size-3.5" />
|
||||||
|
{st.device || 'SunSDR'} {st.protocol ? `· ${st.protocol}` : ''}
|
||||||
|
<span className={cn('size-2 rounded-full', off ? 'bg-muted-foreground/40' : 'bg-success')} />
|
||||||
|
</div>
|
||||||
|
<div className="text-2xl font-mono tabular-nums font-bold">
|
||||||
|
{freqHz > 0 ? (freqHz / 1e6).toFixed(6) : '—'}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
{st.tx && <span className="rounded-md bg-danger px-2 py-1 text-[11px] font-bold text-danger-foreground">TX</span>}
|
||||||
|
{st.split && <span className="rounded-md border border-border px-2 py-1 text-[11px] font-bold">SPLIT</span>}
|
||||||
|
<Toggle label={t('tcip.lock')} on={st.lock} off={off} onClick={() => call(() => SetTCILock(!st.lock))} />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{off && <div className="text-xs text-muted-foreground px-1">{t('tcip.waiting')}</div>}
|
||||||
|
{!!err && <div className="text-[11px] text-danger px-1">{err}</div>}
|
||||||
|
|
||||||
|
{/* Meters. The S-meter while receiving, power and SWR while
|
||||||
|
transmitting — the radio answers TX_POWER and TX_SWR only when it is
|
||||||
|
keyed, so showing them the rest of the time would be showing the
|
||||||
|
last thing that happened as if it were now.
|
||||||
|
There is no temperature: the protocol has no such command, and a
|
||||||
|
made-up figure on a transmitter is the kind somebody trusts. */}
|
||||||
|
<Card icon={Activity} title={t('tcip.meters')}>
|
||||||
|
<MeterBar label="S-METER" value={st.tx || st.tuning ? 0 : sBar(st.smeter)} lo={0} hi={100}
|
||||||
|
accent="#16a34a" segColor={sSegColor}
|
||||||
|
display={st.tx || st.tuning ? '—' : `${s.label} ${st.smeter} dBm`}
|
||||||
|
onClick={() => {
|
||||||
|
if (st.tx || !onReportRST) return;
|
||||||
|
onReportRST(sMeterRST(s.s, s.over, mode));
|
||||||
|
}}
|
||||||
|
title={t('tcip.sMeterHint')} />
|
||||||
|
{(st.tx || st.tuning) && (
|
||||||
|
<div className="grid grid-cols-1 sm:grid-cols-2 gap-2">
|
||||||
|
<MeterBar label="PWR" value={st.tx_power_w} lo={0} hi={Math.max(10, Math.ceil(st.tx_power_w / 10) * 10)}
|
||||||
|
accent="#0ea5e9" display={`${st.tx_power_w.toFixed(1)} W`} />
|
||||||
|
{/* 0 is "not measured yet", and it must not draw as a perfect
|
||||||
|
match: an SWR of 1.0 on an antenna nobody has measured is the
|
||||||
|
one reading an operator should not be handed. */}
|
||||||
|
<MeterBar label="SWR" value={st.tx_swr > 0 ? Math.min(100, (st.tx_swr - 1) * 50) : 0} lo={0} hi={100}
|
||||||
|
accent="#f59e0b" display={st.tx_swr > 0 ? st.tx_swr.toFixed(1) : '—'}
|
||||||
|
segColor={(f) => (f > 0.5 ? '#dc2626' : f > 0.25 ? '#f59e0b' : '#16a34a')} />
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</Card>
|
||||||
|
|
||||||
|
{/* Transmit */}
|
||||||
|
<Card icon={SlidersHorizontal} title={t('tcip.transmit')}>
|
||||||
|
{/* One level per ROW, full width. Two half-width sliders side by side
|
||||||
|
left each of them a couple of centimetres long — small enough that
|
||||||
|
setting 15% took aim. */}
|
||||||
|
<LevelRow label={t('tcip.drive')} unit="%" value={drive} disabled={off}
|
||||||
|
onSet={(v) => { setHold('drive', v, st.drive); call(() => SetTCIDrive(v)); }} />
|
||||||
|
<LevelRow label={t('tcip.tuneDrive')} unit="%" value={tuneDrive} disabled={off} accent="#f59e0b"
|
||||||
|
onSet={(v) => { setHold('tune_drive', v, st.tune_drive); call(() => SetTCITuneDrive(v)); }} />
|
||||||
|
<div className="flex items-center gap-2 flex-wrap">
|
||||||
|
{/* TUNE transmits, and at the tune drive rather than the main one —
|
||||||
|
which is why both numbers are above the button rather than one of
|
||||||
|
them being in a menu somewhere. */}
|
||||||
|
<button type="button" disabled={off || !st.tx_enabled}
|
||||||
|
onClick={() => call(() => SetTCITune(!st.tuning))}
|
||||||
|
className={cn('rounded-lg border-2 px-4 py-2 text-sm font-extrabold tracking-wide transition-all disabled:opacity-30',
|
||||||
|
st.tuning ? 'bg-warning text-warning-foreground border-warning shadow-[0_0_14px] shadow-warning/50'
|
||||||
|
: 'bg-card text-warning border-warning hover:bg-warning-muted')}>
|
||||||
|
{st.tuning ? t('tcip.tuning') : t('tcip.tune')}
|
||||||
|
</button>
|
||||||
|
{!st.tx_enabled && !off && (
|
||||||
|
<span className="text-[11px] text-muted-foreground">{t('tcip.txDisabled')}</span>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
<LevelRow label={t('tcip.mic')} unit="%" value={mic} disabled={off} accent="#a855f7"
|
||||||
|
onSet={(v) => { setHold('mic', v, st.mic_level); call(() => SetTCIMicLevel(v)); }} />
|
||||||
|
</Card>
|
||||||
|
|
||||||
|
{/* Receive */}
|
||||||
|
<Card icon={AudioLines} title={t('tcip.receive')}>
|
||||||
|
{/* Both in the radio's OWN units — volume in dB, negative, and the
|
||||||
|
squelch as a dBm threshold — so the numbers match the ones in
|
||||||
|
ExpertSDR3's window rather than being percentages of something. */}
|
||||||
|
<LevelRow label={t('tcip.volume')} unit=" dB" min={-60} max={0} value={vol} disabled={off}
|
||||||
|
onSet={(v) => { setHold('vol', v, st.volume); call(() => SetTCIVolume(v)); }} />
|
||||||
|
<LevelRow label={t('tcip.squelch')} unit=" dBm" min={-140} max={0} value={sql}
|
||||||
|
disabled={off || !sqlOn} accent="#38bdf8"
|
||||||
|
onSet={(v) => { setHold('sql', v, st.squelch); call(() => SetTCISquelchLevel(v)); }} />
|
||||||
|
<div className={cn('grid gap-2', isCW(mode) ? 'grid-cols-3 sm:grid-cols-6' : 'grid-cols-3 sm:grid-cols-5')}>
|
||||||
|
<Toggle label="NB" on={nb} off={off} onClick={() => { setHold('nb', !nb, st.nb); call(() => SetTCINB(!nb)); }} />
|
||||||
|
<Toggle label="NR" on={nr} off={off} onClick={() => { setHold('nr', !nr, st.nr); call(() => SetTCINR(!nr)); }} />
|
||||||
|
<Toggle label="ANF" on={anf} off={off} onClick={() => { setHold('anf', !anf, st.anf); call(() => SetTCIANF(!anf)); }} />
|
||||||
|
{/* APF is an audio PEAK filter — it rings a single tone out of the
|
||||||
|
noise, which is a CW tool and nothing else. Shown only there:
|
||||||
|
off CW it is not a control, it is a puzzle. */}
|
||||||
|
{isCW(mode) && (
|
||||||
|
<Toggle label="APF" on={apf} off={off} onClick={() => { setHold('apf', !apf, st.apf); call(() => SetTCIAPF(!apf)); }} />
|
||||||
|
)}
|
||||||
|
<Toggle label="SQL" on={sqlOn} off={off} onClick={() => { setHold('sql_on', !sqlOn, st.squelch_on); call(() => SetTCISquelch(!sqlOn)); }} />
|
||||||
|
<Toggle label={t('tcip.mute')} on={muted} off={off} onClick={() => { setHold('mute', !muted, st.mute); call(() => SetTCIMute(!muted)); }} />
|
||||||
|
</div>
|
||||||
|
<div className="space-y-1">
|
||||||
|
<span className="text-[10px] font-bold uppercase tracking-wider text-muted-foreground">{t('tcip.agc')}</span>
|
||||||
|
{/* LONG is gone. The protocol accepts it, but it is a hang time
|
||||||
|
nobody reaches for between overs, and a fifth button that has to
|
||||||
|
be explained is worse than four that do not. */}
|
||||||
|
<div className="grid grid-cols-4 gap-2">
|
||||||
|
{['off', 'slow', 'med', 'fast'].map((m) => (
|
||||||
|
<Toggle key={m} label={m.toUpperCase()} on={agc === m} off={off}
|
||||||
|
onClick={() => { setHold('agc', m, st.agc || ''); call(() => SetTCIAGC(m)); }} />
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="space-y-1">
|
||||||
|
<div className="flex items-baseline justify-between">
|
||||||
|
<span className="text-[10px] font-bold uppercase tracking-wider text-muted-foreground">{t('tcip.filter')}</span>
|
||||||
|
<span className="text-xs font-mono tabular-nums">{st.filter_lo}–{st.filter_hi} Hz</span>
|
||||||
|
</div>
|
||||||
|
<div className="flex items-center gap-2 pb-1">
|
||||||
|
<LevelRow label="LO" unit=" Hz" min={-5000} max={5000} step={10}
|
||||||
|
value={st.filter_lo} disabled={off}
|
||||||
|
onSet={(v) => call(() => SetTCIFilter(v, st.filter_hi))} />
|
||||||
|
</div>
|
||||||
|
<div className="flex items-center gap-2 pb-1">
|
||||||
|
<LevelRow label="HI" unit=" Hz" min={-5000} max={5000} step={10}
|
||||||
|
value={st.filter_hi} disabled={off}
|
||||||
|
onSet={(v) => call(() => SetTCIFilter(st.filter_lo, v))} />
|
||||||
|
</div>
|
||||||
|
<div className="grid grid-cols-4 sm:grid-cols-7 gap-2">
|
||||||
|
{widthsFor(mode).map((w) => {
|
||||||
|
const e = edgesFor(w, mode);
|
||||||
|
// Lit by the WIDTH the radio is actually using, not by an exact
|
||||||
|
// pair of edges: the operator may have moved one edge on the
|
||||||
|
// radio, and a button that only lights on our own numbers would
|
||||||
|
// go dark for a filter that is plainly 500 Hz wide.
|
||||||
|
const on = Math.abs((st.filter_hi - st.filter_lo) - w) <= 50;
|
||||||
|
return (
|
||||||
|
<Toggle key={w} label={widthLabel(w)} on={on} off={off}
|
||||||
|
title={`${e.lo}–${e.hi} Hz`}
|
||||||
|
onClick={() => call(() => SetTCIFilter(e.lo, e.hi))} />
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</Card>
|
||||||
|
|
||||||
|
{/* RIT / XIT — the SAME control the Icom console uses, now shared
|
||||||
|
rather than reinvented: a chip, a signed offset you can type into,
|
||||||
|
scroll on, or step with ±, and a zero. Ctrl+←/→ shifts the RIT. */}
|
||||||
|
<Card icon={Mic} title="RIT / XIT">
|
||||||
|
<div className="grid grid-cols-1 sm:grid-cols-2 gap-3">
|
||||||
|
<ShiftRow label="RIT" on={rit} hz={ritHz} accent="#38bdf8" disabled={off}
|
||||||
|
onToggle={() => { setHold('rit', !rit, st.rit); call(() => SetTCIRIT(!rit)); }}
|
||||||
|
onSet={(v) => { setHold('rit_hz', v, st.rit_offset); call(() => SetTCIRITOffset(v)); }} />
|
||||||
|
<ShiftRow label="XIT" on={xit} hz={xitHz} accent="#f59e0b" disabled={off}
|
||||||
|
onToggle={() => { setHold('xit', !xit, st.xit); call(() => SetTCIXIT(!xit)); }}
|
||||||
|
onSet={(v) => { setHold('xit_hz', v, st.xit_offset); call(() => SetTCIXITOffset(v)); }} />
|
||||||
|
</div>
|
||||||
|
</Card>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
+14
-14
File diff suppressed because one or more lines are too long
@@ -1,6 +1,6 @@
|
|||||||
// Single source of truth for the app version shown in the UI (header + About).
|
// Single source of truth for the app version shown in the UI (header + About).
|
||||||
// Bump this on a release (the release script updates it alongside telemetry.go).
|
// Bump this on a release (the release script updates it alongside telemetry.go).
|
||||||
export const APP_VERSION = '0.26.16';
|
export const APP_VERSION = '0.26.18';
|
||||||
|
|
||||||
// Author / credits, shown in Help -> About.
|
// Author / credits, shown in Help -> About.
|
||||||
export const APP_AUTHOR = 'F4BPO';
|
export const APP_AUTHOR = 'F4BPO';
|
||||||
|
|||||||
Vendored
+42
@@ -65,6 +65,8 @@ export function ApplyAwardPreset(arg1:string,arg2:string):Promise<number>;
|
|||||||
|
|
||||||
export function ApplyAwardUpdate(arg1:string):Promise<void>;
|
export function ApplyAwardUpdate(arg1:string):Promise<void>;
|
||||||
|
|
||||||
|
export function ApplyRDAChoices(arg1:Array<main.RDAChoice>):Promise<main.RDAApplyResult>;
|
||||||
|
|
||||||
export function AssignAwardRefToQSOs(arg1:string,arg2:string,arg3:Array<number>):Promise<number>;
|
export function AssignAwardRefToQSOs(arg1:string,arg2:string,arg3:Array<number>):Promise<number>;
|
||||||
|
|
||||||
export function AudioApplyLevels(arg1:number,arg2:number):Promise<void>;
|
export function AudioApplyLevels(arg1:number,arg2:number):Promise<void>;
|
||||||
@@ -575,6 +577,8 @@ export function GetStationSettings():Promise<main.StationSettings>;
|
|||||||
|
|
||||||
export function GetStationStatus():Promise<Array<main.StationDeviceStatus>>;
|
export function GetStationStatus():Promise<Array<main.StationDeviceStatus>>;
|
||||||
|
|
||||||
|
export function GetTCIPanel():Promise<cat.TCIPanelState>;
|
||||||
|
|
||||||
export function GetTelemetryEnabled():Promise<boolean>;
|
export function GetTelemetryEnabled():Promise<boolean>;
|
||||||
|
|
||||||
export function GetTrackedAwards():Promise<Array<string>>;
|
export function GetTrackedAwards():Promise<Array<string>>;
|
||||||
@@ -1157,6 +1161,44 @@ export function SetSpotMax(arg1:number):Promise<void>;
|
|||||||
|
|
||||||
export function SetSpotTTLMinutes(arg1:number):Promise<void>;
|
export function SetSpotTTLMinutes(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function SetTCIAGC(arg1:string):Promise<void>;
|
||||||
|
|
||||||
|
export function SetTCIANF(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function SetTCIAPF(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function SetTCIDrive(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function SetTCIFilter(arg1:number,arg2:number):Promise<void>;
|
||||||
|
|
||||||
|
export function SetTCILock(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function SetTCIMicLevel(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function SetTCIMute(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function SetTCINB(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function SetTCINR(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function SetTCIRIT(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function SetTCIRITOffset(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function SetTCISquelch(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function SetTCISquelchLevel(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function SetTCITune(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function SetTCITuneDrive(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function SetTCIVolume(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function SetTCIXIT(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function SetTCIXITOffset(arg1:number):Promise<void>;
|
||||||
|
|
||||||
export function SetTelemetryEnabled(arg1:boolean):Promise<void>;
|
export function SetTelemetryEnabled(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
export function SetUIPref(arg1:string,arg2:string):Promise<void>;
|
export function SetUIPref(arg1:string,arg2:string):Promise<void>;
|
||||||
|
|||||||
@@ -70,6 +70,10 @@ export function ApplyAwardUpdate(arg1) {
|
|||||||
return window['go']['main']['App']['ApplyAwardUpdate'](arg1);
|
return window['go']['main']['App']['ApplyAwardUpdate'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function ApplyRDAChoices(arg1) {
|
||||||
|
return window['go']['main']['App']['ApplyRDAChoices'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function AssignAwardRefToQSOs(arg1, arg2, arg3) {
|
export function AssignAwardRefToQSOs(arg1, arg2, arg3) {
|
||||||
return window['go']['main']['App']['AssignAwardRefToQSOs'](arg1, arg2, arg3);
|
return window['go']['main']['App']['AssignAwardRefToQSOs'](arg1, arg2, arg3);
|
||||||
}
|
}
|
||||||
@@ -1090,6 +1094,10 @@ export function GetStationStatus() {
|
|||||||
return window['go']['main']['App']['GetStationStatus']();
|
return window['go']['main']['App']['GetStationStatus']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function GetTCIPanel() {
|
||||||
|
return window['go']['main']['App']['GetTCIPanel']();
|
||||||
|
}
|
||||||
|
|
||||||
export function GetTelemetryEnabled() {
|
export function GetTelemetryEnabled() {
|
||||||
return window['go']['main']['App']['GetTelemetryEnabled']();
|
return window['go']['main']['App']['GetTelemetryEnabled']();
|
||||||
}
|
}
|
||||||
@@ -2254,6 +2262,82 @@ export function SetSpotTTLMinutes(arg1) {
|
|||||||
return window['go']['main']['App']['SetSpotTTLMinutes'](arg1);
|
return window['go']['main']['App']['SetSpotTTLMinutes'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function SetTCIAGC(arg1) {
|
||||||
|
return window['go']['main']['App']['SetTCIAGC'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetTCIANF(arg1) {
|
||||||
|
return window['go']['main']['App']['SetTCIANF'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetTCIAPF(arg1) {
|
||||||
|
return window['go']['main']['App']['SetTCIAPF'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetTCIDrive(arg1) {
|
||||||
|
return window['go']['main']['App']['SetTCIDrive'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetTCIFilter(arg1, arg2) {
|
||||||
|
return window['go']['main']['App']['SetTCIFilter'](arg1, arg2);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetTCILock(arg1) {
|
||||||
|
return window['go']['main']['App']['SetTCILock'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetTCIMicLevel(arg1) {
|
||||||
|
return window['go']['main']['App']['SetTCIMicLevel'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetTCIMute(arg1) {
|
||||||
|
return window['go']['main']['App']['SetTCIMute'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetTCINB(arg1) {
|
||||||
|
return window['go']['main']['App']['SetTCINB'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetTCINR(arg1) {
|
||||||
|
return window['go']['main']['App']['SetTCINR'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetTCIRIT(arg1) {
|
||||||
|
return window['go']['main']['App']['SetTCIRIT'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetTCIRITOffset(arg1) {
|
||||||
|
return window['go']['main']['App']['SetTCIRITOffset'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetTCISquelch(arg1) {
|
||||||
|
return window['go']['main']['App']['SetTCISquelch'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetTCISquelchLevel(arg1) {
|
||||||
|
return window['go']['main']['App']['SetTCISquelchLevel'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetTCITune(arg1) {
|
||||||
|
return window['go']['main']['App']['SetTCITune'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetTCITuneDrive(arg1) {
|
||||||
|
return window['go']['main']['App']['SetTCITuneDrive'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetTCIVolume(arg1) {
|
||||||
|
return window['go']['main']['App']['SetTCIVolume'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetTCIXIT(arg1) {
|
||||||
|
return window['go']['main']['App']['SetTCIXIT'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetTCIXITOffset(arg1) {
|
||||||
|
return window['go']['main']['App']['SetTCIXITOffset'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function SetTelemetryEnabled(arg1) {
|
export function SetTelemetryEnabled(arg1) {
|
||||||
return window['go']['main']['App']['SetTelemetryEnabled'](arg1);
|
return window['go']['main']['App']['SetTelemetryEnabled'](arg1);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1210,6 +1210,76 @@ export namespace cat {
|
|||||||
this.fixed = source["fixed"];
|
this.fixed = source["fixed"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
export class TCIPanelState {
|
||||||
|
connected: boolean;
|
||||||
|
device?: string;
|
||||||
|
protocol?: string;
|
||||||
|
drive: number;
|
||||||
|
tune_drive: number;
|
||||||
|
mic_level: number;
|
||||||
|
tx_enabled: boolean;
|
||||||
|
tx: boolean;
|
||||||
|
tuning: boolean;
|
||||||
|
volume: number;
|
||||||
|
mute: boolean;
|
||||||
|
agc?: string;
|
||||||
|
squelch_on: boolean;
|
||||||
|
squelch: number;
|
||||||
|
nb: boolean;
|
||||||
|
nr: boolean;
|
||||||
|
anf: boolean;
|
||||||
|
apf: boolean;
|
||||||
|
filter_lo: number;
|
||||||
|
filter_hi: number;
|
||||||
|
rit: boolean;
|
||||||
|
rit_offset: number;
|
||||||
|
xit: boolean;
|
||||||
|
xit_offset: number;
|
||||||
|
lock: boolean;
|
||||||
|
split: boolean;
|
||||||
|
smeter: number;
|
||||||
|
tx_power_w: number;
|
||||||
|
tx_swr: number;
|
||||||
|
modulations?: string[];
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new TCIPanelState(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.connected = source["connected"];
|
||||||
|
this.device = source["device"];
|
||||||
|
this.protocol = source["protocol"];
|
||||||
|
this.drive = source["drive"];
|
||||||
|
this.tune_drive = source["tune_drive"];
|
||||||
|
this.mic_level = source["mic_level"];
|
||||||
|
this.tx_enabled = source["tx_enabled"];
|
||||||
|
this.tx = source["tx"];
|
||||||
|
this.tuning = source["tuning"];
|
||||||
|
this.volume = source["volume"];
|
||||||
|
this.mute = source["mute"];
|
||||||
|
this.agc = source["agc"];
|
||||||
|
this.squelch_on = source["squelch_on"];
|
||||||
|
this.squelch = source["squelch"];
|
||||||
|
this.nb = source["nb"];
|
||||||
|
this.nr = source["nr"];
|
||||||
|
this.anf = source["anf"];
|
||||||
|
this.apf = source["apf"];
|
||||||
|
this.filter_lo = source["filter_lo"];
|
||||||
|
this.filter_hi = source["filter_hi"];
|
||||||
|
this.rit = source["rit"];
|
||||||
|
this.rit_offset = source["rit_offset"];
|
||||||
|
this.xit = source["xit"];
|
||||||
|
this.xit_offset = source["xit_offset"];
|
||||||
|
this.lock = source["lock"];
|
||||||
|
this.split = source["split"];
|
||||||
|
this.smeter = source["smeter"];
|
||||||
|
this.tx_power_w = source["tx_power_w"];
|
||||||
|
this.tx_swr = source["tx_swr"];
|
||||||
|
this.modulations = source["modulations"];
|
||||||
|
}
|
||||||
|
}
|
||||||
export class YaesuTXState {
|
export class YaesuTXState {
|
||||||
available: boolean;
|
available: boolean;
|
||||||
model?: string;
|
model?: string;
|
||||||
@@ -1500,6 +1570,51 @@ export namespace extsvc {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export namespace kpa {
|
||||||
|
|
||||||
|
export class Status {
|
||||||
|
connected: boolean;
|
||||||
|
transport: string;
|
||||||
|
model?: string;
|
||||||
|
last_error?: string;
|
||||||
|
power_on: boolean;
|
||||||
|
operate: boolean;
|
||||||
|
fwd_w: number;
|
||||||
|
swr: number;
|
||||||
|
volt_v: number;
|
||||||
|
cur_a: number;
|
||||||
|
temp_c: number;
|
||||||
|
band?: string;
|
||||||
|
tuning: boolean;
|
||||||
|
fault_code: number;
|
||||||
|
fault_text?: string;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new Status(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.connected = source["connected"];
|
||||||
|
this.transport = source["transport"];
|
||||||
|
this.model = source["model"];
|
||||||
|
this.last_error = source["last_error"];
|
||||||
|
this.power_on = source["power_on"];
|
||||||
|
this.operate = source["operate"];
|
||||||
|
this.fwd_w = source["fwd_w"];
|
||||||
|
this.swr = source["swr"];
|
||||||
|
this.volt_v = source["volt_v"];
|
||||||
|
this.cur_a = source["cur_a"];
|
||||||
|
this.temp_c = source["temp_c"];
|
||||||
|
this.band = source["band"];
|
||||||
|
this.tuning = source["tuning"];
|
||||||
|
this.fault_code = source["fault_code"];
|
||||||
|
this.fault_text = source["fault_text"];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
export namespace lookup {
|
export namespace lookup {
|
||||||
|
|
||||||
export class Result {
|
export class Result {
|
||||||
@@ -1701,6 +1816,7 @@ export namespace main {
|
|||||||
pgxl?: powergenius.Status;
|
pgxl?: powergenius.Status;
|
||||||
spe?: spe.Status;
|
spe?: spe.Status;
|
||||||
acom?: acom.Status;
|
acom?: acom.Status;
|
||||||
|
kpa?: kpa.Status;
|
||||||
|
|
||||||
static createFrom(source: any = {}) {
|
static createFrom(source: any = {}) {
|
||||||
return new AmpStatus(source);
|
return new AmpStatus(source);
|
||||||
@@ -1714,6 +1830,7 @@ export namespace main {
|
|||||||
this.pgxl = this.convertValues(source["pgxl"], powergenius.Status);
|
this.pgxl = this.convertValues(source["pgxl"], powergenius.Status);
|
||||||
this.spe = this.convertValues(source["spe"], spe.Status);
|
this.spe = this.convertValues(source["spe"], spe.Status);
|
||||||
this.acom = this.convertValues(source["acom"], acom.Status);
|
this.acom = this.convertValues(source["acom"], acom.Status);
|
||||||
|
this.kpa = this.convertValues(source["kpa"], kpa.Status);
|
||||||
}
|
}
|
||||||
|
|
||||||
convertValues(a: any, classs: any, asMap: boolean = false): any {
|
convertValues(a: any, classs: any, asMap: boolean = false): any {
|
||||||
@@ -3349,6 +3466,36 @@ export namespace main {
|
|||||||
this.team_last60 = source["team_last60"];
|
this.team_last60 = source["team_last60"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
export class RDAApplyResult {
|
||||||
|
applied: number;
|
||||||
|
failed: number;
|
||||||
|
message: string;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new RDAApplyResult(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.applied = source["applied"];
|
||||||
|
this.failed = source["failed"];
|
||||||
|
this.message = source["message"];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
export class RDAChoice {
|
||||||
|
qso_id: number;
|
||||||
|
district: string;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new RDAChoice(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.qso_id = source["qso_id"];
|
||||||
|
this.district = source["district"];
|
||||||
|
}
|
||||||
|
}
|
||||||
export class RDAConflict {
|
export class RDAConflict {
|
||||||
qso_id: number;
|
qso_id: number;
|
||||||
callsign: string;
|
callsign: string;
|
||||||
|
|||||||
+18
-26
@@ -264,9 +264,18 @@ func matchWildcard(pattern, v string) bool {
|
|||||||
return re.MatchString(v)
|
return re.MatchString(v)
|
||||||
}
|
}
|
||||||
|
|
||||||
// InferMode guesses a spot's mode from its comment and frequency. Cluster spots
|
// InferMode works out a spot's mode from its comment, then from the band plan.
|
||||||
// don't carry a mode field, so we read common tags (FT8/FT4/CW/RTTY/…) then fall
|
//
|
||||||
// back to the digital watering holes and the band-plan CW/phone split.
|
// Cluster lines carry no mode field, so this is all there is — and it feeds the
|
||||||
|
// alert rules, the FlexRadio panadapter colours and the spot the radio is told
|
||||||
|
// about. It used to end with a bare "return SSB" for anything its handful of CW
|
||||||
|
// ranges did not cover, which is how a 30 m FT8 spot at 10131.5 raised an alert
|
||||||
|
// announcing SSB while the cluster list beside it said DATA.
|
||||||
|
//
|
||||||
|
// The comment still wins when it names a mode: a spotter who wrote FT8 knows
|
||||||
|
// better than any table. Below that is the shared band plan (bandplan.go), and
|
||||||
|
// below THAT is nothing — an empty mode, which callers read as "unknown" rather
|
||||||
|
// than as a claim.
|
||||||
func InferMode(comment string, freqHz int64) string {
|
func InferMode(comment string, freqHz int64) string {
|
||||||
c := strings.ToUpper(comment)
|
c := strings.ToUpper(comment)
|
||||||
switch {
|
switch {
|
||||||
@@ -280,30 +289,13 @@ func InferMode(comment string, freqHz int64) string {
|
|||||||
return "PSK"
|
return "PSK"
|
||||||
case strings.Contains(c, "JS8"):
|
case strings.Contains(c, "JS8"):
|
||||||
return "JS8"
|
return "JS8"
|
||||||
case strings.Contains(c, "CW"):
|
// WPM is as good as the word CW: nothing else is reported in words per
|
||||||
|
// minute, and RBN spots carry it on every line.
|
||||||
|
case strings.Contains(c, "CW"), strings.Contains(c, "WPM"):
|
||||||
return "CW"
|
return "CW"
|
||||||
case strings.Contains(c, "SSB") || strings.Contains(c, "USB") || strings.Contains(c, "LSB") || strings.Contains(c, "PH"):
|
case strings.Contains(c, "SSB"), strings.Contains(c, "USB"),
|
||||||
|
strings.Contains(c, "LSB"), strings.Contains(c, "PH"):
|
||||||
return "SSB"
|
return "SSB"
|
||||||
}
|
}
|
||||||
khz := float64(freqHz) / 1000
|
return modeFromFrequency(freqHz)
|
||||||
// FT8 watering holes (…074) and FT4 (…080/…140) as a fallback.
|
|
||||||
for _, f := range []float64{1840, 3573, 7074, 10136, 14074, 18100, 21074, 24915, 28074, 50313} {
|
|
||||||
if khz >= f-1 && khz <= f+3 {
|
|
||||||
return "FT8"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// Band-plan CW segments (bottom of each band).
|
|
||||||
switch {
|
|
||||||
case khz >= 1810 && khz <= 1840,
|
|
||||||
khz >= 3500 && khz <= 3570,
|
|
||||||
khz >= 7000 && khz <= 7040,
|
|
||||||
khz >= 10100 && khz <= 10130,
|
|
||||||
khz >= 14000 && khz <= 14070,
|
|
||||||
khz >= 18068 && khz <= 18095,
|
|
||||||
khz >= 21000 && khz <= 21070,
|
|
||||||
khz >= 24890 && khz <= 24910,
|
|
||||||
khz >= 28000 && khz <= 28070:
|
|
||||||
return "CW"
|
|
||||||
}
|
|
||||||
return "SSB"
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,76 @@
|
|||||||
|
package alerts
|
||||||
|
|
||||||
|
// The band plan behind InferMode, and why it is written out segment by segment.
|
||||||
|
//
|
||||||
|
// A cluster line carries no mode, so it has to be inferred — and OpsLog was
|
||||||
|
// inferring it TWICE, in two places, from two different tables. The frontend
|
||||||
|
// knew that 10.130-10.150 is the 30 m data segment; this side only knew a CW
|
||||||
|
// range that stopped at 10.130 and called everything after it SSB. So a spot at
|
||||||
|
// 10131.5 showed as DATA in the cluster list and raised an alert saying SSB.
|
||||||
|
// Reported with a screenshot of exactly that, on RI1FJL.
|
||||||
|
//
|
||||||
|
// The two tables are now the same table, transcribed from the frontend's
|
||||||
|
// (frontend/src/lib/spot.ts) with its segment boundaries kept intact. They stay
|
||||||
|
// two files because they are two languages, and the test next door is what
|
||||||
|
// keeps them one answer.
|
||||||
|
|
||||||
|
// modeSeg is one stretch of a band, in Hz, and what is worked there.
|
||||||
|
type modeSeg struct {
|
||||||
|
loHz, hiHz int64
|
||||||
|
mode string
|
||||||
|
}
|
||||||
|
|
||||||
|
// bandPlan is scanned IN ORDER, so a narrow watering hole listed before the
|
||||||
|
// wide segment it sits inside wins — FT8 at 14.074 before the 14.070-14.100
|
||||||
|
// data block. Order is the whole mechanism here; sorting this table by
|
||||||
|
// frequency would quietly turn every FT8 hole into "DATA".
|
||||||
|
var bandPlan = []modeSeg{
|
||||||
|
{1_800_000, 1_838_000, "CW"}, {1_838_000, 1_840_000, "FT8"}, {1_840_000, 2_000_000, "SSB"},
|
||||||
|
|
||||||
|
{3_573_000, 3_576_000, "FT8"}, {3_500_000, 3_580_000, "CW"},
|
||||||
|
{3_580_000, 3_600_000, "DATA"}, {3_600_000, 4_000_000, "SSB"},
|
||||||
|
|
||||||
|
{5_300_000, 5_500_000, "SSB"},
|
||||||
|
|
||||||
|
{7_074_000, 7_077_000, "FT8"}, {7_047_500, 7_048_500, "FT4"},
|
||||||
|
{7_000_000, 7_040_000, "CW"}, {7_040_000, 7_100_000, "DATA"}, {7_100_000, 7_300_000, "SSB"},
|
||||||
|
|
||||||
|
// 30 m: CW to 10.130, data above it — and nothing else. No SSB on this band.
|
||||||
|
{10_100_000, 10_130_000, "CW"}, {10_130_000, 10_150_000, "DATA"},
|
||||||
|
|
||||||
|
{14_074_000, 14_077_000, "FT8"}, {14_080_000, 14_081_500, "FT4"},
|
||||||
|
{14_000_000, 14_070_000, "CW"}, {14_070_000, 14_100_000, "DATA"}, {14_100_000, 14_350_000, "SSB"},
|
||||||
|
|
||||||
|
{18_100_000, 18_103_000, "FT8"},
|
||||||
|
{18_068_000, 18_095_000, "CW"}, {18_095_000, 18_110_000, "DATA"}, {18_110_000, 18_168_000, "SSB"},
|
||||||
|
|
||||||
|
{21_074_000, 21_077_000, "FT8"}, {21_140_000, 21_143_000, "FT4"},
|
||||||
|
{21_000_000, 21_070_000, "CW"}, {21_070_000, 21_150_000, "DATA"}, {21_150_000, 21_450_000, "SSB"},
|
||||||
|
|
||||||
|
{24_915_000, 24_917_000, "FT8"},
|
||||||
|
{24_890_000, 24_915_000, "CW"}, {24_915_000, 24_940_000, "DATA"}, {24_940_000, 24_990_000, "SSB"},
|
||||||
|
|
||||||
|
{28_074_000, 28_077_000, "FT8"}, {28_180_000, 28_183_000, "FT4"},
|
||||||
|
{28_000_000, 28_070_000, "CW"}, {28_070_000, 28_300_000, "DATA"}, {28_300_000, 29_700_000, "SSB"},
|
||||||
|
|
||||||
|
{50_313_000, 50_316_000, "FT8"}, {50_318_000, 50_321_000, "FT4"},
|
||||||
|
{50_000_000, 50_100_000, "CW"}, {50_100_000, 50_500_000, "SSB"},
|
||||||
|
|
||||||
|
{144_174_000, 144_177_000, "FT8"},
|
||||||
|
{144_000_000, 144_150_000, "CW"}, {144_150_000, 144_500_000, "SSB"},
|
||||||
|
}
|
||||||
|
|
||||||
|
// modeFromFrequency returns what the band plan says is worked at freqHz, or ""
|
||||||
|
// where it says nothing.
|
||||||
|
//
|
||||||
|
// Empty rather than a guess: a spot outside every listed segment is on a band
|
||||||
|
// this table does not cover, and answering "SSB" for it is how a 30 m data spot
|
||||||
|
// came to raise an SSB alert.
|
||||||
|
func modeFromFrequency(freqHz int64) string {
|
||||||
|
for _, s := range bandPlan {
|
||||||
|
if freqHz >= s.loHz && freqHz < s.hiHz {
|
||||||
|
return s.mode
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
@@ -0,0 +1,71 @@
|
|||||||
|
package alerts
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
// The spot that started it: RI1FJL on 10131.5, an FT8 station in the 30 m data
|
||||||
|
// segment. The cluster list showed DATA and the alert announced SSB, because
|
||||||
|
// this side's table stopped its CW range at 10.130 and called everything above
|
||||||
|
// it phone.
|
||||||
|
func TestInferModeDoesNotCallThirtyMetresSSB(t *testing.T) {
|
||||||
|
if got := InferMode("", 10_131_500); got != "DATA" {
|
||||||
|
t.Errorf("10131.5 kHz → %q, want DATA (there is no SSB on 30 m)", got)
|
||||||
|
}
|
||||||
|
// And the CW half of the same band still reads as CW.
|
||||||
|
if got := InferMode("", 10_110_000); got != "CW" {
|
||||||
|
t.Errorf("10110 kHz → %q, want CW", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The comment beats the band plan. A spotter who names the mode knows something
|
||||||
|
// no table does — an FT8 station calling outside the usual watering hole, a CW
|
||||||
|
// operation in a data segment during a contest.
|
||||||
|
func TestInferModeTrustsTheCommentFirst(t *testing.T) {
|
||||||
|
cases := map[string]struct {
|
||||||
|
comment string
|
||||||
|
freqHz int64
|
||||||
|
want string
|
||||||
|
}{
|
||||||
|
"FT8 said outright": {"-14 dB FT8", 14_200_000, "FT8"},
|
||||||
|
"CW in a data segment": {"CW 599", 14_080_000, "CW"},
|
||||||
|
"RBN reports WPM not CW": {"18 dB 25 WPM CQ", 14_080_000, "CW"},
|
||||||
|
"phone below the split": {"SSB net", 7_010_000, "SSB"},
|
||||||
|
}
|
||||||
|
for name, c := range cases {
|
||||||
|
t.Run(name, func(t *testing.T) {
|
||||||
|
if got := InferMode(c.comment, c.freqHz); got != c.want {
|
||||||
|
t.Errorf("InferMode(%q, %d) = %q, want %q", c.comment, c.freqHz, got, c.want)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The watering holes are listed before the wide data blocks they sit inside, and
|
||||||
|
// the table is scanned in order — so sorting it by frequency would quietly turn
|
||||||
|
// every FT8 hole into "DATA". This is what would fail if somebody did.
|
||||||
|
func TestBandPlanKeepsTheWateringHolesAheadOfTheDataBlocks(t *testing.T) {
|
||||||
|
holes := map[int64]string{
|
||||||
|
3_573_500: "FT8",
|
||||||
|
7_074_500: "FT8",
|
||||||
|
7_048_000: "FT4",
|
||||||
|
14_074_500: "FT8",
|
||||||
|
14_080_500: "FT4",
|
||||||
|
21_074_500: "FT8",
|
||||||
|
28_074_500: "FT8",
|
||||||
|
50_313_500: "FT8",
|
||||||
|
}
|
||||||
|
for hz, want := range holes {
|
||||||
|
if got := modeFromFrequency(hz); got != want {
|
||||||
|
t.Errorf("%d Hz → %q, want %q", hz, got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Nothing is claimed for a frequency the plan does not cover. Answering "SSB"
|
||||||
|
// for whatever fell through is the exact fault this file exists to fix.
|
||||||
|
func TestModeFromFrequencyIsSilentWhenItDoesNotKnow(t *testing.T) {
|
||||||
|
for _, hz := range []int64{500_000, 6_000_000, 70_200_000, 432_100_000} {
|
||||||
|
if got := modeFromFrequency(hz); got != "" {
|
||||||
|
t.Errorf("%d Hz → %q, want \"\" (outside the plan)", hz, got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+35
-2
@@ -34,6 +34,10 @@ type TCI struct {
|
|||||||
OnSpotClick func(callsign string, freqHz int64)
|
OnSpotClick func(callsign string, freqHz int64)
|
||||||
unhandledSeen map[string]bool // log each unknown TCI message type once
|
unhandledSeen map[string]bool // log each unknown TCI message type once
|
||||||
|
|
||||||
|
// panel is the control-console state — everything the radio announces about
|
||||||
|
// itself that is not frequency or mode. See tci_panel.go.
|
||||||
|
panel tciPanel
|
||||||
|
|
||||||
// audio holds the receive-audio stream — see tci_audio.go. TCI carries it
|
// audio holds the receive-audio stream — see tci_audio.go. TCI carries it
|
||||||
// on this same WebSocket, which is what lets a SunSDR record and decode
|
// on this same WebSocket, which is what lets a SunSDR record and decode
|
||||||
// without a virtual audio cable in the way.
|
// without a virtual audio cable in the way.
|
||||||
@@ -300,6 +304,22 @@ func (t *TCI) ReadState() (RigState, error) {
|
|||||||
} else {
|
} else {
|
||||||
st.FreqHz = t.freqA
|
st.FreqHz = t.freqA
|
||||||
}
|
}
|
||||||
|
// The transmit meters are asked for, not pushed: TX_POWER and TX_SWR are
|
||||||
|
// read-only commands the radio answers when asked, and asking is only worth
|
||||||
|
// anything while it is keyed. Fired and forgotten from here — the answers
|
||||||
|
// arrive on the reader like everything else — and only while transmitting,
|
||||||
|
// so a receiving station pays nothing for a meter nobody is watching.
|
||||||
|
// Keyed by PTT **or** by TUNE. A tune carrier is exactly when the meters
|
||||||
|
// matter most — it is the carrier an operator is watching an SWR on — and
|
||||||
|
// asking only on t.tx left them at zero for the whole tune, because the
|
||||||
|
// radio reports tuning as its own state and not as a transmission.
|
||||||
|
if t.tx || t.panel.st.Tuning {
|
||||||
|
tx := t
|
||||||
|
go func() {
|
||||||
|
_ = tx.send("tx_power;")
|
||||||
|
_ = tx.send("tx_swr;")
|
||||||
|
}()
|
||||||
|
}
|
||||||
st.Mode = tciModeToADIF(t.mode, t.digitalDefault)
|
st.Mode = tciModeToADIF(t.mode, t.digitalDefault)
|
||||||
if st.FreqHz > 0 {
|
if st.FreqHz > 0 {
|
||||||
st.Band = BandFromHz(st.FreqHz)
|
st.Band = BandFromHz(st.FreqHz)
|
||||||
@@ -457,7 +477,20 @@ func (t *TCI) handle(msg string) {
|
|||||||
}
|
}
|
||||||
t.mu.Lock()
|
t.mu.Lock()
|
||||||
defer t.mu.Unlock()
|
defer t.mu.Unlock()
|
||||||
switch strings.ToLower(name) {
|
lower := strings.ToLower(name)
|
||||||
|
// The console's own messages first. Most of them were being logged once as
|
||||||
|
// unhandled and thrown away — the radio has been announcing its drive, its
|
||||||
|
// filters and its noise blanker since the first connection.
|
||||||
|
if t.handlePanel(lower, get, args) {
|
||||||
|
// Still falls through for the few the rig state also needs (split, tune),
|
||||||
|
// which is why this does not return.
|
||||||
|
switch lower {
|
||||||
|
case "split_enable", "trx", "modulation", "vfo":
|
||||||
|
default:
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
switch lower {
|
||||||
case "device":
|
case "device":
|
||||||
t.device = strings.TrimSpace(args)
|
t.device = strings.TrimSpace(args)
|
||||||
// The radio ANNOUNCES its audio format at connect —
|
// The radio ANNOUNCES its audio format at connect —
|
||||||
@@ -524,7 +557,7 @@ func (t *TCI) handle(msg string) {
|
|||||||
t.txAllowed, t.txAllowedKnown = allowed, true
|
t.txAllowed, t.txAllowedKnown = allowed, true
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
lname := strings.ToLower(name)
|
lname := lower
|
||||||
// A click on one of our panorama spots comes back as
|
// A click on one of our panorama spots comes back as
|
||||||
// CLICKED_ON_SPOT:<call>,<hz> (legacy)
|
// CLICKED_ON_SPOT:<call>,<hz> (legacy)
|
||||||
// RX_CLICKED_ON_SPOT:<rx>,<ch>,<call>,<hz>
|
// RX_CLICKED_ON_SPOT:<rx>,<ch>,<call>,<hz>
|
||||||
|
|||||||
@@ -37,3 +37,62 @@ func (m *Manager) TCIAudioDo(fn func(TCIAudioController) error) error {
|
|||||||
return fn(tc)
|
return fn(tc)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TCIPanelController is the control console of a TCI radio — everything the
|
||||||
|
// panel reads and everything it sets.
|
||||||
|
//
|
||||||
|
// Listed one by one rather than accepted as *TCI, for the same reason the audio
|
||||||
|
// controller is: the manager hands out capabilities, not backends, and a
|
||||||
|
// station on OmniRig asking for the TCI console gets a sentence instead of a
|
||||||
|
// crash.
|
||||||
|
type TCIPanelController interface {
|
||||||
|
TCIPanel() TCIPanelState
|
||||||
|
SetDrive(v int) error
|
||||||
|
SetTuneDrive(v int) error
|
||||||
|
SetMicLevel(v int) error
|
||||||
|
SetVolume(db int) error
|
||||||
|
SetMute(on bool) error
|
||||||
|
SetAGC(mode string) error
|
||||||
|
SetSquelch(on bool) error
|
||||||
|
SetSquelchLevel(v int) error
|
||||||
|
SetNB(on bool) error
|
||||||
|
SetNR(on bool) error
|
||||||
|
SetANF(on bool) error
|
||||||
|
SetAPF(on bool) error
|
||||||
|
SetFilter(lo, hi int) error
|
||||||
|
SetRIT(on bool) error
|
||||||
|
SetXIT(on bool) error
|
||||||
|
SetRITOffset(hz int) error
|
||||||
|
SetXITOffset(hz int) error
|
||||||
|
SetLock(on bool) error
|
||||||
|
SetTune(on bool) error
|
||||||
|
}
|
||||||
|
|
||||||
|
// TCIPanelState returns the console snapshot, or (zero, false) when the active
|
||||||
|
// backend is not a TCI radio.
|
||||||
|
//
|
||||||
|
// Read WITHOUT going through the CAT goroutine: the state is a cached copy of
|
||||||
|
// what the radio pushed, guarded by its own lock, and the panel polls it several
|
||||||
|
// times a second. Queueing that behind whatever the poll loop is doing would put
|
||||||
|
// the console's smoothness at the mercy of a rig command's timeout.
|
||||||
|
func (m *Manager) TCIPanelState() (TCIPanelState, bool) {
|
||||||
|
m.mu.RLock()
|
||||||
|
b := m.backend
|
||||||
|
m.mu.RUnlock()
|
||||||
|
if tc, ok := b.(TCIPanelController); ok {
|
||||||
|
return tc.TCIPanel(), true
|
||||||
|
}
|
||||||
|
return TCIPanelState{}, false
|
||||||
|
}
|
||||||
|
|
||||||
|
// TCIPanelDo dispatches one console command onto the CAT goroutine, where every
|
||||||
|
// other write to the radio goes.
|
||||||
|
func (m *Manager) TCIPanelDo(fn func(TCIPanelController) error) error {
|
||||||
|
return m.exec(func(b Backend) error {
|
||||||
|
tc, ok := b.(TCIPanelController)
|
||||||
|
if !ok {
|
||||||
|
return fmt.Errorf("the active CAT backend is not a TCI radio")
|
||||||
|
}
|
||||||
|
return fn(tc)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,381 @@
|
|||||||
|
//go:build windows
|
||||||
|
|
||||||
|
package cat
|
||||||
|
|
||||||
|
// The TCI control panel: what the radio already tells us, gathered up.
|
||||||
|
//
|
||||||
|
// This is the cheapest panel in OpsLog, and the reason is worth saying. A K3 is
|
||||||
|
// asked — every value on its console costs a command and a reply on a serial
|
||||||
|
// line, which is why that panel reads its settings in a rotation and its meters
|
||||||
|
// only while it is on screen. TCI PUSHES: the radio announces its drive, its
|
||||||
|
// volume, its filters, its noise blanker and everything else when a client
|
||||||
|
// connects, and again whenever any of them changes, whoever changed it. There
|
||||||
|
// is nothing to poll.
|
||||||
|
//
|
||||||
|
// So this file is mostly a place to PUT what was already arriving and being
|
||||||
|
// logged as "(unhandled once)". The setters are the same names sent back the
|
||||||
|
// other way, which is how TCI works throughout: one vocabulary, both directions.
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
// TCIPanelState is the whole console in one snapshot, polled by the frontend.
|
||||||
|
//
|
||||||
|
// Values the radio has not mentioned keep their zero, which is why the
|
||||||
|
// "Known" flags exist for the ones where zero is a real setting: a squelch at 0
|
||||||
|
// and a squelch never reported are different, and a panel that cannot tell them
|
||||||
|
// apart draws a control that lies until the operator touches it.
|
||||||
|
type TCIPanelState struct {
|
||||||
|
Connected bool `json:"connected"`
|
||||||
|
Device string `json:"device,omitempty"` // what the radio calls itself
|
||||||
|
Protocol string `json:"protocol,omitempty"` // "ExpertSDR3,1.5"
|
||||||
|
|
||||||
|
// Transmit.
|
||||||
|
Drive int `json:"drive"` // 0-100
|
||||||
|
TuneDrive int `json:"tune_drive"` // 0-100, used by TUNE
|
||||||
|
MicLevel int `json:"mic_level"` // 0-100
|
||||||
|
TXEnabled bool `json:"tx_enabled"` // the radio's own permission (tx_enable)
|
||||||
|
TX bool `json:"tx"`
|
||||||
|
Tuning bool `json:"tuning"`
|
||||||
|
|
||||||
|
// Receive.
|
||||||
|
Volume int `json:"volume"` // dB, negative — TCI's own scale
|
||||||
|
Mute bool `json:"mute"`
|
||||||
|
AGC string `json:"agc,omitempty"` // off/long/slow/med/fast
|
||||||
|
SquelchOn bool `json:"squelch_on"`
|
||||||
|
Squelch int `json:"squelch"` // dBm threshold
|
||||||
|
NB bool `json:"nb"`
|
||||||
|
NR bool `json:"nr"`
|
||||||
|
ANF bool `json:"anf"`
|
||||||
|
APF bool `json:"apf"`
|
||||||
|
|
||||||
|
// Filter edges in Hz, relative to the carrier (TCI's own convention).
|
||||||
|
FilterLo int `json:"filter_lo"`
|
||||||
|
FilterHi int `json:"filter_hi"`
|
||||||
|
|
||||||
|
// Tuning aids.
|
||||||
|
RIT bool `json:"rit"`
|
||||||
|
RITOffset int `json:"rit_offset"`
|
||||||
|
XIT bool `json:"xit"`
|
||||||
|
XITOffset int `json:"xit_offset"`
|
||||||
|
Lock bool `json:"lock"`
|
||||||
|
Split bool `json:"split"`
|
||||||
|
|
||||||
|
// SMeter is the last reported signal level in dBm — the radio pushes it
|
||||||
|
// several times a second while receiving.
|
||||||
|
SMeter int `json:"smeter"`
|
||||||
|
|
||||||
|
// TXPowerW and TXSWR are the transmit meters. READ-ONLY in TCI, and only
|
||||||
|
// answered while transmitting — asked for on every poll of a keyed radio,
|
||||||
|
// see ReadState.
|
||||||
|
//
|
||||||
|
// There is no temperature in this protocol. The command list has TX_POWER
|
||||||
|
// and TX_SWR and nothing thermal at all, so a temperature reading here would
|
||||||
|
// have to be invented, and an invented temperature on a transmitter is the
|
||||||
|
// kind of number somebody trusts.
|
||||||
|
TXPowerW float64 `json:"tx_power_w"`
|
||||||
|
TXSWR float64 `json:"tx_swr"`
|
||||||
|
|
||||||
|
// Modulations is what this radio will accept, straight from its own
|
||||||
|
// announcement, so the mode buttons are the radio's and not a guess.
|
||||||
|
Modulations []string `json:"modulations,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// tciPanel is the backing state. Guarded by TCI.mu with everything else it
|
||||||
|
// arrives alongside.
|
||||||
|
type tciPanel struct {
|
||||||
|
st TCIPanelState
|
||||||
|
// logged counts what has been written per message type — see handlePanel.
|
||||||
|
logged map[string]int
|
||||||
|
}
|
||||||
|
|
||||||
|
// handlePanel takes the messages the console cares about.
|
||||||
|
//
|
||||||
|
// Returns false when the message is none of its business, so the caller can go
|
||||||
|
// on to its own cases and to the unknown-message log. Called with t.mu held.
|
||||||
|
func (t *TCI) handlePanel(name string, get func(int) string, args string) bool {
|
||||||
|
// Most of these are per-receiver ("sql_level:0,20"), and OpsLog follows
|
||||||
|
// receiver 0 throughout. A message for another receiver is accepted as
|
||||||
|
// handled and dropped: it is understood, it is simply not ours.
|
||||||
|
forRX0 := func() bool { return get(0) == "0" || get(0) == "" }
|
||||||
|
num := func(s string) (int, bool) {
|
||||||
|
n, err := strconv.Atoi(strings.TrimSpace(s))
|
||||||
|
return n, err == nil
|
||||||
|
}
|
||||||
|
yes := func(s string) bool { return strings.EqualFold(strings.TrimSpace(s), "true") }
|
||||||
|
|
||||||
|
p := &t.panel.st
|
||||||
|
// Mute and squelch are LOGGED as they change, because a report from a real
|
||||||
|
// radio says pressing MUTE lights the squelch and nothing here can explain
|
||||||
|
// it. What the radio actually announces after the command settles whether
|
||||||
|
// this is our reading or its doing, and no amount of reasoning will.
|
||||||
|
switch name {
|
||||||
|
case "mute", "sql_enable", "sql_level", "tx_power", "tx_swr", "tune":
|
||||||
|
// Logged on arrival so an ANSWER can be told from a SILENCE: the log
|
||||||
|
// showed the transmit meters being asked for and nothing coming back,
|
||||||
|
// which on its own proves nothing — a reply that arrived and failed to
|
||||||
|
// parse leaves exactly the same trace as one that never came.
|
||||||
|
//
|
||||||
|
// Capped per message type. The meters are asked for four times a second
|
||||||
|
// while transmitting, and a diagnostic that fills an evening's log is
|
||||||
|
// one that gets switched off instead of read.
|
||||||
|
if t.panel.logged == nil {
|
||||||
|
t.panel.logged = map[string]int{}
|
||||||
|
}
|
||||||
|
if n := t.panel.logged[name]; n < 20 {
|
||||||
|
t.panel.logged[name] = n + 1
|
||||||
|
debugLog.Printf("TCI: %s:%s", name, args)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
switch name {
|
||||||
|
case "protocol":
|
||||||
|
p.Protocol = strings.TrimSpace(args)
|
||||||
|
case "drive":
|
||||||
|
if n, ok := num(get(1)); ok && forRX0() {
|
||||||
|
p.Drive = n
|
||||||
|
} else if n, ok := num(get(0)); ok && get(1) == "" {
|
||||||
|
// Some firmware sends "drive:85" with no receiver index.
|
||||||
|
p.Drive = n
|
||||||
|
}
|
||||||
|
case "tune_drive":
|
||||||
|
if n, ok := num(get(1)); ok && forRX0() {
|
||||||
|
p.TuneDrive = n
|
||||||
|
} else if n, ok := num(get(0)); ok && get(1) == "" {
|
||||||
|
p.TuneDrive = n
|
||||||
|
}
|
||||||
|
case "mic_level":
|
||||||
|
if n, ok := num(get(0)); ok {
|
||||||
|
p.MicLevel = n
|
||||||
|
}
|
||||||
|
case "volume":
|
||||||
|
if n, ok := num(get(0)); ok {
|
||||||
|
p.Volume = n
|
||||||
|
}
|
||||||
|
case "mute":
|
||||||
|
// Both shapes. This radio reports "mute:0,false" and the reference shows
|
||||||
|
// "mute:true" elsewhere — reading only one of them left the button
|
||||||
|
// showing the opposite of the truth, which is worse than showing
|
||||||
|
// nothing.
|
||||||
|
if get(1) != "" {
|
||||||
|
p.Mute = yes(get(1))
|
||||||
|
} else {
|
||||||
|
p.Mute = yes(get(0))
|
||||||
|
}
|
||||||
|
case "agc_mode":
|
||||||
|
if forRX0() {
|
||||||
|
p.AGC = strings.ToLower(strings.TrimSpace(get(1)))
|
||||||
|
}
|
||||||
|
case "sql_enable":
|
||||||
|
if forRX0() {
|
||||||
|
p.SquelchOn = yes(get(1))
|
||||||
|
}
|
||||||
|
case "sql_level":
|
||||||
|
if n, ok := num(get(1)); ok && forRX0() {
|
||||||
|
p.Squelch = n
|
||||||
|
}
|
||||||
|
case "rx_nb_enable":
|
||||||
|
if forRX0() {
|
||||||
|
p.NB = yes(get(1))
|
||||||
|
}
|
||||||
|
case "rx_nr_enable":
|
||||||
|
if forRX0() {
|
||||||
|
p.NR = yes(get(1))
|
||||||
|
}
|
||||||
|
case "rx_anf_enable":
|
||||||
|
if forRX0() {
|
||||||
|
p.ANF = yes(get(1))
|
||||||
|
}
|
||||||
|
case "rx_apf_enable":
|
||||||
|
if forRX0() {
|
||||||
|
p.APF = yes(get(1))
|
||||||
|
}
|
||||||
|
case "rx_filter_band":
|
||||||
|
if forRX0() {
|
||||||
|
if lo, ok := num(get(1)); ok {
|
||||||
|
p.FilterLo = lo
|
||||||
|
}
|
||||||
|
if hi, ok := num(get(2)); ok {
|
||||||
|
p.FilterHi = hi
|
||||||
|
}
|
||||||
|
}
|
||||||
|
case "rit_enable":
|
||||||
|
if forRX0() {
|
||||||
|
p.RIT = yes(get(1))
|
||||||
|
}
|
||||||
|
case "xit_enable":
|
||||||
|
if forRX0() {
|
||||||
|
p.XIT = yes(get(1))
|
||||||
|
}
|
||||||
|
case "rit_offset":
|
||||||
|
if n, ok := num(get(1)); ok && forRX0() {
|
||||||
|
p.RITOffset = n
|
||||||
|
}
|
||||||
|
case "xit_offset":
|
||||||
|
if n, ok := num(get(1)); ok && forRX0() {
|
||||||
|
p.XITOffset = n
|
||||||
|
}
|
||||||
|
case "lock":
|
||||||
|
if forRX0() {
|
||||||
|
p.Lock = yes(get(1))
|
||||||
|
}
|
||||||
|
case "tx_power":
|
||||||
|
if v, err := strconv.ParseFloat(strings.TrimSpace(get(0)), 64); err == nil {
|
||||||
|
p.TXPowerW = v
|
||||||
|
}
|
||||||
|
case "tx_swr":
|
||||||
|
if v, err := strconv.ParseFloat(strings.TrimSpace(get(0)), 64); err == nil {
|
||||||
|
p.TXSWR = v
|
||||||
|
}
|
||||||
|
case "rx_smeter":
|
||||||
|
if n, ok := num(get(1)); ok && forRX0() {
|
||||||
|
p.SMeter = n
|
||||||
|
}
|
||||||
|
case "tune":
|
||||||
|
if forRX0() {
|
||||||
|
p.Tuning = yes(get(1))
|
||||||
|
}
|
||||||
|
case "modulations_list":
|
||||||
|
p.Modulations = splitAndTrim(args)
|
||||||
|
default:
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
// splitAndTrim turns "usb,lsb,cw" into a slice, upper-cased for display.
|
||||||
|
func splitAndTrim(s string) []string {
|
||||||
|
parts := strings.Split(s, ",")
|
||||||
|
out := make([]string, 0, len(parts))
|
||||||
|
for _, p := range parts {
|
||||||
|
if v := strings.ToUpper(strings.TrimSpace(p)); v != "" {
|
||||||
|
out = append(out, v)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
// TCIPanel returns the console snapshot.
|
||||||
|
func (t *TCI) TCIPanel() TCIPanelState {
|
||||||
|
t.mu.Lock()
|
||||||
|
defer t.mu.Unlock()
|
||||||
|
st := t.panel.st
|
||||||
|
st.Connected = t.conn != nil
|
||||||
|
st.Device = t.device
|
||||||
|
st.TX = t.tx
|
||||||
|
st.Split = t.split
|
||||||
|
st.TXEnabled = t.txAllowed || !t.txAllowedKnown
|
||||||
|
return st
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Setters ───────────────────────────────────────────────────────────────
|
||||||
|
//
|
||||||
|
// Every one of them is a SET in the same vocabulary the radio reports in, and
|
||||||
|
// none of them updates the cached state: the radio answers with the new value,
|
||||||
|
// and taking its word rather than our own is what keeps the panel honest when a
|
||||||
|
// setting is refused, clamped, or changed from the radio's own window a second
|
||||||
|
// later.
|
||||||
|
|
||||||
|
// SetDrive sets the transmit drive, 0-100.
|
||||||
|
//
|
||||||
|
// THE TRX INDEX IS PART OF THE COMMAND — "drive:0,15;", not "drive:15;". Sent
|
||||||
|
// without it the radio simply ignores it: no error, no answer, the power
|
||||||
|
// unchanged. The rule is the one the radio's own reports follow, and it was
|
||||||
|
// there to read all along: this radio announces "drive:0,85" at connect.
|
||||||
|
func (t *TCI) SetDrive(v int) error { return t.send(fmt.Sprintf("drive:0,%d;", clampTCIPct(v))) }
|
||||||
|
|
||||||
|
// SetTuneDrive sets the drive used by TUNE, 0-100. Indexed, like drive.
|
||||||
|
func (t *TCI) SetTuneDrive(v int) error {
|
||||||
|
return t.send(fmt.Sprintf("tune_drive:0,%d;", clampTCIPct(v)))
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetMicLevel sets the microphone gain, 0-100.
|
||||||
|
// Mic gain and volume are the two that are NOT indexed — the radio reports
|
||||||
|
// them as "mic_level:100" and "volume:-12", with no receiver in front. Sending
|
||||||
|
// the shape the radio speaks in is the whole rule here.
|
||||||
|
func (t *TCI) SetMicLevel(v int) error { return t.send(fmt.Sprintf("mic_level:%d;", clampTCIPct(v))) }
|
||||||
|
|
||||||
|
// SetVolume sets the receive volume in dB. TCI's scale is negative — 0 is full
|
||||||
|
// and -60 is inaudible — so this is NOT clamped to a percentage.
|
||||||
|
func (t *TCI) SetVolume(db int) error {
|
||||||
|
if db > 0 {
|
||||||
|
db = 0
|
||||||
|
}
|
||||||
|
if db < -60 {
|
||||||
|
db = -60
|
||||||
|
}
|
||||||
|
return t.send(fmt.Sprintf("volume:%d;", db))
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetMute mutes or unmutes the receiver. Indexed — the radio reports
|
||||||
|
// "mute:0,false", and a mute sent without the index goes nowhere.
|
||||||
|
func (t *TCI) SetMute(on bool) error { return t.send(fmt.Sprintf("mute:0,%t;", on)) }
|
||||||
|
|
||||||
|
// SetAGC picks the AGC speed: off, long, slow, med, fast.
|
||||||
|
func (t *TCI) SetAGC(mode string) error {
|
||||||
|
m := strings.ToLower(strings.TrimSpace(mode))
|
||||||
|
switch m {
|
||||||
|
case "off", "long", "slow", "med", "fast":
|
||||||
|
default:
|
||||||
|
return fmt.Errorf("unknown AGC mode %q", mode)
|
||||||
|
}
|
||||||
|
return t.send(fmt.Sprintf("agc_mode:0,%s;", m))
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetSquelch turns the squelch on or off.
|
||||||
|
func (t *TCI) SetSquelch(on bool) error { return t.send(fmt.Sprintf("sql_enable:0,%t;", on)) }
|
||||||
|
|
||||||
|
// SetSquelchLevel sets the threshold in dBm.
|
||||||
|
func (t *TCI) SetSquelchLevel(v int) error { return t.send(fmt.Sprintf("sql_level:0,%d;", v)) }
|
||||||
|
|
||||||
|
// SetNB, SetNR, SetANF, SetAPF switch the receive processing.
|
||||||
|
func (t *TCI) SetNB(on bool) error { return t.send(fmt.Sprintf("rx_nb_enable:0,%t;", on)) }
|
||||||
|
func (t *TCI) SetNR(on bool) error { return t.send(fmt.Sprintf("rx_nr_enable:0,%t;", on)) }
|
||||||
|
func (t *TCI) SetANF(on bool) error { return t.send(fmt.Sprintf("rx_anf_enable:0,%t;", on)) }
|
||||||
|
func (t *TCI) SetAPF(on bool) error { return t.send(fmt.Sprintf("rx_apf_enable:0,%t;", on)) }
|
||||||
|
|
||||||
|
// SetFilter sets the passband edges in Hz.
|
||||||
|
func (t *TCI) SetFilter(lo, hi int) error {
|
||||||
|
if lo > hi {
|
||||||
|
lo, hi = hi, lo
|
||||||
|
}
|
||||||
|
return t.send(fmt.Sprintf("rx_filter_band:0,%d,%d;", lo, hi))
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetRIT / SetXIT switch the offsets on, SetRITOffset / SetXITOffset move them.
|
||||||
|
func (t *TCI) SetRIT(on bool) error { return t.send(fmt.Sprintf("rit_enable:0,%t;", on)) }
|
||||||
|
func (t *TCI) SetXIT(on bool) error { return t.send(fmt.Sprintf("xit_enable:0,%t;", on)) }
|
||||||
|
func (t *TCI) SetRITOffset(hz int) error { return t.send(fmt.Sprintf("rit_offset:0,%d;", hz)) }
|
||||||
|
func (t *TCI) SetXITOffset(hz int) error { return t.send(fmt.Sprintf("xit_offset:0,%d;", hz)) }
|
||||||
|
|
||||||
|
// SetLock locks the VFO knob on the radio.
|
||||||
|
func (t *TCI) SetLock(on bool) error { return t.send(fmt.Sprintf("lock:0,%t;", on)) }
|
||||||
|
|
||||||
|
// SetTune starts or stops the tune carrier.
|
||||||
|
//
|
||||||
|
// It TRANSMITS, at tune_drive rather than at drive — which is the setting to
|
||||||
|
// check before pressing it, and why the panel shows the two side by side.
|
||||||
|
//
|
||||||
|
// The state is recorded HERE rather than waited for. This radio does not echo
|
||||||
|
// "tune:0,true", so the panel had no way of knowing a tune was running: the
|
||||||
|
// button stayed on TUNE and every further press sent another START, which is
|
||||||
|
// why it could not be switched off again. Whatever the radio says afterwards
|
||||||
|
// still wins — it simply never says anything.
|
||||||
|
func (t *TCI) SetTune(on bool) error {
|
||||||
|
t.mu.Lock()
|
||||||
|
t.panel.st.Tuning = on
|
||||||
|
t.mu.Unlock()
|
||||||
|
return t.send(fmt.Sprintf("tune:0,%t;", on))
|
||||||
|
}
|
||||||
|
|
||||||
|
func clampTCIPct(v int) int {
|
||||||
|
if v < 0 {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
if v > 100 {
|
||||||
|
return 100
|
||||||
|
}
|
||||||
|
return v
|
||||||
|
}
|
||||||
@@ -0,0 +1,97 @@
|
|||||||
|
package dxcc
|
||||||
|
|
||||||
|
// The DELETED DXCC entities, and why a lookup table needs to know about them.
|
||||||
|
//
|
||||||
|
// cty.dat answers one question: what entity is this callsign in TODAY. That is
|
||||||
|
// the right answer for a spot and the wrong one for a log. R1MVI was Malyj
|
||||||
|
// Vysotskij Island, entity 151, until the ARRL deleted it in February 2012;
|
||||||
|
// today the same callsign resolves to European Russia, 54. A 2004 contact
|
||||||
|
// re-stamped from cty.dat therefore loses the entity it was made with — and
|
||||||
|
// with it a DXCC credit that cannot be worked again, because the place no
|
||||||
|
// longer counts.
|
||||||
|
//
|
||||||
|
// Reported by an operator importing a Logger32 export: his ADIF said
|
||||||
|
// <DXCC:3>151 and OpsLog stored 54.
|
||||||
|
//
|
||||||
|
// So this list exists to be able to say "that number belongs to something that
|
||||||
|
// no longer exists, leave it alone". It is the ADIF specification's own
|
||||||
|
// enumeration of deleted entities, and it does not change except when the ARRL
|
||||||
|
// deletes another one.
|
||||||
|
var deletedEntities = map[int]string{
|
||||||
|
2: "Abu Ail Is.",
|
||||||
|
8: "Aldabra",
|
||||||
|
19: "Bajo Nuevo",
|
||||||
|
23: "Blenheim Reef",
|
||||||
|
25: "British North Borneo",
|
||||||
|
26: "British Somaliland",
|
||||||
|
28: "Canal Zone",
|
||||||
|
30: "Celebe & Molucca Is.",
|
||||||
|
39: "Comoros",
|
||||||
|
42: "Damao, Diu",
|
||||||
|
44: "Desroches",
|
||||||
|
55: "Farquhar",
|
||||||
|
57: "French Equatorial Africa",
|
||||||
|
58: "French Indo-China",
|
||||||
|
59: "French West Africa",
|
||||||
|
67: "French India",
|
||||||
|
68: "Kuwait/Saudi Arabia Neutral Zone",
|
||||||
|
81: "Germany",
|
||||||
|
85: "Bonaire, Curacao",
|
||||||
|
93: "Geyser Reef",
|
||||||
|
101: "Goa",
|
||||||
|
102: "Gold Coast, Togoland",
|
||||||
|
113: "Ifni",
|
||||||
|
115: "Italian Somaliland",
|
||||||
|
119: "Java",
|
||||||
|
127: "Kamaran Is.",
|
||||||
|
128: "Karelo-Finnish Republic",
|
||||||
|
134: "Kingman Reef",
|
||||||
|
139: "Kuria Muria I.",
|
||||||
|
151: "Malyj Vysotskij I.",
|
||||||
|
154: "Yemen Arab Republic",
|
||||||
|
155: "Malaya",
|
||||||
|
164: "Manchuria",
|
||||||
|
178: "Minerva Reef",
|
||||||
|
183: "Netherlands Borneo",
|
||||||
|
184: "Netherlands New Guinea",
|
||||||
|
186: "Newfoundland, Labrador",
|
||||||
|
193: "Okinawa (Ryukyu Is.)",
|
||||||
|
194: "Okino Tori-shima",
|
||||||
|
196: "Palestine",
|
||||||
|
200: "Portuguese Timor",
|
||||||
|
208: "Ruanda-Urundi",
|
||||||
|
210: "Saar",
|
||||||
|
218: "Czechoslovakia",
|
||||||
|
220: "Sarawak",
|
||||||
|
226: "Saudi Arabia/Iraq Neutral Zone",
|
||||||
|
228: "Serrana Bank & Roncador Cay",
|
||||||
|
229: "German Democratic Republic",
|
||||||
|
231: "Sikkim",
|
||||||
|
243: "People's Democratic Rep. of Yemen",
|
||||||
|
244: "Southern Sudan",
|
||||||
|
255: "St. Maarten, Saba, St. Eustatius",
|
||||||
|
258: "Sumatra",
|
||||||
|
261: "Swan Is.",
|
||||||
|
264: "Tangier",
|
||||||
|
267: "Territory of New Guinea",
|
||||||
|
268: "Tibet",
|
||||||
|
271: "Trieste",
|
||||||
|
307: "Zanzibar",
|
||||||
|
488: "Walvis Bay",
|
||||||
|
493: "Penguin Is.",
|
||||||
|
}
|
||||||
|
|
||||||
|
// IsDeleted reports whether a DXCC entity number names an entity the ARRL has
|
||||||
|
// deleted.
|
||||||
|
//
|
||||||
|
// The one thing every caller does with a true answer is the same: stop. A
|
||||||
|
// deleted entity cannot be looked up from a callsign, cannot be worked again,
|
||||||
|
// and cannot be corrected by anything that only knows about today.
|
||||||
|
func IsDeleted(n int) bool {
|
||||||
|
_, ok := deletedEntities[n]
|
||||||
|
return ok
|
||||||
|
}
|
||||||
|
|
||||||
|
// DeletedName is what entity n was called, or "" if it is not a deleted entity.
|
||||||
|
// Used to say WHICH entity was preserved rather than only that one was.
|
||||||
|
func DeletedName(n int) string { return deletedEntities[n] }
|
||||||
@@ -0,0 +1,46 @@
|
|||||||
|
package dxcc
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
// The contact that reported this: R1MVI, worked in 2004 on Malyj Vysotskij
|
||||||
|
// Island, entity 151, deleted in February 2012. cty.dat resolves that callsign
|
||||||
|
// to European Russia (54) today, so anything that re-stamps an old QSO from a
|
||||||
|
// callsign has to know to stop here.
|
||||||
|
func TestMalyjVysotskijIsKnownDeleted(t *testing.T) {
|
||||||
|
if !IsDeleted(151) {
|
||||||
|
t.Fatal("151 (Malyj Vysotskij I.) must be known as deleted — the whole guard hangs on it")
|
||||||
|
}
|
||||||
|
if got := DeletedName(151); got == "" {
|
||||||
|
t.Error("a deleted entity should be able to say what it was called")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The guard must not fire on entities that are alive, or every log would freeze
|
||||||
|
// at whatever DXCC number it was imported with — including the wrong ones.
|
||||||
|
func TestLiveEntitiesAreNotTreatedAsDeleted(t *testing.T) {
|
||||||
|
live := map[int]string{
|
||||||
|
54: "European Russia — what R1MVI resolves to today",
|
||||||
|
227: "France",
|
||||||
|
291: "United States",
|
||||||
|
339: "Japan",
|
||||||
|
1: "Canada",
|
||||||
|
}
|
||||||
|
for n, what := range live {
|
||||||
|
if IsDeleted(n) {
|
||||||
|
t.Errorf("%d (%s) must not be listed as deleted", n, what)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if got := DeletedName(54); got != "" {
|
||||||
|
t.Errorf("DeletedName(54) = %q, want empty", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A few more from the ADIF enumeration, so a careless edit to the table is
|
||||||
|
// caught rather than discovered by an operator whose credits moved.
|
||||||
|
func TestSomeOtherDeletedEntities(t *testing.T) {
|
||||||
|
for _, n := range []int{218 /* Czechoslovakia */, 229 /* German DR */, 255 /* St. Maarten, Saba, St. Eustatius */, 28 /* Canal Zone */} {
|
||||||
|
if !IsDeleted(n) {
|
||||||
|
t.Errorf("%d should be a deleted entity", n)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,60 @@
|
|||||||
|
// Package kpa talks to the Elecraft KPA500 and KPA1500 amplifiers.
|
||||||
|
//
|
||||||
|
// One package for both: they share the Elecraft command set — ASCII, a caret
|
||||||
|
// prefix, a semicolon terminator, case-insensitive on the way in and upper case
|
||||||
|
// on the way back — which is the same family as the K3/K4 panel in
|
||||||
|
// internal/cat. What differs between the two models is the transport and which
|
||||||
|
// commands exist, not the grammar.
|
||||||
|
//
|
||||||
|
// # Transports
|
||||||
|
//
|
||||||
|
// KPA500: serial only.
|
||||||
|
//
|
||||||
|
// KPA1500: serial, and a network server. Four things may be connected AT ONCE,
|
||||||
|
// which is unusual enough to design around — the Host PC USB port, the XCVR
|
||||||
|
// SERIAL connector when repurposed as a second host, ONE TCP client, and any
|
||||||
|
// number of UDP clients:
|
||||||
|
//
|
||||||
|
// - TCP on port 1500 (changed with ^CP). Single client. If the operator
|
||||||
|
// already has the Elecraft utility or another program on TCP, OpsLog will
|
||||||
|
// not get in, and the failure is a refused connection rather than anything
|
||||||
|
// the amplifier says.
|
||||||
|
// - UDP on the same port. Many clients, one command per packet and at most
|
||||||
|
// one response, and packets may be dropped under congestion — so it is the
|
||||||
|
// right choice for sharing the amplifier and the wrong one for a command
|
||||||
|
// that must not be missed.
|
||||||
|
//
|
||||||
|
// # Pacing
|
||||||
|
//
|
||||||
|
// There is NO flow control. The reference is explicit: pace commands by waiting
|
||||||
|
// for the response to the previous one. So this client is strictly
|
||||||
|
// question-and-answer on one connection, like the ACOM and SPE clients, rather
|
||||||
|
// than firing a poll cycle and sorting out the replies afterwards.
|
||||||
|
//
|
||||||
|
// # Serial speed
|
||||||
|
//
|
||||||
|
// 4800 to 230400, 8N1, set on the amplifier (^BR / SERIAL SPEED HOST) and not
|
||||||
|
// negotiated. Elecraft's own utility finds it by sending bare semicolons at
|
||||||
|
// each speed until something answers — worth copying if operators turn up with
|
||||||
|
// amplifiers whose speed they do not know.
|
||||||
|
//
|
||||||
|
// # What is settled, and how
|
||||||
|
//
|
||||||
|
// From the KPA1500 Programming Reference:
|
||||||
|
//
|
||||||
|
// - ^SW is the SWR IN TENTHS. "123 is 12.3:1", so ^SW015 is 1.5:1. This was
|
||||||
|
// first taken from Hamlib's backend and is now confirmed by the document,
|
||||||
|
// which matters more than it sounds: a wrongly scaled SWR bar reports a
|
||||||
|
// good match on a bad antenna.
|
||||||
|
// - ^WS returns forward power AND SWR together, ^VI returns PA voltage AND
|
||||||
|
// current together. Two round trips instead of four on the link the display
|
||||||
|
// depends on while the operator is transmitting.
|
||||||
|
// - ^SF returns the fault log: index, fault code, a short name in quotes, a
|
||||||
|
// timestamp, and fault-specific values. ^FC describes the codes.
|
||||||
|
//
|
||||||
|
// # Not touched
|
||||||
|
//
|
||||||
|
// ^TX simulates a KEY IN — it makes the amplifier transmit from software — and
|
||||||
|
// ^ON0 switches the main supplies off. Neither belongs on a poll loop or behind
|
||||||
|
// a button that can be pressed by accident.
|
||||||
|
package kpa
|
||||||
@@ -0,0 +1,412 @@
|
|||||||
|
package kpa
|
||||||
|
|
||||||
|
// The client: one connection, strict question-and-answer, a cached status.
|
||||||
|
//
|
||||||
|
// Shaped like internal/acom and internal/spe so a third amplifier is the same
|
||||||
|
// thing to read — but the traffic is the opposite kind. Those two are told to
|
||||||
|
// stream and are then listened to; this one is asked, and answers. The
|
||||||
|
// reference is explicit that there is no flow control and that commands are
|
||||||
|
// paced by waiting for the previous reply, so nothing here ever has two
|
||||||
|
// questions outstanding.
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bufio"
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"net"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"go.bug.st/serial"
|
||||||
|
|
||||||
|
"hamlog/internal/applog"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
dialTimeout = 5 * time.Second
|
||||||
|
ioTimeout = 2 * time.Second
|
||||||
|
// pollInterval is the fast cycle: forward power, SWR, and whether a fault has
|
||||||
|
// appeared. Four times a second is enough for a bar that is read while
|
||||||
|
// talking, and it is four round trips a second on a link with no flow
|
||||||
|
// control — faster buys nothing and costs the set commands their latency.
|
||||||
|
pollInterval = 250 * time.Millisecond
|
||||||
|
// slowEvery is how many fast cycles pass between the readings that do not
|
||||||
|
// move: mode, band, temperature, supply. Once a second.
|
||||||
|
slowEvery = 4
|
||||||
|
)
|
||||||
|
|
||||||
|
// Status is what the panel polls.
|
||||||
|
type Status struct {
|
||||||
|
Connected bool `json:"connected"`
|
||||||
|
Transport string `json:"transport"` // "serial" | "tcp"
|
||||||
|
Model string `json:"model,omitempty"`
|
||||||
|
LastError string `json:"last_error,omitempty"`
|
||||||
|
|
||||||
|
// PowerOn is the main supplies (^ON), Operate is OPERATE vs STANDBY (^OS).
|
||||||
|
// They are different questions: an amplifier can be switched on and in
|
||||||
|
// standby, which is the normal state between overs.
|
||||||
|
PowerOn bool `json:"power_on"`
|
||||||
|
Operate bool `json:"operate"`
|
||||||
|
|
||||||
|
FwdW int `json:"fwd_w"`
|
||||||
|
SWR float64 `json:"swr"`
|
||||||
|
VoltV float64 `json:"volt_v"`
|
||||||
|
CurA int `json:"cur_a"`
|
||||||
|
TempC int `json:"temp_c"`
|
||||||
|
Band string `json:"band,omitempty"`
|
||||||
|
|
||||||
|
// Tuning is the ATU mid-cycle (^TP), so a panel can say so rather than
|
||||||
|
// showing a wild SWR and a power reading nobody should act on.
|
||||||
|
Tuning bool `json:"tuning"`
|
||||||
|
|
||||||
|
// Fault is the current fault code and its meaning. A fault puts the
|
||||||
|
// amplifier in STANDBY by itself, so it is the first thing to show.
|
||||||
|
FaultCode int `json:"fault_code"`
|
||||||
|
FaultText string `json:"fault_text,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// Config selects the model and how to reach it.
|
||||||
|
type Config struct {
|
||||||
|
Model string // "KPA500" | "KPA1500"
|
||||||
|
Transport string // "serial" | "tcp"
|
||||||
|
ComPort string // serial
|
||||||
|
Baud int // serial: 4800…230400, set on the amplifier and not negotiated
|
||||||
|
Host string // tcp (KPA1500 only)
|
||||||
|
Port int // tcp, default 1500
|
||||||
|
}
|
||||||
|
|
||||||
|
type Client struct {
|
||||||
|
cfg Config
|
||||||
|
|
||||||
|
mu sync.Mutex // serialises the connection: one question at a time
|
||||||
|
conn io.ReadWriteCloser
|
||||||
|
rd *bufio.Reader
|
||||||
|
|
||||||
|
statusMu sync.RWMutex
|
||||||
|
status Status
|
||||||
|
|
||||||
|
stop chan struct{}
|
||||||
|
running bool
|
||||||
|
}
|
||||||
|
|
||||||
|
// New builds a client. Nothing is opened until Start.
|
||||||
|
func New(cfg Config) *Client {
|
||||||
|
if cfg.Baud <= 0 {
|
||||||
|
cfg.Baud = 38400
|
||||||
|
}
|
||||||
|
if cfg.Port <= 0 {
|
||||||
|
cfg.Port = 1500
|
||||||
|
}
|
||||||
|
if strings.TrimSpace(cfg.Model) == "" {
|
||||||
|
cfg.Model = "KPA1500"
|
||||||
|
}
|
||||||
|
c := &Client{cfg: cfg, stop: make(chan struct{})}
|
||||||
|
c.status.Transport = cfg.Transport
|
||||||
|
c.status.Model = strings.ToUpper(strings.TrimSpace(cfg.Model))
|
||||||
|
return c
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *Client) Start() error {
|
||||||
|
if c.running {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
c.running = true
|
||||||
|
go c.pollLoop()
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *Client) Stop() {
|
||||||
|
if !c.running {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
c.running = false
|
||||||
|
close(c.stop)
|
||||||
|
c.mu.Lock()
|
||||||
|
c.dropLocked()
|
||||||
|
c.mu.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *Client) GetStatus() Status {
|
||||||
|
c.statusMu.RLock()
|
||||||
|
defer c.statusMu.RUnlock()
|
||||||
|
return c.status
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *Client) setErr(msg string) {
|
||||||
|
c.statusMu.Lock()
|
||||||
|
was := c.status.LastError
|
||||||
|
c.status.Connected = false
|
||||||
|
c.status.LastError = msg
|
||||||
|
c.statusMu.Unlock()
|
||||||
|
// Logged on CHANGE only: a disconnected amplifier is polled four times a
|
||||||
|
// second, and the log is where a hardware problem is diagnosed hours later.
|
||||||
|
if msg != "" && msg != was {
|
||||||
|
applog.Printf("kpa: %s", msg)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// dropLocked closes the connection. Caller holds c.mu.
|
||||||
|
func (c *Client) dropLocked() {
|
||||||
|
if c.conn != nil {
|
||||||
|
_ = c.conn.Close()
|
||||||
|
c.conn = nil
|
||||||
|
c.rd = nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// connectLocked opens the transport. Caller holds c.mu.
|
||||||
|
func (c *Client) connectLocked() error {
|
||||||
|
if c.conn != nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
switch strings.ToLower(strings.TrimSpace(c.cfg.Transport)) {
|
||||||
|
case "tcp":
|
||||||
|
if strings.TrimSpace(c.cfg.Host) == "" {
|
||||||
|
return fmt.Errorf("no address configured for the amplifier")
|
||||||
|
}
|
||||||
|
addr := net.JoinHostPort(c.cfg.Host, fmt.Sprint(c.cfg.Port))
|
||||||
|
conn, err := net.DialTimeout("tcp", addr, dialTimeout)
|
||||||
|
if err != nil {
|
||||||
|
// Named for what it usually is. The KPA1500 accepts ONE TCP client,
|
||||||
|
// so the common failure is not a wrong address but the Elecraft
|
||||||
|
// utility already holding the socket — and "connection refused"
|
||||||
|
// sends an operator looking at their network instead.
|
||||||
|
return fmt.Errorf("cannot reach the amplifier on %s: %w (it accepts a single TCP connection — close the Elecraft utility or any other program using it)", addr, err)
|
||||||
|
}
|
||||||
|
c.conn = conn
|
||||||
|
default:
|
||||||
|
if strings.TrimSpace(c.cfg.ComPort) == "" {
|
||||||
|
return fmt.Errorf("no serial port configured for the amplifier")
|
||||||
|
}
|
||||||
|
p, err := serial.Open(c.cfg.ComPort, &serial.Mode{BaudRate: c.cfg.Baud})
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("cannot open %s: %w", c.cfg.ComPort, err)
|
||||||
|
}
|
||||||
|
_ = p.SetReadTimeout(ioTimeout)
|
||||||
|
c.conn = p
|
||||||
|
}
|
||||||
|
c.rd = bufio.NewReader(c.conn)
|
||||||
|
applog.Printf("kpa: connected to the %s", c.status.Model)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// ask sends one command and reads its answer.
|
||||||
|
//
|
||||||
|
// The whole exchange is under the lock: with no flow control, two questions in
|
||||||
|
// flight means two answers to sort out, and the only thing distinguishing them
|
||||||
|
// is the prefix — which is exactly what payload() has to reject when it
|
||||||
|
// happens.
|
||||||
|
func (c *Client) ask(cmd string) (string, error) {
|
||||||
|
c.mu.Lock()
|
||||||
|
defer c.mu.Unlock()
|
||||||
|
if err := c.connectLocked(); err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
if tc, ok := c.conn.(net.Conn); ok {
|
||||||
|
_ = tc.SetDeadline(time.Now().Add(ioTimeout))
|
||||||
|
}
|
||||||
|
if _, err := c.conn.Write([]byte(cmd)); err != nil {
|
||||||
|
c.dropLocked()
|
||||||
|
return "", fmt.Errorf("writing %s: %w", cmd, err)
|
||||||
|
}
|
||||||
|
// Answers end with a semicolon and nothing else does, so the terminator is
|
||||||
|
// the frame.
|
||||||
|
line, err := c.rd.ReadString(';')
|
||||||
|
if err != nil {
|
||||||
|
c.dropLocked()
|
||||||
|
return "", fmt.Errorf("no answer to %s: %w", cmd, err)
|
||||||
|
}
|
||||||
|
return strings.TrimSpace(line), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// send is a SET: written, and not answered. The reference says SET commands do
|
||||||
|
// not generally produce a response, so waiting for one would stall the poll
|
||||||
|
// loop for a whole timeout every time the operator pressed a button.
|
||||||
|
func (c *Client) send(cmd string) error {
|
||||||
|
c.mu.Lock()
|
||||||
|
defer c.mu.Unlock()
|
||||||
|
if err := c.connectLocked(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if tc, ok := c.conn.(net.Conn); ok {
|
||||||
|
_ = tc.SetDeadline(time.Now().Add(ioTimeout))
|
||||||
|
}
|
||||||
|
if _, err := c.conn.Write([]byte(cmd)); err != nil {
|
||||||
|
c.dropLocked()
|
||||||
|
return fmt.Errorf("writing %s: %w", cmd, err)
|
||||||
|
}
|
||||||
|
applog.Printf("kpa: → %s", cmd)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Operate puts the amplifier in OPERATE (true) or STANDBY (false).
|
||||||
|
//
|
||||||
|
// Worth knowing, and worth saying in the UI: from firmware 01.41 onwards,
|
||||||
|
// going to OPERATE also CLEARS the current fault — every one except
|
||||||
|
// temperature, which clears by cooling. So this button is the way out of a
|
||||||
|
// fault as well as the way into transmit.
|
||||||
|
func (c *Client) Operate(on bool) error {
|
||||||
|
if on {
|
||||||
|
return c.send("^OS1;")
|
||||||
|
}
|
||||||
|
return c.send("^OS0;")
|
||||||
|
}
|
||||||
|
|
||||||
|
// ClearFault clears the current fault without changing mode (^FLC).
|
||||||
|
func (c *Client) ClearFault() error { return c.send("^FLC;") }
|
||||||
|
|
||||||
|
// PowerOn switches the main supplies on or off (^ON1 / ^ON0).
|
||||||
|
//
|
||||||
|
// Off is a real power-down, not standby, and the way back on over the network
|
||||||
|
// is Wake-on-LAN or the front panel — so a caller should be asking the operator
|
||||||
|
// first. The sleeping microcontroller does answer ^ON while the supplies are
|
||||||
|
// off, which is why "off" is a state this can report rather than a silence.
|
||||||
|
func (c *Client) PowerOn(on bool) error {
|
||||||
|
if on {
|
||||||
|
return c.send("^ON1;")
|
||||||
|
}
|
||||||
|
return c.send("^ON0;")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Tune starts an ATU tune cycle (^FT). It needs drive from the transceiver.
|
||||||
|
func (c *Client) Tune() error { return c.send("^FT;") }
|
||||||
|
|
||||||
|
// pollLoop keeps the status fresh, reconnecting as needed.
|
||||||
|
func (c *Client) pollLoop() {
|
||||||
|
t := time.NewTicker(pollInterval)
|
||||||
|
defer t.Stop()
|
||||||
|
var n uint64
|
||||||
|
for {
|
||||||
|
select {
|
||||||
|
case <-c.stop:
|
||||||
|
return
|
||||||
|
case <-t.C:
|
||||||
|
c.pollOnce(n)
|
||||||
|
n++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *Client) pollOnce(n uint64) {
|
||||||
|
// Forward power and SWR in ONE exchange (^WS), which is why that command
|
||||||
|
// exists and why the two are not asked separately.
|
||||||
|
reply, err := c.ask("^WS;")
|
||||||
|
if err != nil {
|
||||||
|
c.setErr(err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
w, swr, err := parseWS(reply)
|
||||||
|
if err != nil {
|
||||||
|
c.setErr(err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
c.statusMu.Lock()
|
||||||
|
c.status.Connected = true
|
||||||
|
c.status.LastError = ""
|
||||||
|
c.status.FwdW, c.status.SWR = w, swr
|
||||||
|
c.statusMu.Unlock()
|
||||||
|
|
||||||
|
// The fault, every cycle: it puts the amplifier in standby by itself, and an
|
||||||
|
// operator watching a power bar needs to know why it stopped moving.
|
||||||
|
if reply, err := c.ask("^FL;"); err == nil {
|
||||||
|
if code, err := parseFault(reply); err == nil {
|
||||||
|
c.statusMu.Lock()
|
||||||
|
was := c.status.FaultCode
|
||||||
|
c.status.FaultCode = code
|
||||||
|
c.status.FaultText = FaultName(code)
|
||||||
|
c.statusMu.Unlock()
|
||||||
|
if code != was && code != 0 {
|
||||||
|
applog.Printf("kpa: FAULT %02X — %s", code, FaultName(code))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if n%slowEvery != 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// The readings that do not move fast. Each is optional: an older firmware or
|
||||||
|
// a KPA500 that does not know one of these must not take the rest down with
|
||||||
|
// it, so a failure here leaves the previous value standing.
|
||||||
|
if reply, err := c.ask("^OS;"); err == nil {
|
||||||
|
if v, err := parseInt(reply, "^OS"); err == nil {
|
||||||
|
c.statusMu.Lock()
|
||||||
|
c.status.Operate = v == 1
|
||||||
|
c.statusMu.Unlock()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if reply, err := c.ask("^ON;"); err == nil {
|
||||||
|
if v, err := parseInt(reply, "^ON"); err == nil {
|
||||||
|
c.statusMu.Lock()
|
||||||
|
c.status.PowerOn = v == 1
|
||||||
|
c.statusMu.Unlock()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if reply, err := c.ask("^VI;"); err == nil {
|
||||||
|
if v, a, err := parseVI(reply); err == nil {
|
||||||
|
c.statusMu.Lock()
|
||||||
|
c.status.VoltV, c.status.CurA = v, a
|
||||||
|
c.statusMu.Unlock()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if reply, err := c.ask("^TM;"); err == nil {
|
||||||
|
if v, err := parseInt(reply, "^TM"); err == nil {
|
||||||
|
c.statusMu.Lock()
|
||||||
|
c.status.TempC = v
|
||||||
|
c.statusMu.Unlock()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if reply, err := c.ask("^BN;"); err == nil {
|
||||||
|
if v, err := parseInt(reply, "^BN"); err == nil {
|
||||||
|
c.statusMu.Lock()
|
||||||
|
c.status.Band = BandName(v)
|
||||||
|
c.statusMu.Unlock()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if reply, err := c.ask("^TP;"); err == nil {
|
||||||
|
if v, err := parseInt(reply, "^TP"); err == nil {
|
||||||
|
c.statusMu.Lock()
|
||||||
|
c.status.Tuning = v == 1
|
||||||
|
c.statusMu.Unlock()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetBand puts the amplifier on a band by its ADIF name.
|
||||||
|
//
|
||||||
|
// The KPA takes its band from the transceiver on its own XCVR connector, but it
|
||||||
|
// also accepts ^BN — so OpsLog can simply say it on the link it is already
|
||||||
|
// using. That is worth knowing: an Acom has no such command, which is why
|
||||||
|
// following it needs a second serial port and a transceiver emulator answering
|
||||||
|
// its polls (internal/catemu). None of that applies here.
|
||||||
|
//
|
||||||
|
// Sent only when it CHANGES. Repeating the current band four times a second
|
||||||
|
// would be traffic on a link with no flow control, in exchange for nothing.
|
||||||
|
func (c *Client) SetBand(adifBand string) error {
|
||||||
|
n, ok := bandNumber(adifBand)
|
||||||
|
if !ok {
|
||||||
|
// Not an error the operator should see: the KPA covers 160-6 m, and
|
||||||
|
// tuning to 23 cm is not a fault, it is simply not this amplifier's
|
||||||
|
// business.
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
c.statusMu.Lock()
|
||||||
|
same := c.status.Band == adifBand
|
||||||
|
c.statusMu.Unlock()
|
||||||
|
if same {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return c.send(fmt.Sprintf("^BN%02d;", n))
|
||||||
|
}
|
||||||
|
|
||||||
|
// bandNumber is BandName backwards.
|
||||||
|
func bandNumber(adifBand string) (int, bool) {
|
||||||
|
b := strings.ToLower(strings.TrimSpace(adifBand))
|
||||||
|
for n, name := range bandNames {
|
||||||
|
if name == b {
|
||||||
|
return n, true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return 0, false
|
||||||
|
}
|
||||||
@@ -0,0 +1,157 @@
|
|||||||
|
package kpa
|
||||||
|
|
||||||
|
// Decoding the amplifier's answers.
|
||||||
|
//
|
||||||
|
// Every format here is quoted from the KPA1500 Programming Reference, with the
|
||||||
|
// document's own example kept in the test next door. That is the whole
|
||||||
|
// discipline: a meter decoded from a guess reports a good match on a bad
|
||||||
|
// antenna, and nobody finds out until something is damaged.
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
// payload strips the leading "^", the command letters and the trailing ";",
|
||||||
|
// leaving the value. Returns false when the answer is not for this command —
|
||||||
|
// which happens on a shared serial line and on the first read after a
|
||||||
|
// reconnect, where a stale reply is still in flight.
|
||||||
|
func payload(reply, cmd string) (string, bool) {
|
||||||
|
r := strings.TrimSpace(reply)
|
||||||
|
r = strings.TrimSuffix(r, ";")
|
||||||
|
r = strings.TrimPrefix(r, "^")
|
||||||
|
cmd = strings.TrimSuffix(strings.TrimPrefix(cmd, "^"), ";")
|
||||||
|
if !strings.HasPrefix(strings.ToUpper(r), strings.ToUpper(cmd)) {
|
||||||
|
return "", false
|
||||||
|
}
|
||||||
|
return strings.TrimSpace(r[len(cmd):]), true
|
||||||
|
}
|
||||||
|
|
||||||
|
// parseWS reads forward power and SWR from one answer.
|
||||||
|
//
|
||||||
|
// ^WS1204 014; → 1204 W, SWR 1.4
|
||||||
|
//
|
||||||
|
// The watts field is FOUR digits on a KPA1500 and THREE on a KPA500 — the
|
||||||
|
// reference says so where it explains that ^WS exists for KPA500 compatibility
|
||||||
|
// — so the split is on the space and not on a width. The SWR is in tenths, the
|
||||||
|
// same units as everywhere else in this protocol.
|
||||||
|
func parseWS(reply string) (watts int, swr float64, err error) {
|
||||||
|
v, ok := payload(reply, "^WS")
|
||||||
|
if !ok {
|
||||||
|
return 0, 0, fmt.Errorf("not a ^WS answer: %q", reply)
|
||||||
|
}
|
||||||
|
f := strings.Fields(v)
|
||||||
|
if len(f) != 2 {
|
||||||
|
return 0, 0, fmt.Errorf("^WS wants two fields, got %q", v)
|
||||||
|
}
|
||||||
|
w, err1 := strconv.Atoi(f[0])
|
||||||
|
s, err2 := strconv.Atoi(f[1])
|
||||||
|
if err1 != nil || err2 != nil {
|
||||||
|
return 0, 0, fmt.Errorf("^WS not numeric: %q", v)
|
||||||
|
}
|
||||||
|
return w, float64(s) / 10, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// parseVI reads the PA supply voltage and current.
|
||||||
|
//
|
||||||
|
// ^VI513 061; → 51.3 V, 61 A
|
||||||
|
//
|
||||||
|
// Volts in TENTHS, amps whole. Two different scales in one answer, which is
|
||||||
|
// exactly the kind of detail that is wrong when it is assumed.
|
||||||
|
func parseVI(reply string) (volts float64, amps int, err error) {
|
||||||
|
v, ok := payload(reply, "^VI")
|
||||||
|
if !ok {
|
||||||
|
return 0, 0, fmt.Errorf("not a ^VI answer: %q", reply)
|
||||||
|
}
|
||||||
|
f := strings.Fields(v)
|
||||||
|
if len(f) != 2 {
|
||||||
|
return 0, 0, fmt.Errorf("^VI wants two fields, got %q", v)
|
||||||
|
}
|
||||||
|
dv, err1 := strconv.Atoi(f[0])
|
||||||
|
a, err2 := strconv.Atoi(f[1])
|
||||||
|
if err1 != nil || err2 != nil {
|
||||||
|
return 0, 0, fmt.Errorf("^VI not numeric: %q", v)
|
||||||
|
}
|
||||||
|
return float64(dv) / 10, a, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// parseInt reads the plain numeric answers: ^TMxxx (°C), ^PCnnn (A),
|
||||||
|
// ^BNbb (band number), ^OSx, ^ONx, ^TPx.
|
||||||
|
func parseInt(reply, cmd string) (int, error) {
|
||||||
|
v, ok := payload(reply, cmd)
|
||||||
|
if !ok {
|
||||||
|
return 0, fmt.Errorf("not a %s answer: %q", cmd, reply)
|
||||||
|
}
|
||||||
|
n, err := strconv.Atoi(strings.TrimSpace(v))
|
||||||
|
if err != nil {
|
||||||
|
return 0, fmt.Errorf("%s not numeric: %q", cmd, v)
|
||||||
|
}
|
||||||
|
return n, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// parseFault reads ^FLhh — TWO HEX DIGITS, not decimal. Fault 90 is reflected
|
||||||
|
// power and fault 91 is "antenna not connected"; read as decimal they would be
|
||||||
|
// 144 and 145 and match nothing in the table.
|
||||||
|
func parseFault(reply string) (int, error) {
|
||||||
|
v, ok := payload(reply, "^FL")
|
||||||
|
if !ok {
|
||||||
|
return 0, fmt.Errorf("not a ^FL answer: %q", reply)
|
||||||
|
}
|
||||||
|
n, err := strconv.ParseInt(strings.TrimSpace(v), 16, 32)
|
||||||
|
if err != nil {
|
||||||
|
return 0, fmt.Errorf("^FL not hex: %q", v)
|
||||||
|
}
|
||||||
|
return int(n), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// faultNames is the table from the reference, keyed by the hex code.
|
||||||
|
//
|
||||||
|
// Said in the operator's terms rather than the amplifier's: "the antenna is not
|
||||||
|
// connected" is a thing to go and fix, "fault 91" is a thing to go and look up.
|
||||||
|
var faultNames = map[int]string{
|
||||||
|
0x00: "no fault",
|
||||||
|
0x10: "watchdog timer reset",
|
||||||
|
0x20: "PA current too high",
|
||||||
|
0x40: "too hot — clears as it cools",
|
||||||
|
0x60: "drive power too high",
|
||||||
|
0x61: "gain too low for the drive",
|
||||||
|
0x70: "frequency outside a ham band",
|
||||||
|
0x80: "50 V supply out of range",
|
||||||
|
0x81: "5 V supply out of range",
|
||||||
|
0x82: "10 V supply out of range",
|
||||||
|
0x83: "12 V supply out of range",
|
||||||
|
0x84: "-12 V supply out of range",
|
||||||
|
0x85: "no LPF board supply detected",
|
||||||
|
0x90: "reflected power too high",
|
||||||
|
0x91: "SWR very high — antenna not connected?",
|
||||||
|
0x92: "the ATU found no match",
|
||||||
|
0xB0: "dissipated power too high",
|
||||||
|
0xC0: "forward power too high",
|
||||||
|
0xC1: "forward power too high for this ATU setting",
|
||||||
|
0xF0: "gain too high for the drive",
|
||||||
|
}
|
||||||
|
|
||||||
|
// FaultName describes a fault code, or says the code itself when the firmware
|
||||||
|
// reports one this table does not know — a newer amplifier must not be able to
|
||||||
|
// produce a blank explanation.
|
||||||
|
func FaultName(code int) string {
|
||||||
|
if code == 0 {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
if s, ok := faultNames[code]; ok {
|
||||||
|
return s
|
||||||
|
}
|
||||||
|
return fmt.Sprintf("fault %02X", code)
|
||||||
|
}
|
||||||
|
|
||||||
|
// bandNames maps ^BN to the ADIF band. The numbering is the K3/K4 one, which is
|
||||||
|
// why it is worth writing down: it is not frequency order beyond 6 m and there
|
||||||
|
// is no arithmetic that produces it.
|
||||||
|
var bandNames = map[int]string{
|
||||||
|
0: "160m", 1: "80m", 2: "60m", 3: "40m", 4: "30m", 5: "20m",
|
||||||
|
6: "17m", 7: "15m", 8: "12m", 9: "10m", 10: "6m",
|
||||||
|
}
|
||||||
|
|
||||||
|
// BandName is the ADIF band for a ^BN number, or "" when unknown.
|
||||||
|
func BandName(n int) string { return bandNames[n] }
|
||||||
@@ -0,0 +1,104 @@
|
|||||||
|
package kpa
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
// The reference's own examples, kept as the test. Every one of these strings is
|
||||||
|
// quoted from the KPA1500 Programming Reference rather than invented here, so a
|
||||||
|
// change that breaks the decoding fails against the document.
|
||||||
|
func TestParseTheDocumentedExamples(t *testing.T) {
|
||||||
|
t.Run("^WS — forward power and SWR", func(t *testing.T) {
|
||||||
|
w, swr, err := parseWS("^WS1204 014;")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("unexpected error: %v", err)
|
||||||
|
}
|
||||||
|
if w != 1204 || swr != 1.4 {
|
||||||
|
t.Errorf("got %d W, SWR %.1f; want 1204 W, SWR 1.4", w, swr)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
// A KPA500 sends three digits for the watts. The split is on the space, so
|
||||||
|
// the same code reads both amplifiers.
|
||||||
|
t.Run("^WS from a KPA500 — three digits", func(t *testing.T) {
|
||||||
|
w, swr, err := parseWS("^WS480 021;")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("unexpected error: %v", err)
|
||||||
|
}
|
||||||
|
if w != 480 || swr != 2.1 {
|
||||||
|
t.Errorf("got %d W, SWR %.1f; want 480 W, SWR 2.1", w, swr)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("^VI — volts in tenths, amps whole", func(t *testing.T) {
|
||||||
|
v, a, err := parseVI("^VI513 061;")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("unexpected error: %v", err)
|
||||||
|
}
|
||||||
|
if v != 51.3 || a != 61 {
|
||||||
|
t.Errorf("got %.1f V, %d A; want 51.3 V, 61 A", v, a)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("^TM — heat sink temperature", func(t *testing.T) {
|
||||||
|
c, err := parseInt("^TM045;", "^TM")
|
||||||
|
if err != nil || c != 45 {
|
||||||
|
t.Errorf("got %d, %v; want 45", c, err)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("^OS — operate or standby", func(t *testing.T) {
|
||||||
|
for reply, want := range map[string]int{"^OS0;": 0, "^OS1;": 1} {
|
||||||
|
got, err := parseInt(reply, "^OS")
|
||||||
|
if err != nil || got != want {
|
||||||
|
t.Errorf("%s → %d, %v; want %d", reply, got, err, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("^BN — the K3 band numbering", func(t *testing.T) {
|
||||||
|
n, err := parseInt("^BN05;", "^BN")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("unexpected error: %v", err)
|
||||||
|
}
|
||||||
|
if got := BandName(n); got != "20m" {
|
||||||
|
t.Errorf("^BN05 → %q, want 20m", got)
|
||||||
|
}
|
||||||
|
if got := BandName(10); got != "6m" {
|
||||||
|
t.Errorf("^BN10 → %q, want 6m", got)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// ^FL is HEX. Read as decimal, 90 and 91 — reflected power and "antenna not
|
||||||
|
// connected" — become 144 and 145 and match nothing at all, so the amplifier
|
||||||
|
// would be shut down by a fault OpsLog could not name.
|
||||||
|
func TestFaultCodesAreHex(t *testing.T) {
|
||||||
|
code, err := parseFault("^FL91;")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("unexpected error: %v", err)
|
||||||
|
}
|
||||||
|
if code != 0x91 {
|
||||||
|
t.Fatalf("^FL91 → %d, want %d (0x91)", code, 0x91)
|
||||||
|
}
|
||||||
|
if name := FaultName(code); name == "" || name == "fault 91" {
|
||||||
|
t.Errorf("0x91 should be named, got %q", name)
|
||||||
|
}
|
||||||
|
if got := FaultName(0); got != "" {
|
||||||
|
t.Errorf("no fault should be empty, got %q", got)
|
||||||
|
}
|
||||||
|
// A code from a firmware newer than this table still says something.
|
||||||
|
if got := FaultName(0xAB); got != "fault AB" {
|
||||||
|
t.Errorf("unknown code → %q, want \"fault AB\"", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Answers to somebody else's question are refused rather than misread. On a
|
||||||
|
// serial line shared with the amplifier's own utility, or on the first read
|
||||||
|
// after a reconnect, a stale reply is still in flight.
|
||||||
|
func TestPayloadRefusesAnotherCommandsAnswer(t *testing.T) {
|
||||||
|
if _, _, err := parseWS("^VI513 061;"); err == nil {
|
||||||
|
t.Error("a ^VI answer was accepted as ^WS")
|
||||||
|
}
|
||||||
|
if _, err := parseInt("^TM045;", "^PC"); err == nil {
|
||||||
|
t.Error("a ^TM answer was accepted as ^PC")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,58 @@
|
|||||||
|
package qso
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
// The colour of a matrix cell is a claim about what the operator still needs,
|
||||||
|
// and it was wrong for several releases: a callsign worked and not confirmed
|
||||||
|
// outranked an entity CONFIRMED on the same band and mode, so a slot that was
|
||||||
|
// finished showed as unfinished.
|
||||||
|
//
|
||||||
|
// Reported by VK4DX with the case that names itself: YB confirmed on 20m
|
||||||
|
// digital, shown blue, because one unconfirmed YB station had also been worked
|
||||||
|
// there.
|
||||||
|
func TestBandStatusConfirmedOutranksWorked(t *testing.T) {
|
||||||
|
cases := []struct {
|
||||||
|
name string
|
||||||
|
callWorked, callConfirmed, entityConfirm bool
|
||||||
|
want string
|
||||||
|
}{
|
||||||
|
{"entity worked only", false, false, false, "dxcc_w"},
|
||||||
|
{"this call worked, nothing confirmed", true, false, false, "call_w"},
|
||||||
|
// The regression, in one line.
|
||||||
|
{"entity confirmed, this call worked but not confirmed", true, false, true, "dxcc_c"},
|
||||||
|
{"entity confirmed, this call not worked here", false, false, true, "dxcc_c"},
|
||||||
|
{"this call confirmed", true, true, true, "call_c"},
|
||||||
|
// A confirmed contact with this call implies it was worked, but the flags
|
||||||
|
// arrive from separate SQL aggregates and nothing guarantees the pair.
|
||||||
|
{"call confirmed without the worked flag", false, true, true, "call_c"},
|
||||||
|
}
|
||||||
|
for _, c := range cases {
|
||||||
|
t.Run(c.name, func(t *testing.T) {
|
||||||
|
got := bandStatusNames[bandStatusCode(c.callWorked, c.callConfirmed, c.entityConfirm)]
|
||||||
|
if got != c.want {
|
||||||
|
t.Errorf("bandStatusCode(worked=%v, callConf=%v, entityConf=%v) = %s, want %s",
|
||||||
|
c.callWorked, c.callConfirmed, c.entityConfirm, got, c.want)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The ladder itself, stated once: every confirmed code must beat every worked
|
||||||
|
// code. A future edit that reorders the constants fails here rather than in a
|
||||||
|
// screenshot from an operator.
|
||||||
|
func TestBandStatusLadderPutsConfirmedAbove(t *testing.T) {
|
||||||
|
for _, worked := range []int{stDxccW, stCallW} {
|
||||||
|
for _, confirmed := range []int{stDxccC, stCallC} {
|
||||||
|
if confirmed <= worked {
|
||||||
|
t.Errorf("%s (%d) does not outrank %s (%d)",
|
||||||
|
bandStatusNames[confirmed], confirmed, bandStatusNames[worked], worked)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if stCallC <= stDxccC {
|
||||||
|
t.Error("call_c must outrank dxcc_c: the callsign is the more specific claim")
|
||||||
|
}
|
||||||
|
if stCallW <= stDxccW {
|
||||||
|
t.Error("call_w must outrank dxcc_w for the same reason")
|
||||||
|
}
|
||||||
|
}
|
||||||
+58
-19
@@ -1895,7 +1895,8 @@ type WorkedBefore struct {
|
|||||||
|
|
||||||
// Status grid driving the band×class matrix in the UI. One entry per
|
// Status grid driving the band×class matrix in the UI. One entry per
|
||||||
// (band, class) where ANY QSO exists in this DXCC. Only the highest
|
// (band, class) where ANY QSO exists in this DXCC. Only the highest
|
||||||
// status for that cell is kept (call_c > call_w > dxcc_c > dxcc_w).
|
// status for that cell is kept (call_c > dxcc_c > call_w > dxcc_w —
|
||||||
|
// confirmed outranks worked).
|
||||||
BandStatus []BandStatus `json:"band_status"`
|
BandStatus []BandStatus `json:"band_status"`
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1906,6 +1907,48 @@ type BandStatus struct {
|
|||||||
Status string `json:"status"` // "call_c" | "call_w" | "dxcc_c" | "dxcc_w"
|
Status string `json:"status"` // "call_c" | "call_w" | "dxcc_c" | "dxcc_w"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Band-status codes, lowest first. The ORDER is the rule: a cell shows the
|
||||||
|
// highest that applies.
|
||||||
|
const (
|
||||||
|
stDxccW = iota // the entity was worked on this slot
|
||||||
|
stCallW // …and this callsign was one of them
|
||||||
|
stDxccC // the entity is CONFIRMED here
|
||||||
|
stCallC // …and by this callsign
|
||||||
|
)
|
||||||
|
|
||||||
|
// bandStatusNames maps those codes to what the UI colours by.
|
||||||
|
var bandStatusNames = [...]string{"dxcc_w", "call_w", "dxcc_c", "call_c"}
|
||||||
|
|
||||||
|
// bandStatusCode picks the status of one cell of the band × mode matrix.
|
||||||
|
//
|
||||||
|
// CONFIRMED OUTRANKS WORKED, and that is the whole of it. The ladder used to
|
||||||
|
// run call_c > call_w > dxcc_c > dxcc_w, so a callsign worked and not confirmed
|
||||||
|
// beat an entity confirmed on the same slot: an operator with YB confirmed on
|
||||||
|
// 20m digital saw that cell as "worked, not confirmed" because he had also
|
||||||
|
// worked one unconfirmed YB station there. The grid answers "what do I still
|
||||||
|
// need", and a confirmed entity needs nothing, whoever was worked afterwards.
|
||||||
|
//
|
||||||
|
// Taken as a MAXIMUM rather than as a run of assignments, which is how the
|
||||||
|
// later test came to overwrite the earlier one in the first place.
|
||||||
|
func bandStatusCode(callWorked, callConfirmed, entityConfirmed bool) int {
|
||||||
|
code := stDxccW // there is a row at all ⇒ the entity was worked here
|
||||||
|
raise := func(c int) {
|
||||||
|
if c > code {
|
||||||
|
code = c
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if callWorked {
|
||||||
|
raise(stCallW)
|
||||||
|
}
|
||||||
|
if entityConfirmed {
|
||||||
|
raise(stDxccC)
|
||||||
|
}
|
||||||
|
if callConfirmed {
|
||||||
|
raise(stCallC)
|
||||||
|
}
|
||||||
|
return code
|
||||||
|
}
|
||||||
|
|
||||||
// modeClass collapses ADIF modes into the three buckets DXers care about.
|
// modeClass collapses ADIF modes into the three buckets DXers care about.
|
||||||
// Anything not voice and not CW is treated as digital.
|
// Anything not voice and not CW is treated as digital.
|
||||||
func modeClass(mode string) string {
|
func modeClass(mode string) string {
|
||||||
@@ -2167,7 +2210,18 @@ func (r *Repo) WorkedBefore(ctx context.Context, callsign string, dxccHint int,
|
|||||||
// ---- Per-(band, class) status grid ----
|
// ---- Per-(band, class) status grid ----
|
||||||
// One pass over every distinct (band, mode) in the DXCC, aggregating
|
// One pass over every distinct (band, mode) in the DXCC, aggregating
|
||||||
// "did this call work it?" and "was anything confirmed?" via MAX.
|
// "did this call work it?" and "was anything confirmed?" via MAX.
|
||||||
// Status precedence: call_c > call_w > dxcc_c > dxcc_w.
|
// Status precedence: CONFIRMED OUTRANKS WORKED — call_c > dxcc_c > call_w >
|
||||||
|
// dxcc_w.
|
||||||
|
//
|
||||||
|
// It used to run call_c > call_w > dxcc_c > dxcc_w, which made a call worked
|
||||||
|
// and not confirmed outrank an entity confirmed on the same slot. Reported
|
||||||
|
// from a real log: YB confirmed on 20m digital showed BLUE, because that
|
||||||
|
// operator had also worked one unconfirmed YB station there. The cell said
|
||||||
|
// "not confirmed" about a slot that is confirmed.
|
||||||
|
//
|
||||||
|
// The grid answers "what do I still need on this band and mode", and for
|
||||||
|
// that question confirmation is the axis that matters: a confirmed entity
|
||||||
|
// needs nothing, whoever else was worked afterwards.
|
||||||
// Filter NULL/empty band+mode rows — they'd create a NULL group key
|
// Filter NULL/empty band+mode rows — they'd create a NULL group key
|
||||||
// that Scan into *string can't handle and would error out the whole
|
// that Scan into *string can't handle and would error out the whole
|
||||||
// WorkedBefore call, blanking the matrix in the UI.
|
// WorkedBefore call, blanking the matrix in the UI.
|
||||||
@@ -2188,12 +2242,6 @@ func (r *Repo) WorkedBefore(ctx context.Context, callsign string, dxccHint int,
|
|||||||
return wb, fmt.Errorf("band status: %w", err)
|
return wb, fmt.Errorf("band status: %w", err)
|
||||||
}
|
}
|
||||||
type cellKey struct{ band, class string }
|
type cellKey struct{ band, class string }
|
||||||
const (
|
|
||||||
stDxccW = 0
|
|
||||||
stDxccC = 1
|
|
||||||
stCallW = 2
|
|
||||||
stCallC = 3
|
|
||||||
)
|
|
||||||
best := map[cellKey]int{}
|
best := map[cellKey]int{}
|
||||||
for statusRows.Next() {
|
for statusRows.Next() {
|
||||||
var band, mode string
|
var band, mode string
|
||||||
@@ -2202,23 +2250,14 @@ func (r *Repo) WorkedBefore(ctx context.Context, callsign string, dxccHint int,
|
|||||||
statusRows.Close()
|
statusRows.Close()
|
||||||
return wb, fmt.Errorf("scan band status: %w", err)
|
return wb, fmt.Errorf("scan band status: %w", err)
|
||||||
}
|
}
|
||||||
code := stDxccW // row exists ⇒ entity worked at minimum
|
code := bandStatusCode(callW == 1, callC == 1, dxccConfirmed == 1)
|
||||||
if dxccConfirmed == 1 {
|
|
||||||
code = stDxccC
|
|
||||||
}
|
|
||||||
if callW == 1 {
|
|
||||||
code = stCallW
|
|
||||||
}
|
|
||||||
if callC == 1 {
|
|
||||||
code = stCallC
|
|
||||||
}
|
|
||||||
k := cellKey{band: band, class: modeClass(mode)}
|
k := cellKey{band: band, class: modeClass(mode)}
|
||||||
if cur, ok := best[k]; !ok || code > cur {
|
if cur, ok := best[k]; !ok || code > cur {
|
||||||
best[k] = code
|
best[k] = code
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
statusRows.Close()
|
statusRows.Close()
|
||||||
codeStr := [...]string{"dxcc_w", "dxcc_c", "call_w", "call_c"}
|
codeStr := bandStatusNames
|
||||||
for k, code := range best {
|
for k, code := range best {
|
||||||
wb.BandStatus = append(wb.BandStatus, BandStatus{
|
wb.BandStatus = append(wb.BandStatus, BandStatus{
|
||||||
Band: k.band, Class: k.class, Status: codeStr[code],
|
Band: k.band, Class: k.class, Status: codeStr[code],
|
||||||
|
|||||||
@@ -44,7 +44,11 @@ import (
|
|||||||
// Rig is what the server needs from OpsLog's CAT manager. An interface, so this
|
// Rig is what the server needs from OpsLog's CAT manager. An interface, so this
|
||||||
// package stays testable without a radio and without importing internal/cat.
|
// package stays testable without a radio and without importing internal/cat.
|
||||||
type Rig interface {
|
type Rig interface {
|
||||||
Freq() int64 // current TX frequency in Hz, 0 if unknown
|
// Freq is the frequency of the CURRENT VFO — where the operator is
|
||||||
|
// listening. Hamlib's "f" means the VFO in use, not the transmit one; the
|
||||||
|
// split TX frequency is a separate question, asked with "i". Answering "f"
|
||||||
|
// with the TX frequency invites a client to write it back as the dial.
|
||||||
|
Freq() int64 // current (RX) frequency in Hz, 0 if unknown
|
||||||
Mode() string // ADIF mode (SSB, CW, FT8…)
|
Mode() string // ADIF mode (SSB, CW, FT8…)
|
||||||
Split() (bool, int64) // split on?, and the other VFO's frequency
|
Split() (bool, int64) // split on?, and the other VFO's frequency
|
||||||
SetFreq(hz int64) error
|
SetFreq(hz int64) error
|
||||||
|
|||||||
@@ -148,3 +148,73 @@ func isHamlogConfirmed(v string) bool {
|
|||||||
v = strings.ToUpper(strings.TrimSpace(v))
|
v = strings.ToUpper(strings.TrimSpace(v))
|
||||||
return v != "" && v != "N" && v != "NO"
|
return v != "" && v != "N" && v != "NO"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// RDAChoice is one arbitrated contact: which district the operator decided is
|
||||||
|
// right for that QSO.
|
||||||
|
type RDAChoice struct {
|
||||||
|
QSOID int64 `json:"qso_id"`
|
||||||
|
District string `json:"district"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// RDAApplyResult reports what an arbitration did.
|
||||||
|
type RDAApplyResult struct {
|
||||||
|
Applied int `json:"applied"`
|
||||||
|
Failed int `json:"failed"`
|
||||||
|
Message string `json:"message"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// ApplyRDAChoices writes the chosen district onto each contact — into CNTY and
|
||||||
|
// as the award reference, both.
|
||||||
|
//
|
||||||
|
// The first version wrote only the award override, to keep the imported CNTY as
|
||||||
|
// a record of what HAMLOG said. That was wrong in the way that matters: CNTY is
|
||||||
|
// what the comparison READS, so the contact went on disagreeing for ever. The
|
||||||
|
// operator settled a hundred contacts, ran the comparison again and got the
|
||||||
|
// same hundred rows — the decision had no visible effect anywhere, which is
|
||||||
|
// indistinguishable from a button that does nothing.
|
||||||
|
//
|
||||||
|
// So the chosen district lands in CNTY, where it settles the disagreement, and
|
||||||
|
// in the award reference, where it decides what the contact counts for. This is
|
||||||
|
// the operator's own log: correcting a field in it is the point of the exercise,
|
||||||
|
// not a loss of evidence.
|
||||||
|
func (a *App) ApplyRDAChoices(choices []RDAChoice) (RDAApplyResult, error) {
|
||||||
|
var res RDAApplyResult
|
||||||
|
if a.qso == nil {
|
||||||
|
return res, fmt.Errorf("db not initialized")
|
||||||
|
}
|
||||||
|
for _, c := range choices {
|
||||||
|
district := strings.ToUpper(strings.TrimSpace(c.District))
|
||||||
|
if !rdaDistrictRe.MatchString(district) {
|
||||||
|
res.Failed++
|
||||||
|
applog.Printf("rda apply: qso %d — %q is not a district reference", c.QSOID, c.District)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
q, err := a.qso.GetByID(a.ctx, c.QSOID)
|
||||||
|
if err != nil {
|
||||||
|
res.Failed++
|
||||||
|
applog.Printf("rda apply: qso %d could not be read: %v", c.QSOID, err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if q.Extras == nil {
|
||||||
|
q.Extras = map[string]string{}
|
||||||
|
}
|
||||||
|
q.County = district
|
||||||
|
q.Extras[award.ManualRefsKey] = setOverrideRef(q.Extras[award.ManualRefsKey], "RDA", district)
|
||||||
|
if err := a.qso.Update(a.ctx, q); err != nil {
|
||||||
|
res.Failed++
|
||||||
|
applog.Printf("rda apply: qso %d update failed: %v", c.QSOID, err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
res.Applied++
|
||||||
|
}
|
||||||
|
if res.Applied > 0 {
|
||||||
|
// The award totals were computed from the old answers.
|
||||||
|
a.invalidateAwardStats()
|
||||||
|
}
|
||||||
|
applog.Printf("rda apply: %d contacts settled, %d failed", res.Applied, res.Failed)
|
||||||
|
res.Message = fmt.Sprintf("%d settled", res.Applied)
|
||||||
|
if res.Failed > 0 {
|
||||||
|
res.Message += fmt.Sprintf(", %d failed (see the log)", res.Failed)
|
||||||
|
}
|
||||||
|
return res, nil
|
||||||
|
}
|
||||||
|
|||||||
+1
-1
@@ -21,7 +21,7 @@ import (
|
|||||||
|
|
||||||
const (
|
const (
|
||||||
// appVersion is stamped on every heartbeat (and could feed the About box).
|
// appVersion is stamped on every heartbeat (and could feed the About box).
|
||||||
appVersion = "0.26.16"
|
appVersion = "0.26.18"
|
||||||
|
|
||||||
// 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