Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5a77fdf68f | ||
|
|
31c898ad7f | ||
|
|
88c9756edf | ||
|
|
7b15b534cd | ||
|
|
8e7ecc3d51 | ||
|
|
7f9019c7bc | ||
|
|
a1a3bad682 | ||
|
|
1b746f2452 | ||
|
|
3db49e1213 | ||
|
|
605c934d33 | ||
|
|
dad762a0f1 | ||
|
|
97567d15dd | ||
|
|
fc080f3719 | ||
|
|
ce9ea10d68 | ||
|
|
dc94aa94b6 | ||
|
|
db7ac771b1 | ||
|
|
19134ea23c | ||
|
|
b12011fab7 | ||
|
|
d62cd10478 | ||
|
|
7de7cb96c3 | ||
|
|
dbc97ad61b | ||
|
|
7966b01900 | ||
|
|
f98e95fe9e | ||
|
|
392b93f089 | ||
|
|
9c459c754f | ||
|
|
ec967e29cf | ||
|
|
58e36667a7 | ||
|
|
77aba73096 | ||
|
|
da8f60a7b3 | ||
|
|
e8b5444fc2 | ||
|
|
08bc401681 | ||
|
|
7ac342e2d4 | ||
|
|
b244575937 | ||
|
|
c878742e50 | ||
|
|
13434ca36c | ||
|
|
6345710de5 | ||
|
|
0cab1c1e6b | ||
|
|
1c71495446 | ||
|
|
2c0158b75c | ||
|
|
a2b019b280 | ||
|
|
1fba7d2d57 | ||
|
|
490941f506 | ||
|
|
6bf759b6ae | ||
|
|
43e5088e96 | ||
|
|
582fa561b2 | ||
|
|
7f328d4eb5 | ||
|
|
b2eb6a4b1e | ||
|
|
c2db4c5f7e | ||
|
|
b246c4d10a | ||
|
|
6d4a110949 | ||
|
|
ffbbff80d6 | ||
|
|
bd2edf6624 | ||
|
|
6321948415 | ||
|
|
89e239d83f | ||
|
|
0e48ad7bb2 | ||
|
|
ad82c21dbc | ||
|
|
6f126802cd | ||
|
|
704b614c38 |
@@ -159,6 +159,7 @@ const (
|
||||
keyCATIcomNetUser = "cat.icom.net.user" // Icom network: Network User1 ID
|
||||
keyCATIcomNetPass = "cat.icom.net.pass" // Icom network: Network User1 password
|
||||
keyCATIcomNetAudio = "cat.icom.net.audio" // Icom network: stream RX audio on 50003 (experimental)
|
||||
keyAudioMonitorOn = "audio.monitor.on" // play the network RX audio through the Listening device (the stream itself stays open for the recorder either way)
|
||||
keyCATTCIHost = "cat.tci.host" // TCI host (Expert Electronics SunSDR / ExpertSDR2)
|
||||
keyCATTCIPort = "cat.tci.port" // TCI WebSocket port (default 40001)
|
||||
keyCATTCISpots = "cat.tci.spots" // push cluster spots to the TCI panorama
|
||||
@@ -1252,6 +1253,49 @@ func (a *App) startup(ctx context.Context) {
|
||||
go a.applyRelayAuto(s.FreqHz, s.Band)
|
||||
}
|
||||
})
|
||||
// Digital Voice Keyer + QSO recorder (WASAPI). Idle until used. Created
|
||||
// BEFORE the CAT link comes up, and it matters: a network Icom with RX
|
||||
// audio enabled builds its audio sink inside reloadCAT, gated on audioMgr —
|
||||
// when the manager was created later, every fresh launch connected with
|
||||
// audio silently off, and the operator had to untick/save/retick the option
|
||||
// to hear anything.
|
||||
a.audioMgr = audio.NewManager(func() {
|
||||
st := a.dvkStatus()
|
||||
// When a voice message finishes (or is stopped), drop the PTT we keyed
|
||||
// for it — but tag the release with the current key generation so it
|
||||
// can't cut a transmission a newer message already started.
|
||||
if !st.Playing {
|
||||
a.pttMu.Lock()
|
||||
keyed := a.dvkPttKeyed
|
||||
gen := a.pttGen
|
||||
if keyed {
|
||||
a.dvkPttKeyed = false
|
||||
}
|
||||
a.pttMu.Unlock()
|
||||
if keyed {
|
||||
go a.dvkUnkeyPTT(gen)
|
||||
}
|
||||
// And give the microphone back, if we took it (see raiseFlexDVKDax).
|
||||
// Off the callback's goroutine: this talks to the radio, and the
|
||||
// audio manager is reporting a state change, not waiting on us.
|
||||
go a.lowerFlexDVKDax()
|
||||
}
|
||||
if a.ctx != nil {
|
||||
wruntime.EventsEmit(a.ctx, "audio:status", st)
|
||||
}
|
||||
})
|
||||
a.qsoRec = audio.NewRecorder()
|
||||
if a.audioMgr != nil {
|
||||
// A running monitor picks the new level up immediately: the operator is
|
||||
// listening while they move the slider, and asking them to stop and
|
||||
// restart it to hear the change is how a working control gets reported
|
||||
// as broken.
|
||||
if cfg, err := a.GetAudioSettings(); err == nil {
|
||||
a.audioMgr.SetMonitorGain(cfg.FromGain)
|
||||
}
|
||||
}
|
||||
a.startQSORecorderIfEnabled()
|
||||
|
||||
a.reloadCAT()
|
||||
|
||||
// The QSO logbook lives where the ACTIVE PROFILE points it: the local SQLite
|
||||
@@ -1479,44 +1523,6 @@ func (a *App) startup(ctx context.Context) {
|
||||
})
|
||||
a.solar.Start()
|
||||
|
||||
// Digital Voice Keyer + QSO recorder (WASAPI). Idle until used.
|
||||
a.audioMgr = audio.NewManager(func() {
|
||||
st := a.dvkStatus()
|
||||
// When a voice message finishes (or is stopped), drop the PTT we keyed
|
||||
// for it — but tag the release with the current key generation so it
|
||||
// can't cut a transmission a newer message already started.
|
||||
if !st.Playing {
|
||||
a.pttMu.Lock()
|
||||
keyed := a.dvkPttKeyed
|
||||
gen := a.pttGen
|
||||
if keyed {
|
||||
a.dvkPttKeyed = false
|
||||
}
|
||||
a.pttMu.Unlock()
|
||||
if keyed {
|
||||
go a.dvkUnkeyPTT(gen)
|
||||
}
|
||||
// And give the microphone back, if we took it (see raiseFlexDVKDax).
|
||||
// Off the callback's goroutine: this talks to the radio, and the
|
||||
// audio manager is reporting a state change, not waiting on us.
|
||||
go a.lowerFlexDVKDax()
|
||||
}
|
||||
if a.ctx != nil {
|
||||
wruntime.EventsEmit(a.ctx, "audio:status", st)
|
||||
}
|
||||
})
|
||||
a.qsoRec = audio.NewRecorder()
|
||||
if a.audioMgr != nil {
|
||||
// A running monitor picks the new level up immediately: the operator is
|
||||
// listening while they move the slider, and asking them to stop and
|
||||
// restart it to hear the change is how a working control gets reported
|
||||
// as broken.
|
||||
if cfg, err := a.GetAudioSettings(); err == nil {
|
||||
a.audioMgr.SetMonitorGain(cfg.FromGain)
|
||||
}
|
||||
}
|
||||
a.startQSORecorderIfEnabled()
|
||||
|
||||
// NET Control store (global JSON, shared across logbooks).
|
||||
if ns, err := netctl.Open(filepath.Join(a.dataDir, "nets.json")); err != nil {
|
||||
applog.Printf("netctl: open failed: %v", err)
|
||||
@@ -8435,7 +8441,7 @@ func (a *App) ListAudioInputDevices() ([]audio.Device, error) {
|
||||
return devs, err
|
||||
}
|
||||
if a.tciAudioAvailable() {
|
||||
devs = append([]audio.Device{{ID: audio.NetworkDeviceID, Name: "Radio (TCI network audio)"}}, devs...)
|
||||
devs = append([]audio.Device{{ID: audio.NetworkDeviceID, Name: "Radio (network audio)"}}, devs...)
|
||||
}
|
||||
return devs, nil
|
||||
}
|
||||
@@ -8462,7 +8468,7 @@ func (a *App) ListAudioOutputDevices() ([]audio.Device, error) {
|
||||
return devs, err
|
||||
}
|
||||
if audio.NetworkPlayerReady() {
|
||||
devs = append([]audio.Device{{ID: audio.NetworkDeviceID, Name: "Radio (TCI network audio)"}}, devs...)
|
||||
devs = append([]audio.Device{{ID: audio.NetworkDeviceID, Name: "Radio (network audio)"}}, devs...)
|
||||
}
|
||||
return devs, nil
|
||||
}
|
||||
@@ -9262,7 +9268,9 @@ func (a *App) QSOAudioManualReady() bool {
|
||||
return false
|
||||
}
|
||||
cfg, _ := a.GetAudioSettings()
|
||||
return !cfg.QSORecord && strings.TrimSpace(cfg.FromRadio) != ""
|
||||
// Over the network the radio needs no sound card: the 50003 stream is the
|
||||
// source, so the button is offered even with "From radio" empty.
|
||||
return !cfg.QSORecord && (strings.TrimSpace(cfg.FromRadio) != "" || a.icomNetAudioActive())
|
||||
}
|
||||
|
||||
// QSOAudioManualStart begins a recording when automatic recording is off.
|
||||
@@ -9279,10 +9287,19 @@ func (a *App) QSOAudioManualStart() bool {
|
||||
}
|
||||
if !a.qsoRec.Running() {
|
||||
cfg, _ := a.GetAudioSettings()
|
||||
if strings.TrimSpace(cfg.FromRadio) == "" {
|
||||
// Same source rule as the automatic recorder: when the RX audio arrives
|
||||
// over the network, record THAT — not the "From radio" sound card, which
|
||||
// on a mixed station is another radio entirely. A manual take on the
|
||||
// network IC-7760 was capturing the Flex's DAX: technically a recording,
|
||||
// just not of the QSO being made.
|
||||
from := cfg.FromRadio
|
||||
a.qsoRecPushed = a.icomNetAudioActive() || cfg.FromRadio == audio.NetworkDeviceID
|
||||
if a.qsoRecPushed {
|
||||
from = audio.PushedSource
|
||||
} else if strings.TrimSpace(from) == "" {
|
||||
return false
|
||||
}
|
||||
if err := a.qsoRec.Start(cfg.FromRadio, cfg.RecordingDevice, cfg.PrerollSeconds); err != nil {
|
||||
if err := a.qsoRec.Start(from, cfg.RecordingDevice, cfg.PrerollSeconds); err != nil {
|
||||
applog.Printf("qso-rec: manual start failed: %v", err)
|
||||
return false
|
||||
}
|
||||
@@ -10664,6 +10681,26 @@ func (a *App) AudioStartMonitor() error {
|
||||
return fmt.Errorf("audio not initialized")
|
||||
}
|
||||
cfg, _ := a.GetAudioSettings()
|
||||
// Idempotent: asking to listen while a monitor is already running restarts
|
||||
// it instead of refusing. The refusal surfaced as a checkbox that unticked
|
||||
// itself the instant it was ticked, whenever the UI's idea of the state and
|
||||
// the real monitor had drifted apart.
|
||||
a.audioMgr.StopMonitor()
|
||||
// When the rig's audio arrives over the NETWORK (Icom 50003), the monitor
|
||||
// must be render-only: this button used to start a USB capture from the
|
||||
// "From radio" device as well, and that second producer — often another
|
||||
// radio's DAX — interleaved its chunks with the network stream's pushes.
|
||||
// The result was audio chopped to pieces the moment the operator toggled
|
||||
// Listening off and on while connected to a network Icom.
|
||||
if cs, err := a.GetCATSettings(); err == nil && cs.Enabled && cs.Backend == "icom-net" && cs.IcomNetAudio {
|
||||
a.setSetting(keyAudioMonitorOn, "1")
|
||||
applog.Printf("audio: RX monitor start (network sink only → listen=%q)", cfg.ListeningDevice)
|
||||
return a.audioMgr.StartMonitorSink(cfg.ListeningDevice)
|
||||
}
|
||||
// Only the USB path needs a capture device — checked AFTER the network
|
||||
// branch, which needs none: with From-radio empty (the normal network
|
||||
// setup) this refusal was un-ticking the speakers checkbox the instant it
|
||||
// was ticked.
|
||||
if strings.TrimSpace(cfg.FromRadio) == "" {
|
||||
return fmt.Errorf(`no "From radio" capture device set — pick the rig's USB Audio CODEC in Settings → Audio`)
|
||||
}
|
||||
@@ -10674,6 +10711,7 @@ func (a *App) AudioStartMonitor() error {
|
||||
|
||||
// AudioStopMonitor stops the RX monitor passthrough.
|
||||
func (a *App) AudioStopMonitor() {
|
||||
a.setSetting(keyAudioMonitorOn, "0")
|
||||
if a.audioMgr != nil {
|
||||
a.audioMgr.StopMonitor()
|
||||
applog.Printf("audio: RX monitor stopped")
|
||||
@@ -10696,9 +10734,44 @@ func (a *App) AudioStartTX() error {
|
||||
if strings.TrimSpace(cfg.ToRadio) == "" {
|
||||
return fmt.Errorf(`no "To radio" device set — pick the rig's USB Audio CODEC output in Settings → Audio`)
|
||||
}
|
||||
// Live mic over the radio's own link: the To-radio "device" is the radio.
|
||||
// Fetched before keying so a missing stream refuses cleanly with the PTT
|
||||
// never touched.
|
||||
var netSend func([]byte) error
|
||||
if cfg.ToRadio == audio.NetworkDeviceID {
|
||||
if strings.TrimSpace(cfg.RecordingDevice) == "" {
|
||||
return fmt.Errorf("pick your microphone as the Recording mic in Settings → Audio")
|
||||
}
|
||||
type sender interface {
|
||||
TXAudioSender() (func([]byte) error, error)
|
||||
}
|
||||
err := a.cat.IcomDo(func(ic cat.IcomController) error {
|
||||
p, ok := ic.(sender)
|
||||
if !ok {
|
||||
return fmt.Errorf("this radio cannot take live microphone audio over its link yet")
|
||||
}
|
||||
fn, err := p.TXAudioSender()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
netSend = fn
|
||||
return nil
|
||||
})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
if err := a.pttKey(cfg); err != nil { // key first — no point streaming to a rig that isn't transmitting
|
||||
return err
|
||||
}
|
||||
if netSend != nil {
|
||||
if err := a.audioMgr.StartTXAudioNetwork(cfg.RecordingDevice, netSend); err != nil {
|
||||
a.pttUnkey()
|
||||
return err
|
||||
}
|
||||
applog.Printf("audio: TX start (mic=%q → the radio over the network, ptt=%q)", cfg.RecordingDevice, cfg.PTTMethod)
|
||||
return nil
|
||||
}
|
||||
if err := a.audioMgr.StartTXAudio(cfg.RecordingDevice, cfg.ToRadio); err != nil {
|
||||
a.pttUnkey()
|
||||
return err
|
||||
@@ -14460,6 +14533,23 @@ func (a *App) IcomSetSplit(on bool) error {
|
||||
return a.cat.IcomDo(func(ic cat.IcomController) error { return ic.SetIcomSplit(on) })
|
||||
}
|
||||
|
||||
// IcomSetATU puts the internal tuner in or out of line.
|
||||
func (a *App) IcomSetATU(on bool) error {
|
||||
if a.cat == nil {
|
||||
return fmt.Errorf("cat not initialized")
|
||||
}
|
||||
return a.cat.IcomDo(func(ic cat.IcomController) error { return ic.SetATU(on) })
|
||||
}
|
||||
|
||||
// IcomSetSplitOffset turns split on with a chosen TX offset (Hz) — the
|
||||
// console's +1/+5/+10 kHz buttons.
|
||||
func (a *App) IcomSetSplitOffset(hz int64) error {
|
||||
if a.cat == nil {
|
||||
return fmt.Errorf("cat not initialized")
|
||||
}
|
||||
return a.cat.IcomDo(func(ic cat.IcomController) error { return ic.SetIcomSplitOffset(true, hz) })
|
||||
}
|
||||
|
||||
func (a *App) IcomSetAntenna(n int) error {
|
||||
if a.cat == nil {
|
||||
return fmt.Errorf("cat not initialized")
|
||||
@@ -15564,27 +15654,42 @@ func (a *App) reloadCAT() {
|
||||
// verification (see icomaudio.go) — hence experimental + opt-in.
|
||||
acfg, _ := a.GetAudioSettings()
|
||||
a.audioMgr.StopMonitor() // clear any prior monitor/sink so a re-save restarts cleanly
|
||||
if err := a.audioMgr.StartMonitorSink(acfg.ListeningDevice); err != nil {
|
||||
applog.Printf("icom-net audio: cannot start output sink: %v", err)
|
||||
} else {
|
||||
codec := audio.NewPCM16Codec()
|
||||
audioSink = func(payload []byte) {
|
||||
pcm, err := codec.Decode(payload)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
a.audioMgr.PushMonitorAudio(pcm)
|
||||
// And to the QSO recorder, which has no device to capture from
|
||||
// on this backend. It drops the samples unless a recording is
|
||||
// actually running, so this costs a function call when idle.
|
||||
if a.qsoRec != nil {
|
||||
a.qsoRec.PushRX(pcm)
|
||||
}
|
||||
// The SINK — decode + recorder feed — exists whenever the stream is
|
||||
// on. It used to be built only when the speakers were also wanted,
|
||||
// so "speakers off" (or a sink that failed to open) silently turned
|
||||
// the whole stream off: audio=false on the wire, no recordings, no
|
||||
// voice keyer, and a ticked RX-audio checkbox that did nothing.
|
||||
codec := audio.NewPCM16Codec()
|
||||
audioSink = func(payload []byte) {
|
||||
pcm, err := codec.Decode(payload)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
a.audioMgr.PushMonitorAudio(pcm)
|
||||
// And to the QSO recorder, which has no device to capture from
|
||||
// on this backend. It drops the samples unless a recording is
|
||||
// actually running, so this costs a function call when idle.
|
||||
if a.qsoRec != nil {
|
||||
a.qsoRec.PushRX(pcm)
|
||||
}
|
||||
}
|
||||
// Listening is a CHOICE, remembered: an operator sitting next to the
|
||||
// radio hears it in the room and wants the stream only for the
|
||||
// recorder and the voice keyer. Stop listening turns this off, the
|
||||
// Listen button turns it back on, and reconnects respect it instead
|
||||
// of switching the speakers back on every time.
|
||||
if a.settingOr(keyAudioMonitorOn, "1") != "1" {
|
||||
applog.Printf("icom-net audio: stream on, speakers off (Listening was stopped by the operator)")
|
||||
} else if err := a.audioMgr.StartMonitorSink(acfg.ListeningDevice); err != nil {
|
||||
applog.Printf("icom-net audio: stream on, but the output sink failed: %v", err)
|
||||
} else {
|
||||
applog.Printf("icom-net audio: RX audio streaming ENABLED (experimental) → %q", acfg.ListeningDevice)
|
||||
}
|
||||
}
|
||||
a.cat.Start(cat.NewIcomNet(s.IcomNetHost, s.IcomNetUser, s.IcomNetPass, s.IcomAddr, s.DigitalDefault, audioSink))
|
||||
// With the audio session open the radio can also TAKE audio: offer it to
|
||||
// the voice keyer, the way a TCI radio is offered.
|
||||
a.installIcomTXPlayer(audioSink != nil)
|
||||
case "tci":
|
||||
// Expert Electronics TCI (WebSocket) — SunSDR / ExpertSDR2, or any
|
||||
// TCI-compatible server. The receive audio rides the same socket, so
|
||||
@@ -21052,3 +21157,30 @@ func (a *App) CheckHamlogKey(key string) (string, error) {
|
||||
defer cancel()
|
||||
return extsvc.CheckHamlogKey(ctx, nil, key)
|
||||
}
|
||||
|
||||
// GetAudioMonitorPref says whether the network RX audio should be played
|
||||
// through the Listening device — the remembered speaker choice behind the
|
||||
// console's speaker button and the CAT panel's checkbox.
|
||||
func (a *App) GetAudioMonitorPref() bool {
|
||||
return a.settingOr(keyAudioMonitorOn, "1") == "1"
|
||||
}
|
||||
|
||||
// IcomConsolePTT is the console's PTT button. On a USB station it keys the
|
||||
// rig and nothing more — the operator talks into the radio's own microphone.
|
||||
// When the transmit audio goes over the NETWORK, keying alone transmits
|
||||
// silence: the PC microphone must be routed with it, exactly as the Talk
|
||||
// button does. One button, the right road picked here.
|
||||
func (a *App) IcomConsolePTT(on bool) error {
|
||||
cfg, _ := a.GetAudioSettings()
|
||||
if cfg.ToRadio == audio.NetworkDeviceID {
|
||||
if on {
|
||||
return a.AudioStartTX()
|
||||
}
|
||||
a.AudioStopTX()
|
||||
return nil
|
||||
}
|
||||
if a.cat == nil {
|
||||
return fmt.Errorf("cat not initialized")
|
||||
}
|
||||
return a.cat.SetPTT(on)
|
||||
}
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
package main
|
||||
|
||||
// The voice keyer, through an Icom's network link — the Icom face of what
|
||||
// app_tci_dvk.go does for a SunSDR: selecting the radio as the "To radio"
|
||||
// output hands messages to the 50003 audio session instead of a sound card.
|
||||
// The same PTT before and after, the same gain, the same files.
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"hamlog/internal/applog"
|
||||
"hamlog/internal/audio"
|
||||
"hamlog/internal/cat"
|
||||
)
|
||||
|
||||
// icomTXPlayer hands one message to the radio. Fetched on the CAT goroutine,
|
||||
// played off it — a ten-second message must not freeze frequency, mode and
|
||||
// PTT handling for ten seconds (see tciTXPlayer, which set the pattern).
|
||||
func (a *App) icomTXPlayer(pcm []byte, rate, ch, bits int, stop <-chan struct{}) error {
|
||||
if a.cat == nil {
|
||||
return fmt.Errorf("CAT not initialized")
|
||||
}
|
||||
type txPlayer interface {
|
||||
PlayTXAudio(pcm []byte, rate, ch, bits int, stop <-chan struct{}) error
|
||||
}
|
||||
var player txPlayer
|
||||
err := a.cat.IcomDo(func(ic cat.IcomController) error {
|
||||
p, ok := ic.(txPlayer)
|
||||
if !ok {
|
||||
return fmt.Errorf("this radio cannot take transmit audio over its CAT link")
|
||||
}
|
||||
player = p
|
||||
return nil
|
||||
})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return player.PlayTXAudio(pcm, rate, ch, bits, stop)
|
||||
}
|
||||
|
||||
// installIcomTXPlayer offers the network Icom as an audio output, or withdraws
|
||||
// it. Withdrawing matters as much as offering — see installTCITXPlayer.
|
||||
func (a *App) installIcomTXPlayer(on bool) {
|
||||
if !on {
|
||||
return // the reloadCAT preamble already cleared the network player
|
||||
}
|
||||
audio.SetNetworkPlayer(a.icomTXPlayer)
|
||||
applog.Printf("icom net: the radio is available as an audio output — the voice keyer can play to it without a cable")
|
||||
}
|
||||
@@ -235,3 +235,12 @@ func (a *App) activeRadioMyRig() string {
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
// ActiveRadioMyRig exposes the connected radio's MY_RIG to the frontend, which
|
||||
// pre-fills the entry form's My-station fields on every band change. Without
|
||||
// this the per-band default landed in the field FIRST, and the log-time
|
||||
// priority (the radio that is keying beats the radio that was planned) never
|
||||
// ran — the field was no longer empty by the time the backend looked.
|
||||
func (a *App) ActiveRadioMyRig() string {
|
||||
return a.activeRadioMyRig()
|
||||
}
|
||||
|
||||
@@ -1,4 +1,84 @@
|
||||
[
|
||||
{
|
||||
"version": "0.27.1",
|
||||
"date": "",
|
||||
"en": [
|
||||
"Elecraft console: the S-meter is calibrated against a real K3 — S9 and the +dB readings now match the radio’s own display (they read about two S-units low).",
|
||||
"Elecraft console: an SWR spike (the K3’s own blip at the end of an FT8 frame) no longer fades over twelve seconds — the peak shows briefly, then the meter returns straight to the live reading.",
|
||||
"Icom: the IC-7760 joins the model list (CI-V address B2h).",
|
||||
"Icom console: the IC-7760 gets its real attenuator steps — 6/12/18 dB.",
|
||||
"Icom network audio: the RX stream is decoded correctly — mono is requested and the payload offset was confirmed on a real IC-7760, curing the garbled, clicking audio.",
|
||||
"Icom: switching back from a data mode (USB-D1) to plain USB now sticks — if the rig ignores the data-flag command, it is repeated with the modern one-frame form (0x26). Seen on the IC-7760.",
|
||||
"Icom console: a DATA mode button (USB-D, what FT8 wants), the PSK button drives the rigs that have a native PSK mode, and the power meter reads in real watts on the IC-7760’s 250 W scale.",
|
||||
"Icom network audio: the right codec is requested (16-bit mono LPCM), settled by experiment on a real IC-7760.",
|
||||
"CAT settings: reopening the panel now shows the radio that is actually selected — it always showed the first one, with the fields (MY_RIG included) silently editing the wrong entry.",
|
||||
"IC-7760: the power meter is calibrated against the radio (100 W reads 100 W on the 250 W face) and the RF power setting reads in watts, not a percentage.",
|
||||
"Icom network audio: toggling Listening off and on no longer chops the sound — the monitor restarts as network-fed instead of also opening a USB capture.",
|
||||
"QSO recorder: starting a fresh manual take resets the counter for good — it used to flash 0 and jump back to the previous take’s elapsed time.",
|
||||
"MY_RIG follows the radio actually connected: the entry form now asks the active radio first, before the per-band default — an IC-7760 on the air no longer logs as the Flex the band plan names.",
|
||||
"QSO recorder: a manual take on a network Icom records the network RX stream, not the “From radio” sound card (which captured another radio’s DAX on a mixed station).",
|
||||
"Icom network audio: duplicate and late-retransmitted packets no longer reach the recorder — recordings came out longer than the QSO, slowed and stuttering, while the speakers played fine.",
|
||||
"Icom network audio: it now starts with the app — launching OpsLog connected with audio silently off, and the option had to be unticked and re-saved to hear anything.",
|
||||
"Icom network: when the rig goes quiet on CI-V while the session stays up (seen on the IC-7760), the CI-V flow is re-opened on the spot — recovery in seconds instead of the 35-second full reconnect.",
|
||||
"Icom network: after a session dies young, the redial waits 20 s so the rig can purge the old session first — stops the reconnect-die-reconnect spiral seen on the IC-7760, where each fresh session answered for a second and was then strangled by the previous one’s cleanup.",
|
||||
"Icom network audio, phase 5: the radio can now TAKE audio — with RX audio enabled, pick “Radio (network audio)” as the To-radio device and the voice keyer plays straight to the rig over the LAN, no cable, no virtual sound card. First tested on the IC-7760.",
|
||||
"Icom network audio: listening is now a remembered choice — Stop listening keeps the speakers off across reconnects and restarts, while the stream stays open for the QSO recorder and the voice keyer.",
|
||||
"Icom console: a speaker button beside ON/OFF toggles listening to the network RX audio right from the console — no more trip through Settings → Audio; recordings and the voice keyer keep working either way, and the choice is remembered.",
|
||||
"CAT settings: a “Play it through the speakers” checkbox sits under the Icom RX-audio option — the same remembered switch as the console’s speaker button, applied immediately.",
|
||||
"Icom network audio: “Talk to radio” now works over the LAN too — live microphone straight to the rig, PTT included. With RX audio and a headset, OpsLog is a complete remote station: hear, talk, key CW and log over one network link.",
|
||||
"Icom console: the SUB display shows the sub receiver’s frequency at all times (it was blank until split), and engaging split copies the mode to the TX VFO so it matches the main.",
|
||||
"Icom network audio: the stream now opens regardless of the speaker choice — speakers-off (or a failed output device) was silently disabling the whole stream: no audio session, no recordings, no voice keyer, despite the RX-audio option being ticked.",
|
||||
"Icom network: a radio in standby keeps its session and the console’s ON button — the quiet-CI-V recovery was tearing the session down every 15 s, so a radio that was off when OpsLog started could never be powered on.",
|
||||
"Icom console: the MOX button carries your microphone on a network station, and engaging split aligns the TX VFO’s mode with the main.",
|
||||
"Icom console: the spectrum scope is removed. Every model streams its waveform differently — and on the IC-7760 enabling it killed the whole CI-V link, audio included. The radio’s own scope does it better.",
|
||||
"Icom: any leftover waveform stream is switched off at connect — the scope flag lives in the radio and survived sessions, and its flood is what was killing the IC-7760’s CI-V link.",
|
||||
"Icom console: an ATU chip beside SPLIT engages or DISENGAGES the internal tuner — TUNE started a cycle but could never take the tuner back out of line.",
|
||||
"Icom console: the TX meters get needle inertia — power holds its peak instead of flickering to 0 W between syllables, SWR shows the real peak then returns to the live value — and the wattage readout no longer wraps at three digits.",
|
||||
"Icom console: the meters use the same LED bars as the Flex and Elecraft consoles, and the mode badge says USB or LSB instead of an ambiguous SSB.",
|
||||
"Cluster: spots on the standard FT8/FT4 frequencies of every band now read FT8/FT4 when the comment names no mode — 30 m, 60 m, 80 m FT4, 17 m FT4 and 12 m were falling into the generic DATA bucket.",
|
||||
"OmniRig (Yaesu): with split engaged, tuning to a spot moves BOTH VFOs — on an FT-2000 the write landed on the TX VFO only, so the transmitter QSYed and the receiver stayed behind.",
|
||||
"Worked before: a slow lookup can no longer overwrite a newer one — typing a second callsign quickly could leave the previous call’s QSOs displayed under the new call’s name.",
|
||||
"Icom network: OpsLog now sends its own pings every 500 ms on all three streams, as RS-BA1 and wfview do — a client that only ever replied was judged absent by the rig, which stopped serving CI-V data about a minute into every session: the recurring sound/CAT dropouts."
|
||||
],
|
||||
"fr": [
|
||||
"Console Elecraft : le S-mètre est calibré sur un vrai K3 — S9 et les +dB correspondent désormais à l’affichage de la radio (il lisait environ deux points S trop bas).",
|
||||
"Console Elecraft : un pic de ROS (le sursaut du K3 en fin de trame FT8) ne s’estompe plus pendant douze secondes — le pic s’affiche brièvement, puis le ros-mètre revient directement à la valeur réelle.",
|
||||
"Icom : l’IC-7760 rejoint la liste des modèles (adresse CI-V B2h).",
|
||||
"Console Icom : l’IC-7760 reçoit ses vrais crans d’atténuateur — 6/12/18 dB.",
|
||||
"Audio réseau Icom : le flux RX est décodé correctement — le mono est demandé et l’offset du payload a été confirmé sur un vrai IC-7760, ce qui guérit le son inaudible et les clics.",
|
||||
"Icom : revenir d’un mode data (USB-D1) au USB simple tient désormais — si la radio ignore la commande du drapeau data, elle est répétée sous la forme moderne en une trame (0x26). Constaté sur l’IC-7760.",
|
||||
"Console Icom : un bouton de mode DATA (USB-D, celui de FT8), le bouton PSK pilote les radios qui ont un vrai mode PSK, et le wattmètre lit en watts réels sur l’échelle 250 W de l’IC-7760.",
|
||||
"Audio réseau Icom : le bon codec est demandé (LPCM mono 16 bits), déterminé par l’expérience sur un vrai IC-7760.",
|
||||
"Réglages CAT : rouvrir le panneau montre désormais la radio réellement sélectionnée — il montrait toujours la première, et les champs (MY_RIG compris) modifiaient silencieusement la mauvaise entrée.",
|
||||
"IC-7760 : le wattmètre est calibré sur la radio (100 W affiche 100 W sur l’échelle 250 W) et le réglage RF power se lit en watts, plus en pourcentage.",
|
||||
"Audio réseau Icom : couper puis relancer Listening ne hache plus le son — le moniteur redémarre alimenté par le réseau au lieu d’ouvrir en plus une capture USB.",
|
||||
"Enregistreur de QSO : démarrer une nouvelle prise manuelle remet le compteur à zéro pour de bon — il affichait 0 puis resautait au temps de la prise précédente.",
|
||||
"MY_RIG suit la radio réellement connectée : le formulaire interroge d’abord la radio active, avant le défaut par bande — un IC-7760 à l’antenne ne se logue plus comme le Flex prévu par le plan de bande.",
|
||||
"Enregistreur de QSO : une prise manuelle sur un Icom réseau enregistre le flux RX réseau, pas la carte son « From Radio » (qui capturait le DAX d’une autre radio sur une station mixte).",
|
||||
"Audio réseau Icom : les paquets dupliqués ou retransmis en retard n’atteignent plus l’enregistreur — les enregistrements sortaient plus longs que le QSO, ralentis et hachés, alors que les haut-parleurs jouaient bien.",
|
||||
"Audio réseau Icom : il démarre maintenant avec l’application — au lancement, la connexion se faisait audio coupé, et il fallait décocher/recocher l’option pour entendre quelque chose.",
|
||||
"Réseau Icom : quand la radio se tait sur le CI-V alors que la session tient (constaté sur l’IC-7760), le flux CI-V est rouvert immédiatement — récupération en quelques secondes au lieu des 35 secondes de reconnexion complète.",
|
||||
"Réseau Icom : après une session morte jeune, la renumérotation attend 20 s pour que la radio purge d’abord l’ancienne session — stoppe la spirale reconnexion-mort-reconnexion vue sur l’IC-7760, où chaque session neuve répondait une seconde avant d’être étranglée par le nettoyage de la précédente.",
|
||||
"Audio réseau Icom, phase 5 : la radio peut maintenant RECEVOIR de l’audio — avec le RX audio activé, choisissez « Radio (network audio) » comme périphérique To Radio et le voice keyer joue directement vers la radio par le LAN, sans câble ni carte son virtuelle. Premier test sur l’IC-7760.",
|
||||
"Audio réseau Icom : l’écoute est désormais un choix mémorisé — Stop listening garde les enceintes coupées à travers reconnexions et redémarrages, tandis que le flux reste ouvert pour l’enregistreur de QSO et le voice keyer.",
|
||||
"Console Icom : un bouton haut-parleur à côté de ON/OFF bascule l’écoute du RX audio réseau depuis la console — fini l’aller-retour dans Réglages → Audio ; enregistrements et voice keyer continuent de fonctionner, et le choix est mémorisé.",
|
||||
"Réglages CAT : une case « Écouter dans les enceintes » sous l’option RX audio Icom — le même interrupteur mémorisé que le bouton haut-parleur de la console, appliqué immédiatement.",
|
||||
"Audio réseau Icom : « Talk to radio » fonctionne aussi par le LAN — micro en direct vers la radio, PTT compris. Avec le RX audio et un casque, OpsLog devient une station remote complète : écouter, parler, manipuler la CW et loguer sur un seul lien réseau.",
|
||||
"Console Icom : l’affichage SUB montre la fréquence du sub receiver en permanence (il restait vide hors split), et activer le split copie le mode sur le VFO TX pour qu’il suive le main.",
|
||||
"Audio réseau Icom : le flux s’ouvre désormais indépendamment du choix d’écoute — enceintes coupées (ou périphérique de sortie en échec) désactivait silencieusement tout le flux : pas de session audio, ni enregistrements, ni voice keyer, malgré la case RX audio cochée.",
|
||||
"Réseau Icom : une radio en veille garde sa session et le bouton ON de la console — la récupération du CI-V muet détruisait la session toutes les 15 s, donc une radio éteinte au lancement d’OpsLog ne pouvait jamais être allumée.",
|
||||
"Console Icom : le bouton MOX emporte votre micro sur une station réseau, et activer le split aligne le mode du VFO TX sur le main.",
|
||||
"Console Icom : le scope spectral est retiré. Chaque modèle streame sa forme d’onde différemment — et sur l’IC-7760 son activation tuait tout le lien CI-V, audio compris. Le scope de la radio fait ça mieux.",
|
||||
"Icom : tout flux waveform résiduel est coupé à la connexion — le drapeau scope vit dans la radio et survivait aux sessions, et son flot est ce qui tuait le lien CI-V de l’IC-7760.",
|
||||
"Console Icom : une puce ATU à côté de SPLIT engage ou DÉSENGAGE le tuner interne — TUNE lançait un cycle mais ne pouvait jamais remettre le tuner hors ligne.",
|
||||
"Console Icom : les mètres TX gagnent une inertie d’aiguille — la puissance tient sa crête au lieu de retomber à 0 W entre les syllabes, le ROS montre la vraie crête puis revient à la valeur vive — et l’affichage en watts ne passe plus à la ligne à trois chiffres.",
|
||||
"Console Icom : les mètres utilisent les mêmes barres LED que les consoles Flex et Elecraft, et le badge de mode dit USB ou LSB au lieu d’un SSB ambigu.",
|
||||
"Cluster : les spots sur les fréquences standard FT8/FT4 de chaque bande lisent désormais FT8/FT4 quand le commentaire ne nomme pas de mode — 30 m, 60 m, FT4 80 m, FT4 17 m et 12 m tombaient dans le bloc DATA générique.",
|
||||
"OmniRig (Yaesu) : avec le split actif, se rendre sur un spot déplace LES DEUX VFO — sur un FT-2000 l’écriture n’atteignait que le VFO TX, donc l’émetteur QSYait et le récepteur restait derrière.",
|
||||
"Déjà contacté : une recherche lente ne peut plus écraser une plus récente — taper un second indicatif rapidement pouvait laisser les QSO du call précédent affichés sous le nom du nouveau.",
|
||||
"Réseau Icom : OpsLog envoie désormais ses propres pings toutes les 500 ms sur les trois flux, comme RS-BA1 et wfview — un client qui ne faisait que répondre était jugé absent par la radio, qui cessait de servir le CI-V au bout d’une minute : les coupures récurrentes de son/CAT."
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "0.27.0",
|
||||
"date": "",
|
||||
|
||||
+43
-12
@@ -33,7 +33,7 @@ import {
|
||||
GetSolarData,
|
||||
GetQSORate,
|
||||
LoTWUserInfo,
|
||||
OperatingDefaultForBand,
|
||||
OperatingDefaultForBand, ActiveRadioMyRig,
|
||||
LogUDPLoggedADIF,
|
||||
ListCountries,
|
||||
GetWinkeyerSettings, SaveWinkeyerSettings, ListSerialPorts, GetWinkeyerStatus,
|
||||
@@ -934,11 +934,16 @@ export default function App() {
|
||||
useEffect(() => {
|
||||
if (!band) return;
|
||||
let cancelled = false;
|
||||
OperatingDefaultForBand(band).then((d) => {
|
||||
OperatingDefaultForBand(band).then(async (d) => {
|
||||
if (cancelled) return;
|
||||
// The radio actually CONNECTED names itself ahead of the per-band plan:
|
||||
// an IC-7760 on the air must not log as the Flex the band default names.
|
||||
let liveRig = '';
|
||||
try { liveRig = (await ActiveRadioMyRig()) || ''; } catch {}
|
||||
if (cancelled) return;
|
||||
setDetails((cur) => ({
|
||||
...cur,
|
||||
my_rig: d?.station_name || '',
|
||||
my_rig: liveRig || d?.station_name || '',
|
||||
my_antenna: d?.antenna_name || '',
|
||||
tx_pwr: d?.tx_pwr ?? cur.tx_pwr,
|
||||
}));
|
||||
@@ -1051,6 +1056,13 @@ export default function App() {
|
||||
if (!active) setError(t('rec.manualFailed'));
|
||||
}).catch((e: any) => setError(String(e?.message ?? e)));
|
||||
};
|
||||
// recTick means "a fresh take" — that is the only case where the clock returns
|
||||
// to zero, as opposed to resuming after a stop. Declared BEFORE the ticking
|
||||
// effect below and deliberately so: effects run in declaration order, and the
|
||||
// other way round the ticker captured the PREVIOUS take's elapsed as its
|
||||
// starting point — the counter showed 0 for one second, then jumped straight
|
||||
// back to the old thirty minutes.
|
||||
useEffect(() => { setRecSeconds(0); recSecondsRef.current = 0; setRecStopped(false); }, [recTick]);
|
||||
useEffect(() => {
|
||||
if (!recording) { setRecSeconds(0); return; }
|
||||
// A stopped take freezes the clock where it is: it must show the length of
|
||||
@@ -1061,9 +1073,6 @@ export default function App() {
|
||||
const id = window.setInterval(() => setRecSeconds(from + Math.floor((Date.now() - start) / 1000)), 1000);
|
||||
return () => window.clearInterval(id);
|
||||
}, [recording, recTick, recStopped]);
|
||||
// recTick means "a fresh take" — that is the only case where the clock returns
|
||||
// to zero, as opposed to resuming after a stop.
|
||||
useEffect(() => { setRecSeconds(0); recSecondsRef.current = 0; setRecStopped(false); }, [recTick]);
|
||||
// The callsign the in-progress recording belongs to (uppercased; '' = none).
|
||||
// Lets us restart from zero when the operator edits the call to a different
|
||||
// station mid-recording, instead of continuing the old take.
|
||||
@@ -1523,7 +1532,7 @@ export default function App() {
|
||||
// Seed the current break-in from the rig when the CW panel becomes active in
|
||||
// Icom mode (so the control reflects the radio's real state).
|
||||
useEffect(() => {
|
||||
if (cwSource !== 'icom' || !wkEnabled || !(catState.backend === 'icom' && catState.connected)) return;
|
||||
if (cwSource !== 'icom' || !wkEnabled || !((catState.backend === 'icom' || catState.backend === 'icom-net') && catState.connected)) return;
|
||||
GetIcomState().then((s: any) => { if (s && typeof s.break_in === 'number') setIcomBreakIn(s.break_in); }).catch(() => {});
|
||||
}, [cwSource, wkEnabled, catState.backend, catState.connected]);
|
||||
// Auto-call: repeat the clicked macro (e.g. F1 CQ) every (message + N seconds)
|
||||
@@ -1547,7 +1556,7 @@ export default function App() {
|
||||
// skips the log that hasn't happened yet.
|
||||
const wkSendGenRef = useRef(0);
|
||||
useEffect(() => {
|
||||
const connected = cwSource === 'icom' ? (catState.backend === 'icom' && catState.connected)
|
||||
const connected = cwSource === 'icom' ? ((catState.backend === 'icom' || catState.backend === 'icom-net') && catState.connected)
|
||||
: cwSource === 'flex' ? (catState.backend === 'flex' && catState.connected)
|
||||
: cwSource === 'yaesu' ? (catState.backend === 'yaesu' && catState.connected)
|
||||
: cwSource === 'kenwood' ? (catState.backend === 'kenwood' && catState.connected)
|
||||
@@ -1737,15 +1746,29 @@ export default function App() {
|
||||
const gen = ++dvkAutoCqGenRef.current;
|
||||
dvkAutoCqSlotRef.current = slot;
|
||||
const sleep = (ms: number) => new Promise((r) => window.setTimeout(r, ms));
|
||||
// Traced into the app log deliberately: the loop kept 'not repeating' on a
|
||||
// network rig and every guess at which guard was tripping proved wrong.
|
||||
const trace = (m: string) => UILog(`dvk auto-cq: ${m}`).catch(() => {});
|
||||
trace(`start slot=${slot} gen=${gen}`);
|
||||
let round = 0;
|
||||
while (dvkAutoCqSlotRef.current === slot && gen === dvkAutoCqGenRef.current && dvkActiveRef.current) {
|
||||
if (!isPhoneMode(modeRef.current)) { stopDvkAutoCq(); break; }
|
||||
await DVKPlay(slot).catch(() => {});
|
||||
// An EMPTY mode is not a mode change: over the network the rig's mode
|
||||
// read fails transiently and the CAT push blanks the field for a poll or
|
||||
// two — killing the auto-CQ loop mid-run for nothing. Only a known
|
||||
// non-phone mode stops the loop.
|
||||
if (modeRef.current && !isPhoneMode(modeRef.current)) { trace(`stopped: mode ${modeRef.current} is not phone`); stopDvkAutoCq(); break; }
|
||||
round++;
|
||||
trace(`round ${round}: play`);
|
||||
await DVKPlay(slot).catch((e: any) => trace(`play failed: ${e?.message ?? e}`));
|
||||
await sleep(300); // let playback flip "playing" true
|
||||
trace(`round ${round}: playing=${dvkPlayingRef.current}`);
|
||||
let guard = 0; // then wait for it to finish (cap ~90 s)
|
||||
while (dvkPlayingRef.current && gen === dvkAutoCqGenRef.current && guard < 600) { await sleep(150); guard++; }
|
||||
if (gen !== dvkAutoCqGenRef.current) break;
|
||||
if (gen !== dvkAutoCqGenRef.current) { trace(`stopped mid-round: superseded (gen ${dvkAutoCqGenRef.current})`); break; }
|
||||
trace(`round ${round}: message over after ~${(guard * 150 / 1000).toFixed(1)}s, gap ${dvkAutoCqSecsRef.current}s`);
|
||||
await sleep(Math.max(0, dvkAutoCqSecsRef.current) * 1000); // gap before the next CQ
|
||||
}
|
||||
trace(`exit: slotRef=${dvkAutoCqSlotRef.current} gen=${gen}/${dvkAutoCqGenRef.current} active=${dvkActiveRef.current}`);
|
||||
}
|
||||
const dvkPlay = useCallback((slot: number) => {
|
||||
if (!isPhoneMode(modeRef.current)) { setError(t('dvkp.notPhone')); return; }
|
||||
@@ -4592,10 +4615,17 @@ export default function App() {
|
||||
return () => { dead = true; };
|
||||
}, [selQso, callsign]);
|
||||
|
||||
const wbTokenRef = useRef(0);
|
||||
async function runWorkedBefore(call: string, dxccHint: number = 0) {
|
||||
// Latest-wins: two lookups race when the operator types a second call
|
||||
// before the first answered, and the SLOW one used to land last — the
|
||||
// grid then showed the previous call's QSOs under the new call's name
|
||||
// (LU5AVM's contact filed under LW8ETV, screenshot in hand).
|
||||
const token = ++wbTokenRef.current;
|
||||
setWbBusy(true);
|
||||
try {
|
||||
const w = await WorkedBefore(call, dxccHint);
|
||||
if (token !== wbTokenRef.current) return; // a newer lookup owns the panel
|
||||
setWb(w);
|
||||
// Mirrored synchronously rather than through the effect above: a backfill
|
||||
// parked by the lookup has to read this on the very next line, not a
|
||||
@@ -4610,10 +4640,11 @@ export default function App() {
|
||||
fillFromLastQso(p.r, call);
|
||||
}
|
||||
} catch {
|
||||
if (token !== wbTokenRef.current) return;
|
||||
setWb(null);
|
||||
wbRef.current = null;
|
||||
wbCallRef.current = '';
|
||||
} finally { setWbBusy(false); }
|
||||
} finally { if (token === wbTokenRef.current) setWbBusy(false); }
|
||||
}
|
||||
// fillFromLastQso enriches the entry from the LAST QSO we logged with this call
|
||||
// when the live lookup came up short — the callsign isn't on QRZ/HamQTH, or no
|
||||
|
||||
@@ -42,18 +42,22 @@ const ZERO: KenwoodState = {
|
||||
// nobody notices are missing.
|
||||
const FILTERS = [200, 400, 700, 1000, 1800, 2400, 2800, 4000];
|
||||
|
||||
// Raw S-meter → S units. The K3 answers 0-21 across S0…S9+60; S9 is taken at
|
||||
// raw 9 and each step above it as 6 dB. PROVISIONAL, like the rest of the
|
||||
// scaling: the raw value is on screen and in the log, so a real radio settles
|
||||
// it rather than this comment.
|
||||
const S9_RAW = 9;
|
||||
const DB_PER_RAW = 6;
|
||||
function sParts(rawV: number): { s: number; over: number; label: string } {
|
||||
if (rawV >= S9_RAW) {
|
||||
const over = Math.max(0, Math.round((rawV - S9_RAW) * DB_PER_RAW));
|
||||
// Raw S-meter → S units, CALIBRATED against a real K3 beside its own display
|
||||
// (2026-08): raw 5 reads S7 on the radio, raw 9 reads S9+20. So S9 sits near
|
||||
// raw 6.5 — not 9, which showed everything two S-units low — and each raw step
|
||||
// above it is worth ~8 dB, shown in the 10 dB steps the K3's own meter uses.
|
||||
// A Kenwood answers 0-30 on the same command and keeps the simple 1-per-raw
|
||||
// scale until someone calibrates one against a real radio too.
|
||||
const K3_S9_RAW = 6.5;
|
||||
const K3_DB_PER_RAW = 8;
|
||||
function sParts(rawV: number, elecraft: boolean): { s: number; over: number; label: string } {
|
||||
const s9raw = elecraft ? K3_S9_RAW : 9;
|
||||
if (rawV >= s9raw) {
|
||||
let over = Math.max(0, Math.round((rawV - s9raw) * (elecraft ? K3_DB_PER_RAW : 6)));
|
||||
if (elecraft) over = Math.round(over / 10) * 10;
|
||||
return { s: 9, over, label: over > 0 ? `S9+${over}` : 'S9' };
|
||||
}
|
||||
const s = Math.max(0, Math.min(9, rawV));
|
||||
const s = Math.max(0, Math.min(9, Math.round(rawV * (elecraft ? 9 / K3_S9_RAW : 1))));
|
||||
return { s, over: 0, label: `S${s}` };
|
||||
}
|
||||
|
||||
@@ -211,10 +215,10 @@ export function ElecraftPanel({ onReportRST }: { onReportRST?: (rst: string) =>
|
||||
<div className="grid grid-cols-1 sm:grid-cols-3 gap-2">
|
||||
<MeterBar label="S-METER" value={view.transmitting ? 0 : view.s_meter} lo={0} hi={100}
|
||||
accent="#16a34a" segColor={sSegColor}
|
||||
display={view.transmitting ? '—' : sParts(view.s_meter_raw).label}
|
||||
display={view.transmitting ? '—' : sParts(view.s_meter_raw, view.elecraft).label}
|
||||
onClick={() => {
|
||||
if (view.transmitting || !onReportRST) return;
|
||||
const sp = sParts(view.s_meter_raw);
|
||||
const sp = sParts(view.s_meter_raw, view.elecraft);
|
||||
onReportRST(sMeterRST(sp.s, sp.over, view.mode));
|
||||
}}
|
||||
title={t('k3.sMeterHint', { raw: String(view.s_meter_raw) })} />
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
import { useEffect, useRef, useState } from 'react';
|
||||
import { Radio, AudioLines, Mic, Activity, SlidersHorizontal, Antenna, Filter, Power } from 'lucide-react';
|
||||
import { Radio, AudioLines, Mic, Activity, SlidersHorizontal, Antenna, Filter, Power, Volume2, VolumeX } from 'lucide-react';
|
||||
import {
|
||||
GetIcomState, IcomRefresh,
|
||||
IcomSetAFGain, IcomSetRFGain, IcomSetNB, IcomSetNBLevel, IcomSetNR, IcomSetNRLevel,
|
||||
IcomSetANF, IcomSetAPF, IcomSetAGC, IcomSetPreamp, IcomSetAtt, IcomSetFilter,
|
||||
IcomSetRFPower, IcomSetMicGain, IcomSetSplit, IcomTune, IcomSetPTT,
|
||||
IcomSetScope, IcomScopeData, IcomSetScopeMode, IcomSetScopeEdges, GetCATState, SetCATFrequency, SetCATMode,
|
||||
AudioMonitorActive, AudioStartMonitor, AudioStopMonitor,
|
||||
IcomSetRFPower, IcomSetMicGain, IcomSetSplit, IcomTune, IcomSetATU, IcomConsolePTT,
|
||||
GetCATState, SetCATFrequency, SetCATMode,
|
||||
IcomSetRIT, IcomSetRITOn, IcomSetXITOn,
|
||||
IcomSetAntenna, IcomSetPBTInner, IcomSetPBTOuter, IcomSetManualNotch, IcomSetNotchPos,
|
||||
IcomSetSquelch, IcomSetComp, IcomSetCompLevel, IcomSetMonitor, IcomSetMonLevel,
|
||||
@@ -19,7 +20,7 @@ import { ShiftRow } from '@/components/ShiftRow';
|
||||
|
||||
type IcomState = {
|
||||
available: boolean; model?: string; mode?: string;
|
||||
transmitting: boolean; split: boolean;
|
||||
transmitting: boolean; split: boolean; sub_hz?: number; atu_on?: boolean;
|
||||
s_meter: number; power_meter: number; swr_meter: number;
|
||||
rf_power: number; mic_gain: number;
|
||||
af_gain: number; rf_gain: number;
|
||||
@@ -79,17 +80,18 @@ function bandsFor(model?: string): Band[] {
|
||||
|
||||
// Mode buttons for the console (like RS-BA1's row). SetCATMode picks USB/LSB for
|
||||
// SSB by frequency and the rig's data variant for digital modes.
|
||||
const MODES = ['SSB', 'CW', 'RTTY', 'PSK', 'AM', 'FM'];
|
||||
const MODES = ['SSB', 'CW', 'RTTY', 'PSK', 'AM', 'FM', 'DATA'];
|
||||
|
||||
// Attenuator steps are MODEL-dependent even though the CI-V command (0x11) is the
|
||||
// same: the value byte is the dB. The IC-7610 (and 7700/7800/7851) have a 6/12/18
|
||||
// dB stepped attenuator; the IC-7300/705/7100 have a single 20 dB attenuator; the
|
||||
// dB stepped attenuator, and the IC-7760 the same (confirmed on a real one); the
|
||||
// IC-7300/705/7100 have a single 20 dB attenuator; the
|
||||
// IC-9700 a single 10 dB. Offering the wrong steps = a dead button (the rig NAKs
|
||||
// e.g. 6 dB on a 7300). Default to the common single 20 dB for unknown models.
|
||||
function attOptions(model?: string): { v: string; l: string }[] {
|
||||
const m = (model ?? '').toUpperCase();
|
||||
const OFF = { v: '0', l: 'OFF' };
|
||||
if (/(7610|7700|7800|7850|7851)/.test(m)) {
|
||||
if (/(7610|7700|7760|7800|7850|7851)/.test(m)) {
|
||||
return [OFF, { v: '6', l: '6dB' }, { v: '12', l: '12dB' }, { v: '18', l: '18dB' }];
|
||||
}
|
||||
if (m.includes('9700')) return [OFF, { v: '10', l: '10dB' }];
|
||||
@@ -128,9 +130,38 @@ function fmtVFO(hz?: number): string {
|
||||
}
|
||||
|
||||
// modeMatches marks a mode button active, folding the rig's USB/LSB into SSB.
|
||||
// icomWatts turns the backend's 0-100 meter percentage back into watts on the
|
||||
// IC-7760's own meter face. The backend value is linear in the RAW meter byte
|
||||
// (0-255 → 0-100), but Icom's calibration is not: raw 143 is half deflection
|
||||
// and raw 213 is full scale. On a real 7760 a measured 100 W sits at half
|
||||
// deflection of the 250 W face — the linear ×2.5 first tried showed 140 W for
|
||||
// it. Below half scale watts run 0→100, above it 100→250.
|
||||
// The anchors are MEASURED on the real radio, not derived: a known 50 W read
|
||||
// raw ≈89 and a known 100 W read raw 143 (Icom's documented half-deflection),
|
||||
// with raw 213 = full scale = 250 W. The face is not linear in watts at the
|
||||
// bottom — a two-segment guess showed 50 W as 62 — so watts interpolate
|
||||
// between the measured anchors, and a new measurement just adds a row.
|
||||
// Third measured anchor (2026-08-30): a real 200 W read full deflection —
|
||||
// raw 213 is 200 W on this rig, not the 250 the printed face suggests.
|
||||
const ICOM_7760_PO: [number, number][] = [[0, 0], [89, 50], [143, 100], [213, 200]];
|
||||
function icomWatts(pct: number): { w: number; defl: number } {
|
||||
const raw = Math.max(0, pct * 2.55);
|
||||
const defl = raw <= 143 ? (raw / 143) * 50 : Math.min(100, 50 + ((raw - 143) / 70) * 50);
|
||||
let w = 200;
|
||||
for (let i = 1; i < ICOM_7760_PO.length; i++) {
|
||||
const [r0, w0] = ICOM_7760_PO[i - 1], [r1, w1] = ICOM_7760_PO[i];
|
||||
if (raw <= r1) { w = w0 + ((raw - r0) / (r1 - r0)) * (w1 - w0); break; }
|
||||
}
|
||||
return { w: Math.round(w), defl };
|
||||
}
|
||||
|
||||
function modeMatches(btn: string, cur?: string): boolean {
|
||||
if (!cur) return false;
|
||||
if (btn === 'SSB') return cur === 'SSB' || cur === 'USB' || cur === 'LSB';
|
||||
// The backend surfaces USB-D as the operator's digital default (FT8…), or as
|
||||
// plain DATA — either way it is the DATA button that should light.
|
||||
if (btn === 'DATA') return ['DATA', 'FT8', 'FT4', 'JS8', 'JT65', 'JT9', 'MFSK', 'OLIVIA'].includes(cur);
|
||||
if (btn === 'PSK') return cur === 'PSK' || cur === 'PSK31';
|
||||
return btn === cur;
|
||||
}
|
||||
|
||||
@@ -241,11 +272,11 @@ function Meter({ label, value, accent, scale, onClick, title }: { label: string;
|
||||
<div className="flex-1 h-2.5 rounded-full bg-muted/60 overflow-hidden">
|
||||
<div className="h-full rounded-full transition-[width] duration-150" style={{ width: `${v}%`, background: accent }} />
|
||||
</div>
|
||||
<span className="w-10 text-right text-[11px] font-mono tabular-nums text-muted-foreground">{scale ?? v}</span>
|
||||
<span className="w-14 shrink-0 whitespace-nowrap text-right text-[11px] font-mono tabular-nums text-muted-foreground">{scale ?? v}</span>
|
||||
</>
|
||||
);
|
||||
if (onClick) {
|
||||
return <button type="button" onClick={onClick} title={title} className="flex items-center gap-2 w-full rounded hover:bg-muted/50 -mx-1 px-1 py-0.5">{body}</button>;
|
||||
return <button type="button" onClick={onClick} title={title} className="flex items-center gap-2 w-full rounded cursor-pointer hover:bg-muted/50 -mx-1 px-1 py-0.5">{body}</button>;
|
||||
}
|
||||
return <div className="flex items-center gap-2">{body}</div>;
|
||||
}
|
||||
@@ -253,6 +284,13 @@ function Meter({ label, value, accent, scale, onClick, title }: { label: string;
|
||||
// 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
|
||||
// the RST-tx value on click.
|
||||
// Green to S9, amber through +20, red above — the Elecraft console's scale.
|
||||
function sSegColor(frac: number) {
|
||||
if (frac > 0.78) return '#dc2626';
|
||||
if (frac > 0.55) return '#f59e0b';
|
||||
return '#16a34a';
|
||||
}
|
||||
|
||||
function sParts(v: number): { s: number; over: number; label: string } {
|
||||
if (v >= 47) {
|
||||
const over = Math.max(0, Math.round((v - 47) * 60 / 47));
|
||||
@@ -280,294 +318,31 @@ function wfColor(v: number): [number, number, number] {
|
||||
return WF_STOPS[WF_STOPS.length - 1][1];
|
||||
}
|
||||
|
||||
// ScopePanadapter — enables the rig's spectrum-scope stream and draws the
|
||||
// reassembled sweep as a modern SDR panadapter: a glowing filled spectrum trace
|
||||
// on top and a scrolling colour waterfall below. Amplitudes are raw rig scale
|
||||
// (~0-160), normalised to the tallest recent peak so the trace fills the height.
|
||||
function ScopePanadapter() {
|
||||
const { t } = useI18n();
|
||||
const [on, setOn] = useState(false);
|
||||
const [fixed, setFixed] = useState(true);
|
||||
const canvasRef = useRef<HTMLCanvasElement>(null);
|
||||
const wfRef = useRef<HTMLCanvasElement>(null); // waterfall
|
||||
const peakRef = useRef(160); // running amplitude ceiling for auto-scale
|
||||
const holdRef = useRef<number[]>([]); // per-bin peak-hold line
|
||||
// Some radios control their scope over CI-V but never stream it (IC-7851).
|
||||
// Saying so beats a black rectangle, which reads as a bug in OpsLog.
|
||||
const [unsupported, setUnsupported] = useState(false);
|
||||
const spanRef = useRef({ low: 0, high: 0 }); // latest sweep edges, for click-to-tune
|
||||
const vfoRef = useRef(0); // latest VFO frequency, for wheel-tune
|
||||
const centerRef = useRef(0); // scope centre we last set (for pan ◀/▶)
|
||||
// The spectrum scope is GONE, deliberately. Every Icom streams its waveform
|
||||
// differently — the IC-7851 controls a scope it never streams, and a real
|
||||
// IC-7760 stops answering CI-V altogether a few frames in, taking CAT and
|
||||
// audio down with it — and chasing a per-model frame layout for a decoration
|
||||
// is not worth a console that drops the link. The radio has a better scope
|
||||
// on its own front panel.
|
||||
|
||||
const toggle = () => {
|
||||
const next = !on;
|
||||
setOn(next);
|
||||
IcomSetScope(next).catch(() => {});
|
||||
};
|
||||
|
||||
// Centre/pan the FIXED scope: set the edges to centre ±50 kHz (a 100 kHz
|
||||
// window). "Centre" uses the live VFO; ◀/▶ shift the window by 50 kHz. This
|
||||
// just writes the rig's fixed edges — simple and independent of the waveform
|
||||
// decode.
|
||||
const SCOPE_HALF = 50_000;
|
||||
const applyEdges = (center: number) => {
|
||||
if (center <= 0) return;
|
||||
centerRef.current = center;
|
||||
setFixed(true);
|
||||
IcomSetScopeEdges(center - SCOPE_HALF, center + SCOPE_HALF).catch(() => {});
|
||||
};
|
||||
const centerOnVfo = async () => {
|
||||
let c = vfoRef.current;
|
||||
if (c <= 0) { try { const cs = await GetCATState(); c = cs?.freq_hz || 0; } catch {} }
|
||||
applyEdges(c);
|
||||
};
|
||||
const pan = (dir: number) => applyEdges((centerRef.current || vfoRef.current) + dir * SCOPE_HALF);
|
||||
const setMode = (nextFixed: boolean) => {
|
||||
setFixed(nextFixed);
|
||||
IcomSetScopeMode(nextFixed).catch(() => {});
|
||||
};
|
||||
// Stop the stream when the panel unmounts.
|
||||
useEffect(() => () => { IcomSetScope(false).catch(() => {}); }, []);
|
||||
|
||||
useEffect(() => {
|
||||
if (!on) return;
|
||||
let raf = 0, lastSeq = -1, alive = true;
|
||||
const tick = async () => {
|
||||
if (!alive) return;
|
||||
try {
|
||||
const sw = await IcomScopeData();
|
||||
if (sw?.unsupported) setUnsupported(true);
|
||||
if (sw && sw.seq !== lastSeq && sw.amp && sw.amp.length) {
|
||||
lastSeq = sw.seq;
|
||||
setFixed(sw.fixed);
|
||||
spanRef.current = { low: sw.low_hz, high: sw.high_hz };
|
||||
let vfo = 0;
|
||||
try {
|
||||
const cs = await GetCATState();
|
||||
vfo = cs?.split && cs.freq_rx_hz ? cs.freq_rx_hz : (cs?.freq_hz || 0);
|
||||
} catch {}
|
||||
if (vfo > 0) vfoRef.current = vfo;
|
||||
draw(sw.amp, sw.low_hz, sw.high_hz, vfoRef.current, sw.fixed);
|
||||
}
|
||||
} catch {}
|
||||
if (alive) raf = window.setTimeout(() => { raf = requestAnimationFrame(tick); }, 40) as unknown as number;
|
||||
};
|
||||
raf = requestAnimationFrame(tick);
|
||||
return () => { alive = false; cancelAnimationFrame(raf); window.clearTimeout(raf); };
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
}, [on]);
|
||||
|
||||
// Double-click tunes the rig to the clicked frequency.
|
||||
const onDblClick = (e: React.MouseEvent<HTMLCanvasElement>) => {
|
||||
const cv = canvasRef.current;
|
||||
const { low, high } = spanRef.current;
|
||||
if (!cv || !(low > 0 && high > low)) return;
|
||||
const rect = cv.getBoundingClientRect();
|
||||
const frac = Math.max(0, Math.min(1, (e.clientX - rect.left) / rect.width));
|
||||
const hz = Math.round((low + frac * (high - low)) / 100) * 100; // nearest 100 Hz
|
||||
SetCATFrequency(hz).catch(() => {});
|
||||
};
|
||||
|
||||
// Mouse-wheel over the scope QSYs ±100 Hz. Non-passive listener so we can
|
||||
// preventDefault (else the page scrolls); optimistic vfoRef so quick spins
|
||||
// accumulate before the poll reconciles.
|
||||
useEffect(() => {
|
||||
const el = canvasRef.current;
|
||||
if (!el || !on) return;
|
||||
const onWheel = (e: WheelEvent) => {
|
||||
if (!vfoRef.current) return;
|
||||
e.preventDefault();
|
||||
const next = vfoRef.current + (e.deltaY < 0 ? 100 : -100);
|
||||
vfoRef.current = next;
|
||||
SetCATFrequency(next).catch(() => {});
|
||||
};
|
||||
el.addEventListener('wheel', onWheel, { passive: false });
|
||||
return () => el.removeEventListener('wheel', onWheel);
|
||||
}, [on]);
|
||||
|
||||
const draw = (amp: number[], lowHz: number, highHz: number, vfoHz: number, fixedMode: boolean) => {
|
||||
const cv = canvasRef.current;
|
||||
if (!cv) return;
|
||||
const dpr = window.devicePixelRatio || 1;
|
||||
const w = cv.clientWidth, h = cv.clientHeight;
|
||||
if (cv.width !== w * dpr || cv.height !== h * dpr) { cv.width = w * dpr; cv.height = h * dpr; }
|
||||
const ctx = cv.getContext('2d');
|
||||
if (!ctx) return;
|
||||
ctx.setTransform(dpr, 0, 0, dpr, 0, 0);
|
||||
|
||||
// Auto-scale: track the peak, decaying slowly so the floor doesn't jump.
|
||||
const peak = Math.max(...amp);
|
||||
peakRef.current = Math.max(peak, peakRef.current * 0.95, 40);
|
||||
const scale = peakRef.current;
|
||||
const n = amp.length;
|
||||
|
||||
// Background — deep navy vertical gradient.
|
||||
const bg = ctx.createLinearGradient(0, 0, 0, h);
|
||||
bg.addColorStop(0, '#0b1220'); bg.addColorStop(1, '#05070e');
|
||||
ctx.fillStyle = bg; ctx.fillRect(0, 0, w, h);
|
||||
|
||||
// Grid.
|
||||
ctx.strokeStyle = 'rgba(120,150,200,0.08)';
|
||||
ctx.lineWidth = 1;
|
||||
for (let i = 1; i < 4; i++) { const y = (h * i) / 4; ctx.beginPath(); ctx.moveTo(0, y); ctx.lineTo(w, y); ctx.stroke(); }
|
||||
for (let i = 1; i < 8; i++) { const x = (w * i) / 8; ctx.beginPath(); ctx.moveTo(x, 0); ctx.lineTo(x, h); ctx.stroke(); }
|
||||
|
||||
const xOf = (i: number) => (i / (n - 1)) * w;
|
||||
const yOf = (v: number) => h - Math.min(1, v / scale) * h;
|
||||
|
||||
// Peak-hold line (slow decay) — a faint ghost of recent maxima.
|
||||
const hold = holdRef.current;
|
||||
if (hold.length !== n) hold.length = n, hold.fill(0);
|
||||
for (let i = 0; i < n; i++) hold[i] = Math.max(amp[i], hold[i] * 0.92);
|
||||
|
||||
// Filled spectrum area.
|
||||
ctx.beginPath();
|
||||
ctx.moveTo(0, h);
|
||||
for (let i = 0; i < n; i++) ctx.lineTo(xOf(i), yOf(amp[i]));
|
||||
ctx.lineTo(w, h); ctx.closePath();
|
||||
const grad = ctx.createLinearGradient(0, 0, 0, h);
|
||||
grad.addColorStop(0, 'rgba(56,189,248,0.40)');
|
||||
grad.addColorStop(1, 'rgba(56,189,248,0.02)');
|
||||
ctx.fillStyle = grad; ctx.fill();
|
||||
|
||||
// Peak-hold trace (thin, faint).
|
||||
ctx.beginPath();
|
||||
for (let i = 0; i < n; i++) { const x = xOf(i), y = yOf(hold[i]); i === 0 ? ctx.moveTo(x, y) : ctx.lineTo(x, y); }
|
||||
ctx.strokeStyle = 'rgba(148,197,255,0.35)'; ctx.lineWidth = 1; ctx.stroke();
|
||||
|
||||
// Live spectrum trace with a soft glow.
|
||||
ctx.save();
|
||||
ctx.shadowColor = 'rgba(56,189,248,0.7)'; ctx.shadowBlur = 6;
|
||||
ctx.beginPath();
|
||||
for (let i = 0; i < n; i++) { const x = xOf(i), y = yOf(amp[i]); i === 0 ? ctx.moveTo(x, y) : ctx.lineTo(x, y); }
|
||||
ctx.strokeStyle = '#7dd3fc'; ctx.lineWidth = 1.5; ctx.lineJoin = 'round'; ctx.stroke();
|
||||
ctx.restore();
|
||||
|
||||
// VFO marker: you should ALWAYS see where you are. Exact position when the VFO
|
||||
// is inside the span; the centre in CTR mode; clamped to the nearest edge with
|
||||
// a sideways arrow in FIX mode when the fixed scope doesn't cover the VFO (so
|
||||
// you can tell which way to tune to get it back on-screen).
|
||||
const haveVfo = vfoHz > 0 && lowHz > 0 && highHz > lowHz;
|
||||
const inSpan = haveVfo && vfoHz >= lowHz && vfoHz <= highHz;
|
||||
let markerX = -1;
|
||||
let offEdge = 0; // -1 = VFO off the left edge, +1 = off the right
|
||||
if (inSpan) markerX = ((vfoHz - lowHz) / (highHz - lowHz)) * w;
|
||||
else if (!fixedMode) markerX = w / 2;
|
||||
else if (haveVfo) { offEdge = vfoHz < lowHz ? -1 : 1; markerX = offEdge < 0 ? 1 : w - 1; }
|
||||
if (markerX >= 0) {
|
||||
const x = markerX;
|
||||
ctx.fillStyle = 'rgba(244,63,94,0.10)'; ctx.fillRect(x - 5, 0, 10, h);
|
||||
ctx.strokeStyle = 'rgba(244,63,94,0.9)'; ctx.lineWidth = 1.25;
|
||||
ctx.beginPath(); ctx.moveTo(x, 0); ctx.lineTo(x, h); ctx.stroke();
|
||||
ctx.fillStyle = 'rgba(244,63,94,0.95)';
|
||||
if (offEdge === 0) {
|
||||
ctx.beginPath(); ctx.moveTo(x - 4, 0); ctx.lineTo(x + 4, 0); ctx.lineTo(x, 6); ctx.closePath(); ctx.fill();
|
||||
} else {
|
||||
const yh = 8; ctx.beginPath(); ctx.moveTo(x, yh - 5); ctx.lineTo(x + offEdge * 7, yh); ctx.lineTo(x, yh + 5); ctx.closePath(); ctx.fill();
|
||||
}
|
||||
}
|
||||
|
||||
// Frequency scale. In fixed mode the rig reports usable edge frequencies, so
|
||||
// we label low/centre/high from them. In centre mode the header frame's edge
|
||||
// pair isn't a usable low..high range, but the scope is centred on the VFO —
|
||||
// so we always label the centre with the live VFO frequency (which we fetch
|
||||
// each sweep), and only add edge labels when the reported edges genuinely
|
||||
// bracket the VFO. That guarantees you always see your frequency in CTR.
|
||||
const mhz = (hz: number) => (hz / 1e6).toFixed(3);
|
||||
ctx.font = '10px ui-monospace, monospace';
|
||||
ctx.textBaseline = 'bottom';
|
||||
ctx.shadowColor = 'rgba(0,0,0,0.8)'; ctx.shadowBlur = 3;
|
||||
ctx.fillStyle = 'rgba(226,232,240,0.85)';
|
||||
const label = (txt: string, x: number, align: CanvasTextAlign) => { ctx.textAlign = align; ctx.fillText(txt, x, h - 3); };
|
||||
const validEdges = lowHz > 0 && highHz > lowHz;
|
||||
if (fixedMode) {
|
||||
if (validEdges) {
|
||||
label(mhz(lowHz), 4, 'left');
|
||||
label(mhz((lowHz + highHz) / 2), w / 2, 'center');
|
||||
label(mhz(highHz), w - 4, 'right');
|
||||
}
|
||||
} else {
|
||||
if (validEdges && vfoHz >= lowHz && vfoHz <= highHz) {
|
||||
label(mhz(lowHz), 4, 'left');
|
||||
label(mhz(highHz), w - 4, 'right');
|
||||
}
|
||||
if (vfoHz > 0) label(mhz(vfoHz), w / 2, 'center');
|
||||
}
|
||||
ctx.shadowBlur = 0;
|
||||
|
||||
drawWaterfall(amp, scale);
|
||||
};
|
||||
|
||||
// drawWaterfall scrolls the history down one row and paints the newest sweep
|
||||
// as a colour-mapped line at the top.
|
||||
const drawWaterfall = (amp: number[], scale: number) => {
|
||||
const cv = wfRef.current;
|
||||
if (!cv) return;
|
||||
const w = Math.max(1, cv.clientWidth), h = Math.max(1, cv.clientHeight);
|
||||
if (cv.width !== w || cv.height !== h) { cv.width = w; cv.height = h; }
|
||||
const ctx = cv.getContext('2d');
|
||||
if (!ctx) return;
|
||||
// Scroll everything down by one pixel row.
|
||||
ctx.drawImage(cv, 0, 0, w, h - 1, 0, 1, w, h - 1);
|
||||
// Paint the new top row.
|
||||
const row = ctx.createImageData(w, 1);
|
||||
const n = amp.length;
|
||||
for (let x = 0; x < w; x++) {
|
||||
const i = Math.min(n - 1, Math.round((x / (w - 1)) * (n - 1)));
|
||||
const [r, g, b] = wfColor(amp[i] / scale);
|
||||
const o = x * 4;
|
||||
row.data[o] = r; row.data[o + 1] = g; row.data[o + 2] = b; row.data[o + 3] = 255;
|
||||
}
|
||||
ctx.putImageData(row, 0, 0);
|
||||
};
|
||||
|
||||
// Collapsible card: when the scope is off, only the header band shows (the
|
||||
// canvas is hidden entirely) so it doesn't waste vertical space. The CTR/FIX
|
||||
// and ON/OFF controls live in the header itself.
|
||||
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">
|
||||
<Activity className="size-4" style={{ color: '#38bdf8' }} />
|
||||
<span className="text-xs font-bold uppercase tracking-wider text-foreground/80">{t('icmp.spectrum')}</span>
|
||||
<div className="ml-auto flex items-center gap-2 shrink-0">
|
||||
{on && (
|
||||
<div className="inline-flex rounded-md border border-border overflow-hidden">
|
||||
<button type="button" onClick={() => pan(-1)} title={t('icmp.scopePanDown')}
|
||||
className="px-2 py-1 text-xs font-bold bg-card text-muted-foreground hover:bg-muted border-r border-border">◀</button>
|
||||
<button type="button" onClick={centerOnVfo} title={t('icmp.scopeCenterVfo')}
|
||||
className="px-2 py-1 text-[11px] font-bold bg-card text-muted-foreground hover:bg-muted border-r border-border">⊙</button>
|
||||
<button type="button" onClick={() => pan(1)} title={t('icmp.scopePanUp')}
|
||||
className="px-2 py-1 text-xs font-bold bg-card text-muted-foreground hover:bg-muted">▶</button>
|
||||
</div>
|
||||
)}
|
||||
{on && (
|
||||
<Segmented value={fixed ? 'FIX' : 'CTR'} options={[{ v: 'CTR', l: 'CTR' }, { v: 'FIX', l: 'FIX' }]}
|
||||
onChange={(v) => setMode(v === 'FIX')} />
|
||||
)}
|
||||
<Chip label={on ? 'ON' : 'OFF'} on={on} onClick={toggle} />
|
||||
</div>
|
||||
</div>
|
||||
{on && unsupported && (
|
||||
<div className="px-3 py-2 text-xs text-muted-foreground">{t('icmp.scopeNoStream')}</div>
|
||||
)}
|
||||
{on && !unsupported && (
|
||||
<div className="p-3">
|
||||
<div className="rounded-xl overflow-hidden ring-1 ring-info/20 shadow-lg shadow-sky-500/5 bg-[#05070e]">
|
||||
<canvas ref={canvasRef} onDoubleClick={onDblClick}
|
||||
className="w-full block cursor-crosshair" style={{ height: 140 }} />
|
||||
<canvas ref={wfRef} className="w-full block" style={{ height: 96 }} />
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
// IcomPanel — full control surface (RX DSP + TX) for an Icom on the CI-V backend.
|
||||
// Unlike the Flex (which pushes state), the Icom is polled: meters/TX state are
|
||||
// read every cache cycle; DSP set-controls are optimistic and reconcile on the
|
||||
// next poll. Front-panel knob changes for DSP show after ↻ Refresh.
|
||||
export function IcomPanel({ onReportRST, isNetwork = false }: { onReportRST?: (rst: string) => void; isNetwork?: boolean } = {}) {
|
||||
// The speaker toggle lives HERE, next to ON/OFF, because that is where the
|
||||
// operator is looking — burying "stop listening" behind Settings → Audio
|
||||
// meant a trip through two panels to mute a radio sitting in the same room.
|
||||
const [listening, setListening] = useState(false);
|
||||
useEffect(() => {
|
||||
if (!isNetwork) return;
|
||||
let alive = true;
|
||||
const ask = () => AudioMonitorActive().then((v) => { if (alive) setListening(!!v); }).catch(() => {});
|
||||
ask();
|
||||
const id = window.setInterval(ask, 2000);
|
||||
return () => { alive = false; window.clearInterval(id); };
|
||||
}, [isNetwork]);
|
||||
const toggleListening = () => {
|
||||
const next = !listening;
|
||||
setListening(next);
|
||||
(next ? AudioStartMonitor() : Promise.resolve(AudioStopMonitor())).catch(() => setListening(!next));
|
||||
};
|
||||
const { t } = useI18n();
|
||||
const [st, setSt] = useState<IcomState>(ZERO);
|
||||
const [cat, setCat] = useState<any>(null); // RigState (freq/mode/split) for the VFO display
|
||||
@@ -603,7 +378,9 @@ export function IcomPanel({ onReportRST, isNetwork = false }: { onReportRST?: (r
|
||||
const toggleMox = () => {
|
||||
const next = !txRef.current;
|
||||
txRef.current = next;
|
||||
set({ transmitting: next }, () => IcomSetPTT(next));
|
||||
// Through the console binding: on a network station the PC microphone
|
||||
// rides with the PTT (silence otherwise); on USB it keys and nothing more.
|
||||
set({ transmitting: next }, () => IcomConsolePTT(next));
|
||||
};
|
||||
|
||||
const tune = async () => {
|
||||
@@ -646,8 +423,13 @@ export function IcomPanel({ onReportRST, isNetwork = false }: { onReportRST?: (r
|
||||
// other is TX (freq_hz); otherwise there's a single VFO (freq_hz).
|
||||
const split = !!cat?.split;
|
||||
const mainHz: number = split ? (cat?.freq_rx_hz || 0) : (cat?.freq_hz || 0);
|
||||
const subHz: number = split ? (cat?.freq_hz || 0) : 0;
|
||||
const curMode: string = cat?.mode || st.mode || '';
|
||||
// The sub receiver's dial is worth seeing whether or not split is on —
|
||||
// in split the CAT state's TX freq is the authority, otherwise the panel's
|
||||
// own sub_hz read.
|
||||
const subHz: number = split ? (cat?.freq_hz || 0) : (st.sub_hz || 0);
|
||||
// The panel's own mode first: it carries the sideband (USB/LSB) where the
|
||||
// CAT state folds both into ADIF's SSB.
|
||||
const curMode: string = st.mode || cat?.mode || '';
|
||||
// Mode-dependent controls: VOX / speech-comp / mic are voice-only (hidden on
|
||||
// CW and data); APF (audio peak filter) is CW-only. Fold USB/LSB into phone.
|
||||
const um = curMode.toUpperCase();
|
||||
@@ -676,6 +458,14 @@ export function IcomPanel({ onReportRST, isNetwork = false }: { onReportRST?: (r
|
||||
rig's LAN server stays alive in standby, so both work. */}
|
||||
{isNetwork && (
|
||||
<>
|
||||
<button type="button" onClick={toggleListening}
|
||||
title={listening ? t('icmp.speakerOffHint') : t('icmp.speakerOnHint')}
|
||||
className={cn('inline-flex items-center gap-1 rounded-md border px-2 py-1 text-xs font-bold',
|
||||
listening
|
||||
? 'border-primary/60 bg-primary/10 text-primary hover:bg-primary/20'
|
||||
: 'border-border bg-card text-muted-foreground hover:bg-muted')}>
|
||||
{listening ? <Volume2 className="size-3.5" /> : <VolumeX className="size-3.5" />}
|
||||
</button>
|
||||
<button type="button" onClick={() => IcomSetPower(true).catch(() => {})} title={t('icmp.powerOnHint')}
|
||||
className="inline-flex items-center gap-1 rounded-md border border-success/60 bg-success/10 px-2 py-1 text-xs font-bold text-success hover:bg-success/20">
|
||||
<Power className="size-3.5" /> ON
|
||||
@@ -717,7 +507,7 @@ export function IcomPanel({ onReportRST, isNetwork = false }: { onReportRST?: (r
|
||||
</div>
|
||||
</div>
|
||||
{/* Mode selector row (RS-BA1's SSB/CW/RTTY/PSK/AM/FM). */}
|
||||
<div className="grid grid-cols-6 border-t border-border/60 divide-x divide-border/60">
|
||||
<div className="grid grid-cols-7 border-t border-border/60 divide-x divide-border/60">
|
||||
{MODES.map((m) => {
|
||||
const on = modeMatches(m, curMode);
|
||||
return (
|
||||
@@ -731,20 +521,28 @@ export function IcomPanel({ onReportRST, isNetwork = false }: { onReportRST?: (r
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Live meters — always visible: S (RX, click → RST), Po in watts, SWR. */}
|
||||
<div className="rounded-xl border border-border bg-card px-3 py-2.5 shadow-sm grid grid-cols-1 sm:grid-cols-3 gap-x-5 gap-y-2">
|
||||
{/* Live meters — the SAME LED MeterBar every other console uses (Flex,
|
||||
Elecraft, the amp cards): one instrument look across the app, per the
|
||||
operator's "les consoles doivent se ressembler". S is clickable → RST. */}
|
||||
<div className="grid grid-cols-1 sm:grid-cols-3 gap-2">
|
||||
{(() => { const sp = sParts(st.s_meter); return (
|
||||
<Meter label="S" value={st.s_meter} accent="#22c55e" scale={sp.label}
|
||||
<MeterBar label="S-METER" value={st.transmitting ? 0 : st.s_meter} lo={0} hi={100}
|
||||
accent="#16a34a" segColor={sSegColor}
|
||||
display={st.transmitting ? '—' : sp.label}
|
||||
title={onReportRST ? t('rst.clickToFill') : undefined}
|
||||
onClick={onReportRST ? () => onReportRST(sMeterRST(sp.s, sp.over, st.mode)) : undefined} />
|
||||
onClick={onReportRST ? () => { if (!st.transmitting) onReportRST(sMeterRST(sp.s, sp.over, st.mode)); } : undefined} />
|
||||
); })()}
|
||||
<Meter label="Po" value={st.power_meter} accent="#ef4444" scale={`${st.power_meter} W`} />
|
||||
<Meter label="SWR" value={st.swr_meter} accent="#f59e0b" scale={st.swr_meter > 0 ? `${(1 + st.swr_meter / 33.3).toFixed(1)}` : '1.0'} />
|
||||
{(() => {
|
||||
if ((st.model ?? '').includes('7760')) {
|
||||
const { w, defl } = icomWatts(st.power_meter);
|
||||
return <MeterBar label="PWR" value={defl} lo={0} hi={100} accent="#0ea5e9" display={`${w} W`} />;
|
||||
}
|
||||
return <MeterBar label="PWR" value={st.power_meter} lo={0} hi={100} accent="#0ea5e9" display={`${st.power_meter} W`} />;
|
||||
})()}
|
||||
<MeterBar label="SWR" value={st.swr_meter > 0 ? 1 + st.swr_meter / 33.3 : 0} lo={1} hi={4} accent="#f59e0b"
|
||||
display={st.swr_meter > 0 ? (1 + st.swr_meter / 33.3).toFixed(1) : '—'} />
|
||||
</div>
|
||||
|
||||
{/* Spectrum panadapter (full width). */}
|
||||
<ScopePanadapter />
|
||||
|
||||
<div className="grid grid-cols-1 lg:grid-cols-2 gap-3">
|
||||
{/* Band buttons + antenna selection. */}
|
||||
<Card icon={Antenna} title={t('icmp.bandsAntenna')} accent="#0891b2">
|
||||
@@ -784,7 +582,11 @@ export function IcomPanel({ onReportRST, isNetwork = false }: { onReportRST?: (r
|
||||
<Card icon={Mic} title={t('icmp.transmit')} accent="#ef4444">
|
||||
<Row label={t('icmp.power')}>
|
||||
<Slider value={st.rf_power} accent="#ef4444" onChange={(v) => set({ rf_power: v }, () => IcomSetRFPower(v))} />
|
||||
<span className="w-8 text-right text-xs font-mono tabular-nums text-muted-foreground">{st.rf_power}</span>
|
||||
{/* PC is a percentage of the rig's rated power; on a 200 W rig the
|
||||
operator thinks in watts, so say it in watts there. */}
|
||||
<span className="w-12 text-right text-xs font-mono tabular-nums text-muted-foreground">
|
||||
{(st.model ?? '').includes('7760') ? `${st.rf_power * 2} W` : st.rf_power}
|
||||
</span>
|
||||
</Row>
|
||||
{isPhone && (
|
||||
<Row label={t('icmp.mic')}>
|
||||
@@ -799,6 +601,9 @@ export function IcomPanel({ onReportRST, isNetwork = false }: { onReportRST?: (r
|
||||
{tx ? 'TX ON' : 'MOX'}
|
||||
</button>
|
||||
<Chip label="SPLIT" on={st.split} onClick={() => set({ split: !st.split }, () => IcomSetSplit(!st.split))} />
|
||||
{/* Tuner IN/OUT — TUNE below starts a cycle but could never take the
|
||||
tuner back out of line. */}
|
||||
<Chip label="ATU" on={!!st.atu_on} onClick={() => set({ atu_on: !st.atu_on } as any, () => IcomSetATU(!st.atu_on))} />
|
||||
<button type="button" onClick={tune} disabled={tuning}
|
||||
className={cn('w-14 shrink-0 px-2 py-1.5 rounded-md text-[11px] font-bold border transition-colors',
|
||||
tuning ? 'bg-warning border-warning text-warning-foreground animate-pulse' : 'bg-card text-foreground border-border hover:bg-muted')}>
|
||||
|
||||
@@ -9,7 +9,8 @@ import {
|
||||
import {
|
||||
GetLookupSettings, SaveLookupSettings, ClearLookupCache, TestLookupProvider,
|
||||
GetListsSettings, SaveListsSettings,
|
||||
GetCATSettings, SaveCATSettings, GetRadios, SaveRadios, SetActiveRadio, DiscoverFlexRadios,
|
||||
GetCATSettings, SaveCATSettings, GetRadios, SaveRadios, SetActiveRadio, ActiveRadioID, DiscoverFlexRadios,
|
||||
GetAudioMonitorPref,
|
||||
ListProfiles, GetActiveProfile, SaveProfile, DeleteProfile, ActivateProfile, DuplicateProfile,
|
||||
GetRotators, SaveRotators, TestRotatorDevice, RotatorPark, RotatorStop,
|
||||
GetRotorPresets, SaveRotorPresets, ResetRotorPresets,
|
||||
@@ -1503,6 +1504,7 @@ const ICOM_MODELS: { name: string; addr: number }[] = [
|
||||
{ name: 'IC-7600', addr: 0x7A },
|
||||
{ name: 'IC-7610', addr: 0x98 },
|
||||
{ name: 'IC-7700', addr: 0x74 },
|
||||
{ name: 'IC-7760', addr: 0xB2 },
|
||||
{ name: 'IC-7800', addr: 0x6A },
|
||||
{ name: 'IC-7851', addr: 0x8E },
|
||||
{ name: 'IC-9100', addr: 0x7C },
|
||||
@@ -1600,6 +1602,7 @@ function SettingsModalImpl({ onClose, onSaved, initialSection, onMainPaneChanged
|
||||
// The saved radios. The CAT panel edits ONE of them — whichever is on the air
|
||||
// — and the list is what makes switching possible without touching profiles.
|
||||
const [radios, setRadios] = useState<any[]>([]);
|
||||
const [listenPref, setListenPref] = useState(true);
|
||||
const [activeRadio, setActiveRadioId] = useState('');
|
||||
const [radioBusy, setRadioBusy] = useState(false);
|
||||
const [catCfg, setCatCfg] = useState<CATSettings>({
|
||||
@@ -2203,10 +2206,17 @@ function SettingsModalImpl({ onClose, onSaved, initialSection, onMainPaneChanged
|
||||
// buttons. See rotorPresetsLoaded for the belt to this brace.
|
||||
try { setRotorPresets((((await GetRotorPresets()) ?? []) as any)); setRotorPresetsLoaded(true); } catch {}
|
||||
try {
|
||||
try { setListenPref(!!(await GetAudioMonitorPref())); } catch {}
|
||||
const rl: any = await GetRadios();
|
||||
setRadios(rl ?? []);
|
||||
const act = (rl ?? []).find((r: any) => r.active) ?? (rl ?? [])[0];
|
||||
setActiveRadioId(act?.id ?? '');
|
||||
// The backend is the only one who knows which radio is on the air —
|
||||
// the list entries carry no 'active' flag, and guessing the first
|
||||
// meant reopening the panel showed Radio 1's name over the settings
|
||||
// of whichever radio was actually selected.
|
||||
let actId = '';
|
||||
try { actId = (await ActiveRadioID()) ?? ''; } catch {}
|
||||
if (!actId || !(rl ?? []).some((r: any) => r.id === actId)) actId = (rl ?? [])[0]?.id ?? '';
|
||||
setActiveRadioId(actId);
|
||||
} catch { /* one radio, never listed — the panel works as it always did */ }
|
||||
try { setUltrabeam(await GetUltrabeamSettings() as any); } catch {}
|
||||
try { setAntgenius(await GetAntGeniusSettings() as any); } catch {}
|
||||
@@ -3619,6 +3629,22 @@ function SettingsModalImpl({ onClose, onSaved, initialSection, onMainPaneChanged
|
||||
<span className="block text-[11px] text-muted-foreground">{t('cat.icomNetAudioHint')}</span>
|
||||
</span>
|
||||
</label>
|
||||
{!!(catCfg as any).icom_net_audio && (
|
||||
<label className="col-span-2 flex items-start gap-2 text-sm cursor-pointer pl-6">
|
||||
{/* The speaker choice, right where the stream is enabled. Same
|
||||
remembered preference as the console's speaker button —
|
||||
applied immediately, no save needed. */}
|
||||
<Checkbox checked={listenPref}
|
||||
onCheckedChange={(c) => {
|
||||
setListenPref(!!c);
|
||||
(c ? AudioStartMonitor() : Promise.resolve(AudioStopMonitor())).catch(() => setListenPref(!c));
|
||||
}} />
|
||||
<span>
|
||||
{t('cat.icomNetListen')}
|
||||
<span className="block text-[11px] text-muted-foreground">{t('cat.icomNetListenHint')}</span>
|
||||
</span>
|
||||
</label>
|
||||
)}
|
||||
</>
|
||||
)}
|
||||
{catCfg.backend === 'tci' && (
|
||||
@@ -4886,7 +4912,7 @@ function SettingsModalImpl({ onClose, onSaved, initialSection, onMainPaneChanged
|
||||
|
||||
{wk.engine === 'icom' ? (
|
||||
<>
|
||||
{(!catCfg.enabled || catCfg.backend !== 'icom') && (
|
||||
{(!catCfg.enabled || (catCfg.backend !== 'icom' && catCfg.backend !== 'icom-net')) && (
|
||||
<p className="text-xs font-medium text-warning -mt-1 flex items-start gap-1.5">
|
||||
<span aria-hidden>⚠</span>
|
||||
<span>{t('wk.catWarnIcom', { backend: catCfg.enabled ? (catCfg.backend || 'none') : 'disabled' })}</span>
|
||||
@@ -6962,7 +6988,8 @@ function SettingsModalImpl({ onClose, onSaved, initialSection, onMainPaneChanged
|
||||
size="sm"
|
||||
className="h-8"
|
||||
onClick={toggleMonitor}
|
||||
disabled={!monitorOn && (!audioCfg.from_radio || fromRadioIsNetwork)}
|
||||
disabled={!monitorOn && (!audioCfg.from_radio || fromRadioIsNetwork)
|
||||
&& !(catCfg.backend === 'icom-net' && (catCfg as any).icom_net_audio)}
|
||||
title={fromRadioIsNetwork ? t('aud.monitorNoTci') : t('aud.monitorTitle')}
|
||||
>
|
||||
{monitorOn ? t('aud.stopListening') : t('aud.listenRadio')}
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -36,17 +36,17 @@ export function inferSpotMode(comment: string, freqHz: number): string {
|
||||
type Seg = [number, number, string];
|
||||
const segs: Seg[] = [
|
||||
[1.8, 1.838, 'CW'], [1.838, 1.84, 'FT8'], [1.84, 2.0, 'SSB'],
|
||||
[3.5, 3.58, 'CW'], [3.573, 3.576, 'FT8'], [3.58, 3.6, 'DATA'], [3.6, 4.0, 'SSB'],
|
||||
[5.3, 5.5, 'SSB'],
|
||||
[3.573, 3.575, 'FT8'], [3.575, 3.578, 'FT4'], [3.5, 3.58, 'CW'], [3.58, 3.6, 'DATA'], [3.6, 4.0, 'SSB'],
|
||||
[5.357, 5.36, 'FT8'], [5.3, 5.5, 'SSB'],
|
||||
[7.0, 7.04, 'CW'], [7.074, 7.077, 'FT8'], [7.0475, 7.0485, 'FT4'],
|
||||
[7.04, 7.1, 'DATA'], [7.1, 7.3, 'SSB'],
|
||||
[10.1, 10.13, 'CW'], [10.13, 10.15, 'DATA'],
|
||||
[10.136, 10.139, 'FT8'], [10.14, 10.143, 'FT4'], [10.1, 10.13, 'CW'], [10.13, 10.15, 'DATA'],
|
||||
[14.0, 14.07, 'CW'], [14.074, 14.077, 'FT8'], [14.08, 14.0815, 'FT4'],
|
||||
[14.07, 14.1, 'DATA'], [14.1, 14.35, 'SSB'],
|
||||
[18.068, 18.095, 'CW'], [18.1, 18.103, 'FT8'], [18.095, 18.11, 'DATA'], [18.11, 18.168, 'SSB'],
|
||||
[18.1, 18.103, 'FT8'], [18.104, 18.107, 'FT4'], [18.068, 18.095, 'CW'], [18.095, 18.11, 'DATA'], [18.11, 18.168, 'SSB'],
|
||||
[21.0, 21.07, 'CW'], [21.074, 21.077, 'FT8'], [21.14, 21.143, 'FT4'],
|
||||
[21.07, 21.15, 'DATA'], [21.15, 21.45, 'SSB'],
|
||||
[24.89, 24.915, 'CW'], [24.915, 24.917, 'FT8'], [24.915, 24.94, 'DATA'], [24.94, 24.99, 'SSB'],
|
||||
[24.915, 24.918, 'FT8'], [24.919, 24.922, 'FT4'], [24.89, 24.915, 'CW'], [24.915, 24.94, 'DATA'], [24.94, 24.99, 'SSB'],
|
||||
[28.0, 28.07, 'CW'], [28.074, 28.077, 'FT8'], [28.18, 28.183, 'FT4'],
|
||||
[28.07, 28.3, 'DATA'], [28.3, 29.7, 'SSB'],
|
||||
[50.0, 50.1, 'CW'], [50.313, 50.316, 'FT8'], [50.318, 50.321, 'FT4'],
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// Single source of truth for the app version shown in the UI (header + About).
|
||||
// Bump this on a release (the release script updates it alongside telemetry.go).
|
||||
export const APP_VERSION = '0.27.0';
|
||||
export const APP_VERSION = '0.27.1';
|
||||
|
||||
// Author / credits, shown in Help -> About.
|
||||
export const APP_AUTHOR = 'F4BPO';
|
||||
|
||||
Vendored
+10
@@ -46,6 +46,8 @@ export function ActivateProfile(arg1:number):Promise<void>;
|
||||
|
||||
export function ActiveRadioID():Promise<string>;
|
||||
|
||||
export function ActiveRadioMyRig():Promise<string>;
|
||||
|
||||
export function AddQSO(arg1:qso.QSO):Promise<number>;
|
||||
|
||||
export function AmpFanMode(arg1:string,arg2:string):Promise<void>;
|
||||
@@ -404,6 +406,8 @@ export function GetAntGeniusSettings():Promise<main.AntGeniusSettings>;
|
||||
|
||||
export function GetAntGeniusStatus():Promise<antgenius.Status>;
|
||||
|
||||
export function GetAudioMonitorPref():Promise<boolean>;
|
||||
|
||||
export function GetAudioSettings():Promise<main.AudioSettings>;
|
||||
|
||||
export function GetAutostartPrograms():Promise<Array<main.AutostartProgram>>;
|
||||
@@ -626,6 +630,8 @@ export function HaltDecodeTx(arg1:string,arg2:boolean):Promise<void>;
|
||||
|
||||
export function HasBuiltinReferences(arg1:string):Promise<boolean>;
|
||||
|
||||
export function IcomConsolePTT(arg1:boolean):Promise<void>;
|
||||
|
||||
export function IcomRefresh():Promise<void>;
|
||||
|
||||
export function IcomScopeData():Promise<cat.ScopeSweep>;
|
||||
@@ -640,6 +646,8 @@ export function IcomSetANF(arg1:boolean):Promise<void>;
|
||||
|
||||
export function IcomSetAPF(arg1:boolean):Promise<void>;
|
||||
|
||||
export function IcomSetATU(arg1:boolean):Promise<void>;
|
||||
|
||||
export function IcomSetAntenna(arg1:number):Promise<void>;
|
||||
|
||||
export function IcomSetAntiVOX(arg1:number):Promise<void>;
|
||||
@@ -700,6 +708,8 @@ export function IcomSetScopeMode(arg1:boolean):Promise<void>;
|
||||
|
||||
export function IcomSetSplit(arg1:boolean):Promise<void>;
|
||||
|
||||
export function IcomSetSplitOffset(arg1:number):Promise<void>;
|
||||
|
||||
export function IcomSetSquelch(arg1:number):Promise<void>;
|
||||
|
||||
export function IcomSetVOX(arg1:boolean):Promise<void>;
|
||||
|
||||
@@ -30,6 +30,10 @@ export function ActiveRadioID() {
|
||||
return window['go']['main']['App']['ActiveRadioID']();
|
||||
}
|
||||
|
||||
export function ActiveRadioMyRig() {
|
||||
return window['go']['main']['App']['ActiveRadioMyRig']();
|
||||
}
|
||||
|
||||
export function AddQSO(arg1) {
|
||||
return window['go']['main']['App']['AddQSO'](arg1);
|
||||
}
|
||||
@@ -746,6 +750,10 @@ export function GetAntGeniusStatus() {
|
||||
return window['go']['main']['App']['GetAntGeniusStatus']();
|
||||
}
|
||||
|
||||
export function GetAudioMonitorPref() {
|
||||
return window['go']['main']['App']['GetAudioMonitorPref']();
|
||||
}
|
||||
|
||||
export function GetAudioSettings() {
|
||||
return window['go']['main']['App']['GetAudioSettings']();
|
||||
}
|
||||
@@ -1190,6 +1198,10 @@ export function HasBuiltinReferences(arg1) {
|
||||
return window['go']['main']['App']['HasBuiltinReferences'](arg1);
|
||||
}
|
||||
|
||||
export function IcomConsolePTT(arg1) {
|
||||
return window['go']['main']['App']['IcomConsolePTT'](arg1);
|
||||
}
|
||||
|
||||
export function IcomRefresh() {
|
||||
return window['go']['main']['App']['IcomRefresh']();
|
||||
}
|
||||
@@ -1218,6 +1230,10 @@ export function IcomSetAPF(arg1) {
|
||||
return window['go']['main']['App']['IcomSetAPF'](arg1);
|
||||
}
|
||||
|
||||
export function IcomSetATU(arg1) {
|
||||
return window['go']['main']['App']['IcomSetATU'](arg1);
|
||||
}
|
||||
|
||||
export function IcomSetAntenna(arg1) {
|
||||
return window['go']['main']['App']['IcomSetAntenna'](arg1);
|
||||
}
|
||||
@@ -1338,6 +1354,10 @@ export function IcomSetSplit(arg1) {
|
||||
return window['go']['main']['App']['IcomSetSplit'](arg1);
|
||||
}
|
||||
|
||||
export function IcomSetSplitOffset(arg1) {
|
||||
return window['go']['main']['App']['IcomSetSplitOffset'](arg1);
|
||||
}
|
||||
|
||||
export function IcomSetSquelch(arg1) {
|
||||
return window['go']['main']['App']['IcomSetSquelch'](arg1);
|
||||
}
|
||||
|
||||
@@ -983,6 +983,7 @@ export namespace cat {
|
||||
mode?: string;
|
||||
transmitting: boolean;
|
||||
split: boolean;
|
||||
sub_hz: number;
|
||||
s_meter: number;
|
||||
power_meter: number;
|
||||
swr_meter: number;
|
||||
@@ -1006,6 +1007,7 @@ export namespace cat {
|
||||
att: number;
|
||||
filter: number;
|
||||
antenna: number;
|
||||
atu_on: boolean;
|
||||
pbt_inner: number;
|
||||
pbt_outer: number;
|
||||
manual_notch: boolean;
|
||||
@@ -1030,6 +1032,7 @@ export namespace cat {
|
||||
this.mode = source["mode"];
|
||||
this.transmitting = source["transmitting"];
|
||||
this.split = source["split"];
|
||||
this.sub_hz = source["sub_hz"];
|
||||
this.s_meter = source["s_meter"];
|
||||
this.power_meter = source["power_meter"];
|
||||
this.swr_meter = source["swr_meter"];
|
||||
@@ -1053,6 +1056,7 @@ export namespace cat {
|
||||
this.att = source["att"];
|
||||
this.filter = source["filter"];
|
||||
this.antenna = source["antenna"];
|
||||
this.atu_on = source["atu_on"];
|
||||
this.pbt_inner = source["pbt_inner"];
|
||||
this.pbt_outer = source["pbt_outer"];
|
||||
this.manual_notch = source["manual_notch"];
|
||||
|
||||
@@ -27,27 +27,31 @@ type modeSeg struct {
|
||||
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_573_000, 3_575_000, "FT8"}, {3_575_000, 3_578_000, "FT4"}, {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"},
|
||||
{5_357_000, 5_360_000, "FT8"}, {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.
|
||||
// The FT8/FT4 watering holes come first, or a 10.136 spot with a bare
|
||||
// comment reads as generic DATA — which is what every skimmerless spot of a
|
||||
// DXpedition's 30 m FT8 slot did.
|
||||
{10_136_000, 10_139_000, "FT8"}, {10_140_000, 10_143_000, "FT4"},
|
||||
{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_100_000, 18_103_000, "FT8"}, {18_104_000, 18_107_000, "FT4"},
|
||||
{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_915_000, 24_918_000, "FT8"}, {24_919_000, 24_922_000, "FT4"},
|
||||
{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"},
|
||||
|
||||
@@ -356,6 +356,29 @@ func (m *Manager) StartTXAudio(micDev, toRadioDev string) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
// StartTXAudioNetwork pipes the live microphone into a SEND function instead
|
||||
// of a render device — the talk button when the radio is reached over its own
|
||||
// link. No ring and no pacing goroutine: the microphone delivers in real time,
|
||||
// and the sender re-frames to the rig's cadence, so the capture callback IS
|
||||
// the clock.
|
||||
func (m *Manager) StartTXAudioNetwork(micDev string, send func([]byte) error) error {
|
||||
m.mu.Lock()
|
||||
if m.txStop != nil {
|
||||
m.mu.Unlock()
|
||||
return fmt.Errorf("TX audio already running")
|
||||
}
|
||||
stop := make(chan struct{})
|
||||
m.txStop = stop
|
||||
m.mu.Unlock()
|
||||
go func() {
|
||||
if err := captureStream(micDev, stop, func(chunk []byte) { _ = send(chunk) }); err != nil {
|
||||
LogSink("audio: network TX capture from %q failed: %v", DeviceName(micDev), err)
|
||||
}
|
||||
}()
|
||||
m.notify()
|
||||
return nil
|
||||
}
|
||||
|
||||
// StopTXAudio stops the TX mic→rig passthrough.
|
||||
func (m *Manager) StopTXAudio() {
|
||||
m.mu.Lock()
|
||||
|
||||
@@ -64,4 +64,4 @@ func NetworkPlayerReady() bool { return networkPlayer() != nil }
|
||||
// comes back with. Named, because "the device could not be opened" would send
|
||||
// an operator hunting through Windows sound settings for a device that never
|
||||
// existed.
|
||||
var errNoNetworkRadio = errors.New("no radio is connected to take the audio — check the CAT link (the radio output only works with a TCI radio)")
|
||||
var errNoNetworkRadio = errors.New("no radio is connected to take the audio — check the CAT link (a TCI radio, or a network Icom with RX audio enabled)")
|
||||
|
||||
+11
-4
@@ -572,9 +572,13 @@ type IcomTXState struct {
|
||||
// Transmit + live status (polled).
|
||||
Transmitting bool `json:"transmitting"`
|
||||
Split bool `json:"split"`
|
||||
SMeter int `json:"s_meter"` // 0-100 (raw 0-255; S9≈120)
|
||||
PowerMeter int `json:"power_meter"` // 0-100 (TX Po)
|
||||
SWRMeter int `json:"swr_meter"` // 0-100 (TX SWR)
|
||||
// SubHz is the unselected VFO / sub receiver's frequency — shown on the
|
||||
// console's SUB display whether or not split is on: a dual-receiver rig
|
||||
// (IC-7610/7760) has a second dial worth seeing at all times.
|
||||
SubHz int64 `json:"sub_hz"`
|
||||
SMeter int `json:"s_meter"` // 0-100 (raw 0-255; S9≈120)
|
||||
PowerMeter int `json:"power_meter"` // 0-100 (TX Po)
|
||||
SWRMeter int `json:"swr_meter"` // 0-100 (TX SWR)
|
||||
// RIT / ΔTX (XIT).
|
||||
RITHz int `json:"rit_hz"` // RIT/XIT offset, signed Hz
|
||||
RITOn bool `json:"rit_on"`
|
||||
@@ -598,7 +602,8 @@ type IcomTXState struct {
|
||||
Att int `json:"att"` // dB attenuation, 0=off
|
||||
Filter int `json:"filter"` // 1 | 2 | 3 (FIL1/2/3)
|
||||
// Antenna (IC-7610 = ANT1/ANT2).
|
||||
Antenna int `json:"antenna"` // 1 | 2 (0 = unknown)
|
||||
Antenna int `json:"antenna"` // 1 | 2 (0 = unknown)
|
||||
ATUOn bool `json:"atu_on"` // internal tuner engaged
|
||||
// Filter fine controls: Twin PBT + manual notch (0-100, 50 = centre).
|
||||
PBTInner int `json:"pbt_inner"`
|
||||
PBTOuter int `json:"pbt_outer"`
|
||||
@@ -636,6 +641,8 @@ type IcomController interface {
|
||||
SetRFPower(int) error
|
||||
SetMicGain(int) error
|
||||
SetIcomSplit(bool) error
|
||||
SetIcomSplitOffset(bool, int64) error
|
||||
SetATU(bool) error
|
||||
TuneATU() error
|
||||
SetScope(bool) error // enable/disable the spectrum-scope waveform stream
|
||||
SetScopeMode(bool) error // true = fixed span, false = center-on-VFO
|
||||
|
||||
@@ -36,6 +36,7 @@ const (
|
||||
CmdVfoFreq = 0x25 // read a specific VFO's freq (sub 0x00 selected, 0x01 unselected)
|
||||
CmdPTT = 0x1C // sub 0x00 = PTT
|
||||
CmdExtra = 0x1A // sub 0x06 = data mode on modern Icoms
|
||||
CmdModeDataFil = 0x26 // sub 0x00 = selected VFO: mode + data flag + filter in one frame
|
||||
CmdReadID = 0x19 // sub 0x00 = rig's own CI-V address (identifies model)
|
||||
CmdPower = 0x18 // power on/off (sub 0x01 = on, 0x00 = off; on needs an FE wake preamble)
|
||||
|
||||
@@ -130,6 +131,8 @@ const (
|
||||
ModeFM = 0x05
|
||||
ModeCWR = 0x07
|
||||
ModeRTTYR = 0x08
|
||||
ModePSK = 0x12 // native PSK (IC-7610/7760/7851 class; older rigs NAK it)
|
||||
ModePSKR = 0x13
|
||||
)
|
||||
|
||||
// Frame builds a complete CI-V frame (preamble … end) for payload, which is the
|
||||
@@ -305,6 +308,8 @@ func ModeToADIF(m byte, data bool) string {
|
||||
return "CW"
|
||||
case ModeRTTY, ModeRTTYR:
|
||||
return "RTTY"
|
||||
case ModePSK, ModePSKR:
|
||||
return "PSK31"
|
||||
case ModeAM:
|
||||
return "AM"
|
||||
case ModeFM:
|
||||
@@ -357,6 +362,8 @@ func ModelName(addr byte) string {
|
||||
return "IC-9700"
|
||||
case 0xA4:
|
||||
return "IC-705"
|
||||
case 0xB2:
|
||||
return "IC-7760"
|
||||
case 0xB6:
|
||||
return "IC-7300MKII"
|
||||
}
|
||||
|
||||
+132
-11
@@ -22,17 +22,20 @@ package cat
|
||||
// audio stream is opt-in and entirely separate from control/CI-V.
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net"
|
||||
"sync"
|
||||
"sync/atomic"
|
||||
"time"
|
||||
)
|
||||
|
||||
// icaAudioOffset is where the PCM payload begins inside an audio data packet
|
||||
// (wfview audio_packet: 16-byte common header + ident@0x10 + datalen@0x12 +
|
||||
// sendseq@0x14 → audio@0x16). Isolated as a const so a capture-confirmed change
|
||||
// is a one-line edit.
|
||||
const icaAudioOffset = 0x16
|
||||
// icaAudioOffset is where the PCM payload begins inside an audio data packet.
|
||||
// CONFIRMED on a real IC-7760 (2026-08-29): 16-byte common header, ident@0x10,
|
||||
// send seq (BE) @0x12, payload length (BE uint32) @0x14 — 0x500 observed on
|
||||
// every packet — and the PCM starts at 0x18. The 0x16 first guessed from
|
||||
// wfview's struct swallowed two header bytes into the audio, one broken sample
|
||||
// per packet: a 50 Hz click track under everything.
|
||||
const icaAudioOffset = 0x18
|
||||
|
||||
// icaDumpFirst is how many initial audio packets to hex-dump to the debug log for
|
||||
// offset verification. After the layout is confirmed on a real rig this can go to
|
||||
@@ -54,8 +57,16 @@ type icomAudio struct {
|
||||
rxLastSeq uint16
|
||||
rxMissing map[uint16]int
|
||||
|
||||
dumped int // packets hex-dumped so far (≤ icaDumpFirst)
|
||||
lastRx atomic.Int64 // UnixNano of last packet (liveness)
|
||||
dumped int // packets hex-dumped so far (≤ icaDumpFirst)
|
||||
pingSeq uint16 // client-ping counter — the rig wants OUR pings too (see icnPing)
|
||||
started time.Time
|
||||
|
||||
// Live-TX state — see SendTXChunk.
|
||||
txMu sync.Mutex
|
||||
txRem []byte
|
||||
txOuter uint16
|
||||
txSend uint16
|
||||
lastRx atomic.Int64 // UnixNano of last packet (liveness)
|
||||
|
||||
done chan struct{}
|
||||
closeOnce sync.Once
|
||||
@@ -100,6 +111,7 @@ func dialIcomAudio(host string, sink func([]byte), cancel <-chan struct{}) (*ico
|
||||
_ = conn.SetReadBuffer(1 << 20)
|
||||
a := &icomAudio{
|
||||
conn: conn, aID: aID, aRemote: aRemote,
|
||||
started: time.Now(),
|
||||
sink: sink,
|
||||
rxMissing: make(map[uint16]int),
|
||||
done: make(chan struct{}),
|
||||
@@ -115,6 +127,7 @@ func dialIcomAudio(host string, sink func([]byte), cancel <-chan struct{}) (*ico
|
||||
func (a *icomAudio) audioPump() {
|
||||
buf := make([]byte, 8192)
|
||||
lastIdle := time.Now()
|
||||
lastPing := time.Now()
|
||||
lastReq := time.Now()
|
||||
for {
|
||||
select {
|
||||
@@ -132,12 +145,19 @@ func (a *icomAudio) audioPump() {
|
||||
case typ == 0x05: // rig-initiated disconnect
|
||||
debugLog.Printf("icom audio: rig sent DISCONNECT — audio stream dropped by the rig")
|
||||
case typ == 0x00 && k > icaAudioOffset: // audio data packet
|
||||
a.trackRxSeq(icnLE.Uint16(buf[6:]))
|
||||
fresh := a.trackRxSeq(icnLE.Uint16(buf[6:]))
|
||||
if a.dumped < icaDumpFirst {
|
||||
a.dumped++
|
||||
debugLog.Printf("icom audio raw #%d: len=%d head=% X", a.dumped, k, buf[:min(icaAudioOffset+8, k)])
|
||||
}
|
||||
if a.sink != nil {
|
||||
// Only a packet that ADVANCES the sequence reaches the sink. A
|
||||
// duplicate or a late retransmit used to be delivered as if it
|
||||
// were the next 20 ms of audio: the monitor's capped ring threw
|
||||
// the surplus away (the speakers stayed clean), but the recorder
|
||||
// keeps every sample it is given — the file grew longer than the
|
||||
// QSO and played back slowed and stuttering, each lost-then-
|
||||
// resent packet heard twice.
|
||||
if fresh && a.sink != nil {
|
||||
payload := append([]byte(nil), buf[icaAudioOffset:k]...)
|
||||
a.sink(payload)
|
||||
}
|
||||
@@ -147,6 +167,11 @@ func (a *icomAudio) audioPump() {
|
||||
_, _ = a.conn.Write(icnCtrl(0x00, 0, a.aID, a.aRemote))
|
||||
lastIdle = time.Now()
|
||||
}
|
||||
if time.Since(lastPing) > 500*time.Millisecond {
|
||||
a.pingSeq++
|
||||
_, _ = a.conn.Write(icnPing(a.pingSeq, a.aID, a.aRemote, uint32(time.Since(a.started).Milliseconds())))
|
||||
lastPing = time.Now()
|
||||
}
|
||||
if time.Since(lastReq) > 100*time.Millisecond {
|
||||
a.sendRetransmitReq()
|
||||
lastReq = time.Now()
|
||||
@@ -157,26 +182,36 @@ func (a *icomAudio) audioPump() {
|
||||
// trackRxSeq / sendRetransmitReq mirror icomNet's receive-side retransmit exactly
|
||||
// (audio is as loss-sensitive as the scope stream). Duplicated deliberately so
|
||||
// the audio stream owns its own seq state with no shared locking.
|
||||
func (a *icomAudio) trackRxSeq(seq uint16) {
|
||||
//
|
||||
// The return value says whether this packet moves the stream FORWARD — the
|
||||
// only kind the sink may hear. A duplicate is the same 20 ms again; a late
|
||||
// retransmit would play old audio in the middle of new. Both are accounted
|
||||
// for here and dropped by the caller.
|
||||
func (a *icomAudio) trackRxSeq(seq uint16) bool {
|
||||
if !a.rxHaveSeq {
|
||||
a.rxHaveSeq = true
|
||||
a.rxLastSeq = seq
|
||||
return
|
||||
return true
|
||||
}
|
||||
switch d := int16(seq - a.rxLastSeq); {
|
||||
case d == 0:
|
||||
return false
|
||||
case d < 0:
|
||||
delete(a.rxMissing, seq)
|
||||
return false
|
||||
case d == 1:
|
||||
a.rxLastSeq = seq
|
||||
return true
|
||||
case int(d) <= icnMaxMissing:
|
||||
for f := a.rxLastSeq + 1; f != seq; f++ {
|
||||
a.rxMissing[f] = 0
|
||||
}
|
||||
a.rxLastSeq = seq
|
||||
return true
|
||||
default:
|
||||
a.rxMissing = make(map[uint16]int)
|
||||
a.rxLastSeq = seq
|
||||
return true
|
||||
}
|
||||
}
|
||||
|
||||
@@ -217,3 +252,89 @@ func (a *icomAudio) sendRetransmitReq() {
|
||||
_, _ = a.conn.Write(b)
|
||||
}
|
||||
}
|
||||
|
||||
// PlayTX sends one already-decoded message out over the audio session, paced
|
||||
// at the stream's own 20 ms / 320-sample cadence, and returns when the last
|
||||
// packet has gone or stop is closed.
|
||||
//
|
||||
// The frame mirrors what the rig itself sends on this socket byte for byte —
|
||||
// ident 0x81 0x01 (LPCM mono 16-bit), a big-endian send sequence at 0x12, the
|
||||
// payload length at 0x14, PCM from 0x18 — with the IDs swapped for direction.
|
||||
// PTT is the caller's business, exactly as on the TCI and sound-card paths.
|
||||
func (a *icomAudio) PlayTX(pcm []byte, rate, ch, bits int, stop <-chan struct{}) error {
|
||||
mono := decodeToMono(pcm, ch, bits)
|
||||
if len(mono) == 0 {
|
||||
return fmt.Errorf("the message is empty")
|
||||
}
|
||||
if rate > 0 && rate != 16000 {
|
||||
mono = resampleLinear(mono, rate, 16000)
|
||||
}
|
||||
// Through the SAME framer and counters as the live microphone. Each of the
|
||||
// two used to number its own packets from 1, and a voice-keyer message sent
|
||||
// after a talk session re-used sequence numbers the rig had already seen —
|
||||
// it keyed for the full length of the message and modulated none of it.
|
||||
const frame = 320 // samples per packet: 20 ms at 16 kHz, the rig's own cadence
|
||||
tick := time.NewTicker(20 * time.Millisecond)
|
||||
defer tick.Stop()
|
||||
buf := make([]byte, frame*2)
|
||||
for pos := 0; pos < len(mono); pos += frame {
|
||||
select {
|
||||
case <-stop:
|
||||
return nil
|
||||
case <-a.done:
|
||||
return fmt.Errorf("the audio stream closed mid-message")
|
||||
case <-tick.C:
|
||||
}
|
||||
for i := 0; i < frame; i++ {
|
||||
var v float32
|
||||
if pos+i < len(mono) {
|
||||
v = mono[pos+i] * 32767
|
||||
}
|
||||
if v > 32767 {
|
||||
v = 32767
|
||||
} else if v < -32768 {
|
||||
v = -32768
|
||||
}
|
||||
icnLE.PutUint16(buf[i*2:], uint16(int16(v)))
|
||||
}
|
||||
if err := a.SendTXChunk(buf); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// Live TX — the microphone, not a recorded message. Chunks arrive at the
|
||||
// microphone's own real-time pace (16 kHz mono 16-bit, whatever length the
|
||||
// capture delivers) and are re-framed into the rig's 320-sample packets; the
|
||||
// remainder waits for the next chunk. Counters and remainder live on the
|
||||
// stream so a talk session survives across calls.
|
||||
func (a *icomAudio) SendTXChunk(pcm []byte) error {
|
||||
a.txMu.Lock()
|
||||
defer a.txMu.Unlock()
|
||||
a.txRem = append(a.txRem, pcm...)
|
||||
const frameBytes = 640
|
||||
for len(a.txRem) >= frameBytes {
|
||||
select {
|
||||
case <-a.done:
|
||||
return fmt.Errorf("the audio stream closed")
|
||||
default:
|
||||
}
|
||||
pkt := make([]byte, 0x18+frameBytes)
|
||||
icnLE.PutUint32(pkt[0:], uint32(len(pkt)))
|
||||
a.txOuter++
|
||||
icnLE.PutUint16(pkt[6:], a.txOuter)
|
||||
icnLE.PutUint32(pkt[8:], a.aID)
|
||||
icnLE.PutUint32(pkt[12:], a.aRemote)
|
||||
pkt[0x10], pkt[0x11] = 0x81, 0x01
|
||||
icnBE.PutUint16(pkt[0x12:], a.txSend)
|
||||
a.txSend++
|
||||
icnBE.PutUint32(pkt[0x14:], frameBytes)
|
||||
copy(pkt[0x18:], a.txRem[:frameBytes])
|
||||
a.txRem = a.txRem[frameBytes:]
|
||||
if _, err := a.conn.Write(pkt); err != nil {
|
||||
return fmt.Errorf("sending mic audio to the rig: %w", err)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
+212
-9
@@ -56,6 +56,15 @@ func NewIcomNet(host, user, pass string, civAddr int, digitalDefault string, aud
|
||||
model: "Icom",
|
||||
scopeFixed: true,
|
||||
}
|
||||
// lastNetConnect is when the previous session came up, and it drives a
|
||||
// deliberate pause: on a real IC-7760 a session sometimes goes deaf on CI-V
|
||||
// while the rig still holds it half-open, and a session dialled straight
|
||||
// back in answers for a second and is then strangled when the rig finally
|
||||
// purges the old one — reconnect, die, reconnect, die, twenty seconds a
|
||||
// lap and no audio the whole time. When the last session died YOUNG, wait
|
||||
// out the rig's cleanup before dialling again; a session that lived long
|
||||
// reconnects immediately, as ever.
|
||||
var lastNetConnect time.Time
|
||||
b.open = func() (civTransport, error) {
|
||||
if strings.TrimSpace(host) == "" {
|
||||
return nil, fmt.Errorf("no rig host configured")
|
||||
@@ -63,7 +72,20 @@ func NewIcomNet(host, user, pass string, civAddr int, digitalDefault string, aud
|
||||
b.dialMu.Lock()
|
||||
cancel := b.dialCancel
|
||||
b.dialMu.Unlock()
|
||||
return dialIcomNet(host, user, pass, "OpsLog", b.rigAddr, cancel, audioSink)
|
||||
if !lastNetConnect.IsZero() && time.Since(lastNetConnect) < 90*time.Second {
|
||||
debugLog.Printf("icom net: the last session died young — pausing 20 s before redialling so the rig can purge it first")
|
||||
for i := 0; i < 40; i++ {
|
||||
if icnCanceled(cancel) {
|
||||
return nil, errDialCanceled
|
||||
}
|
||||
time.Sleep(500 * time.Millisecond)
|
||||
}
|
||||
}
|
||||
tr, err := dialIcomNet(host, user, pass, "OpsLog", b.rigAddr, cancel, audioSink)
|
||||
if err == nil {
|
||||
lastNetConnect = time.Now()
|
||||
}
|
||||
return tr, err
|
||||
}
|
||||
return b
|
||||
}
|
||||
@@ -97,6 +119,19 @@ type icomNet struct {
|
||||
// CAT goroutine) and during dial — never by the pump — so no lock is needed.
|
||||
vTracked uint16
|
||||
vCivSeq uint16
|
||||
seqMu sync.Mutex // guards vTracked/vCivSeq: the command loop AND the pump's quiet-recovery both send
|
||||
// Client-ping sequence counters, one per stream, and the connection's epoch
|
||||
// for the ping timestamps. Owned by their pump goroutines — no locking.
|
||||
civPingSeq uint16
|
||||
ctrlPingSeq uint16
|
||||
started time.Time
|
||||
// txCiv counts CI-V command packets sent, and txAtData snapshots it at the
|
||||
// last received CI-V data. Their difference during a silence answers the
|
||||
// question the reconnects cannot: were we still ASKING when the answers
|
||||
// stopped? Zero writes-since-data would mean the fault is our own poll
|
||||
// loop, not the rig — and RS-BA1 showing no such dropouts points that way.
|
||||
txCiv atomic.Uint32
|
||||
txAtData atomic.Uint32
|
||||
|
||||
rx chan []byte // CI-V byte chunks from civPump → Read (control replies)
|
||||
scopeRx chan []byte // scope (0x27) frames, kept off rx so the panadapter
|
||||
@@ -227,10 +262,13 @@ func (n *icomNet) Write(p []byte) (int, error) {
|
||||
if icnTrace {
|
||||
debugLog.Printf("icom net TX: % X", p)
|
||||
}
|
||||
seq := n.vTracked
|
||||
pkt := icnCivData(seq, n.vID, n.vRemote, n.vCivSeq, p)
|
||||
n.seqMu.Lock()
|
||||
seq, civSeq := n.vTracked, n.vCivSeq
|
||||
n.vTracked++
|
||||
n.vCivSeq++
|
||||
n.seqMu.Unlock()
|
||||
n.txCiv.Add(1)
|
||||
pkt := icnCivData(seq, n.vID, n.vRemote, civSeq, p)
|
||||
n.sentMu.Lock()
|
||||
n.sentBuf[seq] = pkt
|
||||
delete(n.sentBuf, seq-1024) // keep the buffer bounded (~last 1024 packets) so
|
||||
@@ -281,6 +319,7 @@ func (n *icomNet) Close() error {
|
||||
func (n *icomNet) ctrlPump() {
|
||||
buf := make([]byte, 4096)
|
||||
lastIdle := time.Now()
|
||||
lastCtrlPing := time.Now()
|
||||
lastToken := time.Now() // token was just granted during dial
|
||||
for {
|
||||
select {
|
||||
@@ -321,6 +360,11 @@ func (n *icomNet) ctrlPump() {
|
||||
}
|
||||
// Renew well inside the rig's ~2-min token timeout. 30 s (was 45) leaves room
|
||||
// for one lost renewal + its retransmit before the token would lapse.
|
||||
if time.Since(lastCtrlPing) > 500*time.Millisecond {
|
||||
n.ctrlPingSeq++
|
||||
_, _ = n.ctrl.Write(icnPing(n.ctrlPingSeq, n.cID, n.cRemote, uint32(time.Since(n.started).Milliseconds())))
|
||||
lastCtrlPing = time.Now()
|
||||
}
|
||||
if time.Since(lastToken) > 30*time.Second {
|
||||
n.renewToken()
|
||||
lastToken = time.Now()
|
||||
@@ -359,6 +403,25 @@ func (n *icomNet) civPump() {
|
||||
buf := make([]byte, 8192)
|
||||
lastIdle := time.Now()
|
||||
lastReq := time.Now()
|
||||
// Diagnosis for the recurring 2-3-minute silence a real IC-7760 shows on
|
||||
// this stream while the control link stays alive: when the stream has been
|
||||
// quiet for 10 s, say so ONCE, with the last read error — a socket error
|
||||
// and a rig that stopped talking are different repairs, and the 30 s
|
||||
// watchdog that follows cannot tell them apart from where it sits.
|
||||
debugLog.Printf("icom net: client pings armed on the CI-V stream (every 500 ms)")
|
||||
lastPkt := time.Now()
|
||||
lastPing := time.Now()
|
||||
lastData := time.Now() // CI-V payload packets (replies + transceive)
|
||||
lastScope := time.Time{} // scope frames within those
|
||||
var lastErr error
|
||||
quietSaid := false
|
||||
gaveUp := false
|
||||
// sawData: this session has heard at least one CI-V payload. A radio in
|
||||
// STANDBY is silent on CI-V by design — only the transport chats — and the
|
||||
// quiet-recovery below must not treat that as a fault: it was tearing the
|
||||
// session down every 15 s, and with it the console and its ON button, so a
|
||||
// radio that was off when OpsLog started could never be turned on at all.
|
||||
sawData := false
|
||||
for {
|
||||
select {
|
||||
case <-n.done:
|
||||
@@ -366,7 +429,14 @@ func (n *icomNet) civPump() {
|
||||
default:
|
||||
}
|
||||
_ = n.civ.SetReadDeadline(time.Now().Add(100 * time.Millisecond))
|
||||
if k, err := n.civ.Read(buf); err == nil && k >= 16 {
|
||||
k, err := n.civ.Read(buf)
|
||||
if err != nil {
|
||||
if e, ok := err.(net.Error); !ok || !e.Timeout() {
|
||||
lastErr = err // a REAL socket error, not the read deadline
|
||||
}
|
||||
}
|
||||
if err == nil && k >= 16 {
|
||||
lastPkt = time.Now()
|
||||
n.markRx()
|
||||
switch typ := icnLE.Uint16(buf[4:]); {
|
||||
case typ == 0x07: // ping
|
||||
@@ -379,6 +449,13 @@ func (n *icomNet) civPump() {
|
||||
n.dead.Store(true) // make Alive() fail now → prompt clean reconnect
|
||||
debugLog.Printf("icom net: rig sent DISCONNECT on CI-V stream — session dropped by the rig")
|
||||
case typ == 0x00 && k > 0x15 && buf[0x10] == 0xc1: // CI-V data
|
||||
if quietSaid {
|
||||
debugLog.Printf("icom net: CI-V replies are back after %s", time.Since(lastData).Round(time.Second))
|
||||
quietSaid, gaveUp = false, false
|
||||
}
|
||||
sawData = true
|
||||
lastData = time.Now()
|
||||
n.txAtData.Store(n.txCiv.Load())
|
||||
n.trackRxSeq(icnLE.Uint16(buf[6:])) // note gaps for retransmit
|
||||
civBytes := buf[0x15:k]
|
||||
cp := append([]byte(nil), civBytes...)
|
||||
@@ -388,6 +465,7 @@ func (n *icomNet) civPump() {
|
||||
// feeder in IcomSerial picks them up. Everything else is a control
|
||||
// reply → rx → Read.
|
||||
if len(civBytes) >= 5 && civBytes[4] == 0x27 {
|
||||
lastScope = time.Now()
|
||||
icnEnqueueDrop(n.scopeRx, cp)
|
||||
break
|
||||
}
|
||||
@@ -410,14 +488,69 @@ func (n *icomNet) civPump() {
|
||||
}
|
||||
}
|
||||
}
|
||||
if !quietSaid && sawData && time.Since(lastData) > 10*time.Second {
|
||||
quietSaid = true
|
||||
scopeAge := "never"
|
||||
if !lastScope.IsZero() {
|
||||
scopeAge = time.Since(lastScope).Round(time.Second).String()
|
||||
}
|
||||
debugLog.Printf("icom net: no CI-V DATA for 10 s (transport last heard %s ago; last scope frame %s ago; last socket error: %v; missing-seq backlog: %d; CI-V commands SENT since the last answer: %d)",
|
||||
time.Since(lastPkt).Round(time.Second), scopeAge, lastErr, len(n.rxMissing), n.txCiv.Load()-n.txAtData.Load())
|
||||
// And try the gentle repair before the 30 s watchdog tears the whole
|
||||
// session down: if the rig quietly closed the CI-V data flow (the
|
||||
// transport is still chatting, so the session itself stands), saying
|
||||
// "open" again on the same stream is all it should take. Harmless
|
||||
// when the cause is elsewhere — the watchdog still fires at 30 s.
|
||||
n.seqMu.Lock()
|
||||
seq, civSeq := n.vTracked, n.vCivSeq
|
||||
n.vTracked++
|
||||
n.vCivSeq++
|
||||
n.seqMu.Unlock()
|
||||
ocPkt := icnOpenClose(seq, n.vID, n.vRemote, civSeq, 0x04)
|
||||
n.sentMu.Lock()
|
||||
n.sentBuf[seq] = ocPkt
|
||||
n.sentMu.Unlock()
|
||||
_, _ = n.civ.Write(ocPkt)
|
||||
debugLog.Printf("icom net: re-sent the CI-V open on the existing stream")
|
||||
}
|
||||
// The reopen was given five seconds. On a real IC-7760 it never works —
|
||||
// the rig ignores it and only a fresh session brings CI-V back — so
|
||||
// rather than sit out the 30 s watchdog, fail the link NOW and let the
|
||||
// manager rebuild it: the outage drops from ~35 s to ~15.
|
||||
if quietSaid && !gaveUp && time.Since(lastData) > 15*time.Second {
|
||||
gaveUp = true
|
||||
n.dead.Store(true)
|
||||
debugLog.Printf("icom net: the reopen did not bring CI-V back — forcing a fresh session")
|
||||
}
|
||||
if time.Since(lastIdle) > 150*time.Millisecond {
|
||||
_, _ = n.civ.Write(icnCtrl(0x00, 0, n.vID, n.vRemote))
|
||||
// Idles carry a REAL sequence number, drawn from the same counter as
|
||||
// the data packets, and sit in the retransmit buffer like them —
|
||||
// which is how RS-BA1 and wfview number theirs. Ours used seq 0 on
|
||||
// every idle, seven a second, interleaved with properly-numbered
|
||||
// data; a rig that follows the sequence tolerates that for a minute
|
||||
// or so and then stops serving CI-V data on the stream — which is
|
||||
// the shape of every dropout this loaner IC-7760 has shown, with
|
||||
// the scope and the TX path both since eliminated.
|
||||
n.seqMu.Lock()
|
||||
iseq := n.vTracked
|
||||
n.vTracked++
|
||||
n.seqMu.Unlock()
|
||||
ipkt := icnCtrl(0x00, iseq, n.vID, n.vRemote)
|
||||
n.sentMu.Lock()
|
||||
n.sentBuf[iseq] = ipkt
|
||||
n.sentMu.Unlock()
|
||||
_, _ = n.civ.Write(ipkt)
|
||||
lastIdle = time.Now()
|
||||
}
|
||||
if time.Since(lastReq) > 100*time.Millisecond {
|
||||
n.sendRetransmitReq()
|
||||
lastReq = time.Now()
|
||||
}
|
||||
if time.Since(lastPing) > 500*time.Millisecond {
|
||||
n.civPingSeq++
|
||||
_, _ = n.civ.Write(icnPing(n.civPingSeq, n.vID, n.vRemote, uint32(time.Since(n.started).Milliseconds())))
|
||||
lastPing = time.Now()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -661,6 +794,7 @@ func dialIcomNet(host, user, pass, compName string, rigAddr byte, cancel <-chan
|
||||
cTracked: cTracked, cAuthSeq: cInner,
|
||||
cToken: token, cTokReq: tokReq,
|
||||
cSentBuf: make(map[uint16][]byte),
|
||||
started: time.Now(),
|
||||
}
|
||||
n.markRx() // the successful handshake counts as initial rig activity
|
||||
// openClose(open) starts the CI-V data flow. We intentionally DO NOT power the
|
||||
@@ -712,6 +846,11 @@ func icnHandshake(c *net.UDPConn, myID uint32, cancel <-chan struct{}) (uint32,
|
||||
}
|
||||
typ := icnLE.Uint16(p[4:])
|
||||
sentid := icnLE.Uint32(p[8:])
|
||||
// Every packet the rig sends during the handshake, verbatim. A radio that
|
||||
// answers SOMETHING unrecognised (a newer model, a different firmware) and
|
||||
// a radio that answers nothing are different faults, and a silent timeout
|
||||
// hides which one this is.
|
||||
icnHandshakeProbe(p)
|
||||
switch typ {
|
||||
case 0x04: // iAmHere
|
||||
remoteID = sentid
|
||||
@@ -843,11 +982,20 @@ func icnConnInfo(seq, innerSeq, tokReq uint16, sentid, rcvdid, token uint32, use
|
||||
copy(b[0x40:0x60], []byte("IC-7610"))
|
||||
copy(b[0x60:0x70], icnPasscode(user))
|
||||
b[0x70] = rxEnable // rxenable: 1 opens the 50003 RX audio stream, 0 = CI-V only
|
||||
b[0x71] = 0x00 // txenable (Phase 5)
|
||||
b[0x72] = 0x10 // rxcodec
|
||||
b[0x73] = 0x04 // txcodec
|
||||
// TX rides the same audio session: whenever the operator wants RX audio the
|
||||
// TX side is opened with it, so the voice keyer can play to the radio with
|
||||
// no cable. Costs nothing when unused — no packets flow until a message is
|
||||
// actually played.
|
||||
b[0x71] = rxEnable // txenable
|
||||
// rxcodec 0x04 = LPCM, ONE channel, 16-BIT — settled by experiment on a
|
||||
// real IC-7760, one wrong guess at a time: 0x10 produced 1280-byte payloads
|
||||
// of interleaved 16-bit stereo, 0x02 produced 320-byte payloads of 8-bit
|
||||
// mono (samples hugging 0x80). 0x04 sits between them in the codec table
|
||||
// (as in wfview): 16-bit mono, the format the 16 kHz playback path plays.
|
||||
b[0x72] = 0x04 // rxcodec
|
||||
b[0x73] = 0x04 // txcodec
|
||||
icnBE.PutUint32(b[0x74:], 16000)
|
||||
icnBE.PutUint32(b[0x78:], 8000)
|
||||
icnBE.PutUint32(b[0x78:], 16000) // TX sample rate — the same 16 kHz everything else here runs at
|
||||
icnBE.PutUint32(b[0x7c:], uint32(civPort))
|
||||
icnBE.PutUint32(b[0x80:], uint32(audioPort))
|
||||
icnBE.PutUint32(b[0x84:], 100)
|
||||
@@ -855,6 +1003,26 @@ func icnConnInfo(seq, innerSeq, tokReq uint16, sentid, rcvdid, token uint32, use
|
||||
return b
|
||||
}
|
||||
|
||||
// PlayTXAudio plays one voice-keyer message through the 50003 audio session.
|
||||
// On the transport because the transport owns the session; the IcomSerial
|
||||
// controller forwards here after a type assertion, exactly as the TCI path
|
||||
// reaches its radio.
|
||||
func (n *icomNet) PlayTXAudio(pcm []byte, rate, ch, bits int, stop <-chan struct{}) error {
|
||||
if n.audio == nil {
|
||||
return fmt.Errorf("the radio's audio stream is not open — enable RX audio in Settings → CAT first")
|
||||
}
|
||||
return n.audio.PlayTX(pcm, rate, ch, bits, stop)
|
||||
}
|
||||
|
||||
// TXAudioSender returns a function that streams live microphone chunks to the
|
||||
// rig — the talk button's road, where PlayTXAudio is the voice keyer's.
|
||||
func (n *icomNet) TXAudioSender() (func([]byte) error, error) {
|
||||
if n.audio == nil {
|
||||
return nil, fmt.Errorf("the radio's audio stream is not open — enable RX audio in Settings → CAT first")
|
||||
}
|
||||
return n.audio.SendTXChunk, nil
|
||||
}
|
||||
|
||||
func icnOpenClose(seq uint16, sentid, rcvdid uint32, civSeq uint16, magic byte) []byte {
|
||||
b := make([]byte, 0x16)
|
||||
icnLE.PutUint32(b[0:], 0x16)
|
||||
@@ -903,3 +1071,38 @@ func icnPasscode(s string) []byte {
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// icnHandshakeProbe logs the first packets seen during a control handshake —
|
||||
// capped hard, because a working handshake would log for ever.
|
||||
var icnProbeCount int
|
||||
|
||||
func icnHandshakeProbe(p []byte) {
|
||||
if icnProbeCount >= 12 {
|
||||
return
|
||||
}
|
||||
icnProbeCount++
|
||||
n := len(p)
|
||||
if n > 32 {
|
||||
n = 32
|
||||
}
|
||||
debugLog.Printf("icom net: handshake rx %d bytes: % X", len(p), p[:n])
|
||||
}
|
||||
|
||||
// icnPing builds a CLIENT ping request (wfview's ping_packet: 0x15 bytes,
|
||||
// type 0x07, reply=0, a monotonic time at 0x11). The rig answers each one —
|
||||
// and, decisively, treats them as the client's sign of life: wfview sends one
|
||||
// every 500 ms on every stream, and OpsLog, which only ever REPLIED to the
|
||||
// rig's pings, watched the IC-7760 stop serving CI-V data about a minute into
|
||||
// every session. Same socket answered, same transport alive: the rig had
|
||||
// simply concluded nobody was listening.
|
||||
func icnPing(seq uint16, sentid, rcvdid uint32, ms uint32) []byte {
|
||||
b := make([]byte, 0x15)
|
||||
icnLE.PutUint32(b[0:], 0x15)
|
||||
icnLE.PutUint16(b[4:], 0x07)
|
||||
icnLE.PutUint16(b[6:], seq)
|
||||
icnLE.PutUint32(b[8:], sentid)
|
||||
icnLE.PutUint32(b[12:], rcvdid)
|
||||
b[0x10] = 0x00
|
||||
icnLE.PutUint32(b[0x11:], ms)
|
||||
return b
|
||||
}
|
||||
|
||||
+168
-12
@@ -116,7 +116,13 @@ type IcomSerial struct {
|
||||
// "alive but silent" tolerance below, which used to be
|
||||
// unbounded and left the display frozen for ever
|
||||
silentGrace time.Duration // current width of that tolerance (backs off, see ReadState)
|
||||
dspLoaded bool // readDSP has run since the rig became responsive (loads all
|
||||
// Needle inertia for the TX meters — the CI-V meters are point samples, and
|
||||
// between two SSB syllables a poll lands on 0 W and a perfect SWR. See
|
||||
// meterPeak (yaesu_panel.go): power decays like a needle, SWR holds then
|
||||
// snaps back to the live truth.
|
||||
powerPeak meterPeak
|
||||
swrPeak meterPeak
|
||||
dspLoaded bool // readDSP has run since the rig became responsive (loads all
|
||||
// the panel's set-once controls once the rig actually answers)
|
||||
// When the console last asked for the DSP snapshot. The meters and the
|
||||
// front-panel rotation are polled ONLY while something is displaying them:
|
||||
@@ -262,6 +268,21 @@ func (b *IcomSerial) Connect() error {
|
||||
// non-default address still RENDERS; this flag only drives the SET/read commands
|
||||
// (mode, span, edges), which need the 0x00 selector to be accepted on the 7300.
|
||||
b.dualScope = idAddr == 0x98 || idAddr == 0xA2 || idAddr == 0x94
|
||||
// Silence any LEFTOVER waveform stream, BLIND, before anything else. The
|
||||
// 0x27 output flag lives in the RADIO and survives sessions; its flood is
|
||||
// what makes the IC-7760 stop answering CI-V — so waiting for CI-V to
|
||||
// answer before sending this (the first attempt did) was the egg asking
|
||||
// the chicken to hatch it. Fire-and-forget: an unanswered set costs one
|
||||
// frame, and the rig acts on what it decodes whether or not we hear the
|
||||
// acknowledgement. The front-panel display is deliberately untouched.
|
||||
// Synchronously: Connect already runs on the CAT goroutine, and a stray
|
||||
// goroutine writing to the shared link would interleave with the command
|
||||
// loop. Two forms, because the selector byte differs by model and a NAK
|
||||
// costs one frame — and the results are LOGGED, because a kill that quietly
|
||||
// fails leaves the flood running and the next dropout unexplained.
|
||||
err1 := b.execScope("waveform output off (leftover)", civ.SubScopeOn, 0)
|
||||
err2 := b.exec(civ.CmdScope, civ.SubScopeOn, 0x00, 0x00) // main-selector form
|
||||
applog.Printf("icom: waveform-off sent at connect (plain: %v, with selector: %v)", err1, err2)
|
||||
// Defer the DSP snapshot until the rig actually answers CI-V. Over the network
|
||||
// the rig may still be booting (or off) at Connect, so an immediate readDSP
|
||||
// would time out and leave every control at 0 / off with no retry. ReadState
|
||||
@@ -347,7 +368,12 @@ func (b *IcomSerial) ReadState() (RigState, error) {
|
||||
case readerGone:
|
||||
debugLog.Printf("icom net: the CI-V reader has exited — the connection is dead however alive the control link looks → reconnecting")
|
||||
case at.Alive():
|
||||
debugLog.Printf("icom net: control link answers but no CI-V reply for %s → reconnecting. Another program (WSJT-X/OmniRig, the Remote Utility) has most likely taken the CI-V session.", silentFor.Round(time.Second))
|
||||
// No verdict on WHY: this fires for a session taken by another
|
||||
// program (WSJT-X, the Remote Utility) AND for a rig that simply
|
||||
// stopped answering — a real IC-7760 did exactly that once with
|
||||
// nothing else on the network. Blaming a hijacker sent that
|
||||
// operator hunting software that was not installed.
|
||||
debugLog.Printf("icom net: control link answers but no CI-V reply for %s → reconnecting. Either another program took the CI-V session (WSJT-X/OmniRig/Remote Utility), or the rig stopped answering on its own.", silentFor.Round(time.Second))
|
||||
default:
|
||||
debugLog.Printf("icom net: control link went quiet (no rig packets for >6 s) → reconnecting. If this recurs every ~2-3 min, the rig is invalidating the session (token renewal rejected).")
|
||||
}
|
||||
@@ -396,6 +422,19 @@ func (b *IcomSerial) ReadState() (RigState, error) {
|
||||
}
|
||||
b.dspMu.Lock()
|
||||
b.dsp.Mode = s.Mode
|
||||
// The console says which SIDEBAND, not the ADIF family: "SSB" on 40 m
|
||||
// leaves the operator guessing whether the rig is where convention puts
|
||||
// it. The log keeps SSB; the panel shows what the radio is actually doing.
|
||||
switch b.curModeByte {
|
||||
case civ.ModeUSB:
|
||||
if s.Mode == "SSB" {
|
||||
b.dsp.Mode = "USB"
|
||||
}
|
||||
case civ.ModeLSB:
|
||||
if s.Mode == "SSB" {
|
||||
b.dsp.Mode = "LSB"
|
||||
}
|
||||
}
|
||||
b.dspMu.Unlock()
|
||||
}
|
||||
|
||||
@@ -409,8 +448,13 @@ func (b *IcomSerial) ReadState() (RigState, error) {
|
||||
// all, for the user's Set* commands.
|
||||
if b.pollN%4 == 1 {
|
||||
b.splitOn, b.splitTXFreq = false, 0
|
||||
if on, ok := b.readSplit(); ok && on {
|
||||
if txHz, ok2 := b.readTXFreq(); ok2 && txHz > 0 {
|
||||
on, okSplit := b.readSplit()
|
||||
// The unselected VFO is read split or NOT: on a dual-receiver rig it is
|
||||
// the sub receiver's dial, and the console showed it blank until split
|
||||
// was engaged.
|
||||
if txHz, ok2 := b.readTXFreq(); ok2 && txHz > 0 {
|
||||
b.setCache(func(st *IcomTXState) { st.SubHz = txHz })
|
||||
if okSplit && on {
|
||||
b.splitOn, b.splitTXFreq = true, txHz
|
||||
}
|
||||
}
|
||||
@@ -435,12 +479,16 @@ func (b *IcomSerial) ReadState() (RigState, error) {
|
||||
sm, _ = b.readMeter(civ.SubMeterS)
|
||||
po, swr = 0, 0
|
||||
if tx {
|
||||
now := time.Now()
|
||||
if v, ok := b.readMeter(civ.SubMeterPo); ok {
|
||||
po = v
|
||||
po = b.powerPeak.update(v, now)
|
||||
}
|
||||
if v, ok := b.readMeter(civ.SubMeterSWR); ok {
|
||||
swr = v
|
||||
swr = b.swrPeak.updateSnap(v, now)
|
||||
}
|
||||
} else {
|
||||
// Cleared with the carrier, so the next transmission starts fresh.
|
||||
b.powerPeak, b.swrPeak = meterPeak{}, meterPeak{}
|
||||
}
|
||||
}
|
||||
b.dspMu.Lock()
|
||||
@@ -509,6 +557,13 @@ func (b *IcomSerial) refreshFrontPanel() {
|
||||
b.dsp.Filter = int(f)
|
||||
b.dspMu.Unlock()
|
||||
}
|
||||
case 2:
|
||||
// Tuner in/out — the radio's own TUNER button changes it mid-session.
|
||||
if v, ok := b.readSwitchSub(civ.CmdATU, civ.SubATU); ok {
|
||||
b.dspMu.Lock()
|
||||
b.dsp.ATUOn = v == 1
|
||||
b.dspMu.Unlock()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -559,6 +614,18 @@ func (b *IcomSerial) SetMode(mode string) error {
|
||||
}
|
||||
// Filter 0x01 (FIL1) is the conventional default for the data-mode set.
|
||||
_ = b.execIdempotent("set data mode", civ.CmdExtra, civ.SubDataMode, dataByte, 0x01)
|
||||
// Trust, then verify: the IC-7760 acknowledges 1A 06 and stays in USB-D
|
||||
// anyway, which left an operator unable to get back to plain USB at all.
|
||||
// When the readback disagrees, say it again with 0x26 — mode, data flag and
|
||||
// filter in one frame, the command the newer rigs actually honour. Only on
|
||||
// a mismatch, so rigs that predate 0x26 never see it.
|
||||
if got := b.readDataMode(); got != data {
|
||||
if err := b.execIdempotent("set mode+data (0x26)", civ.CmdModeDataFil, 0x00, code, dataByte, 0x01); err != nil {
|
||||
applog.Printf("icom: data flag stuck at %v after mode %s, and 0x26 failed too: %v", got, mode, err)
|
||||
} else {
|
||||
applog.Printf("icom: data flag stuck after 1A06, corrected via 0x26 (mode %s)", mode)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -1482,6 +1549,12 @@ func (b *IcomSerial) modeCode(mode string) (code byte, data bool, err error) {
|
||||
return civ.ModeFM, false, nil
|
||||
case "RTTY", "FSK":
|
||||
return civ.ModeRTTY, false, nil
|
||||
case "PSK":
|
||||
// The console button, not the ADIF mode: the rigs that HAVE a native PSK
|
||||
// mode (7610/7760/7851 class) get it; a 7300 NAKs 0x12 and the button
|
||||
// stays dead there, exactly as RS-BA1's does. Soundcard PSK31 stays on
|
||||
// USB-D below, where every rig can do it.
|
||||
return civ.ModePSK, false, nil
|
||||
case "FT8", "FT4", "PSK31", "MFSK", "JS8", "JT65", "JT9", "OLIVIA", "DATA", "DIGITALVOICE":
|
||||
// Digital data modes ride on USB with the data flag set (FT8 etc.).
|
||||
return civ.ModeUSB, true, nil
|
||||
@@ -1832,10 +1905,16 @@ func (b *IcomSerial) SetMicGain(p int) error {
|
||||
}
|
||||
|
||||
func (b *IcomSerial) SetIcomSplit(on bool) error {
|
||||
return b.SetIcomSplitOffset(on, 0)
|
||||
}
|
||||
|
||||
// SetIcomSplitOffset enables split with a CHOSEN TX offset in Hz (0 = the
|
||||
// usual convention: +1 kHz on CW, +5 kHz otherwise). The console offers
|
||||
// +1/+5/+10 directly, DXpedition style.
|
||||
func (b *IcomSerial) SetIcomSplitOffset(on bool, offsetHz int64) error {
|
||||
if on {
|
||||
// Enable split with the usual "work him up" TX offset: +1 kHz on CW,
|
||||
// +5 kHz otherwise (SSB). Set the unselected (TX) VFO to RX+offset first,
|
||||
// then turn split on. 0x25 0x01 + BCD sets the unselected VFO's frequency.
|
||||
// Set the unselected (TX) VFO to RX+offset first, then turn split on.
|
||||
// 0x25 0x01 + BCD sets the unselected VFO's frequency.
|
||||
rx := b.curFreq
|
||||
if rx <= 0 {
|
||||
if hz, err := b.readFreq(); err == nil {
|
||||
@@ -1843,12 +1922,39 @@ func (b *IcomSerial) SetIcomSplit(on bool) error {
|
||||
}
|
||||
}
|
||||
if rx > 0 {
|
||||
offset := int64(5000)
|
||||
if b.curModeByte == civ.ModeCW || b.curModeByte == civ.ModeCWR {
|
||||
offset = 1000
|
||||
offset := offsetHz
|
||||
if offset <= 0 {
|
||||
offset = 5000
|
||||
if b.curModeByte == civ.ModeCW || b.curModeByte == civ.ModeCWR {
|
||||
offset = 1000
|
||||
}
|
||||
}
|
||||
_ = b.exec(append([]byte{civ.CmdVfoFreq, civ.SubVfoUnselected}, civ.FreqToBCD(rx+offset)...)...)
|
||||
}
|
||||
// And the MODE crosses with it: a split where the TX VFO is still on
|
||||
// yesterday's mode transmits FM into a CW pileup. 0x26 0x01 sets the
|
||||
// unselected VFO's mode + data flag in one frame; rigs that predate
|
||||
// 0x26 NAK it harmlessly and behave as they always did.
|
||||
if b.curModeByte == 0 {
|
||||
// A fresh session may not have read the mode yet — ask, or the copy
|
||||
// below would send mode 0 (LSB) whatever the main is on.
|
||||
if m, ok := b.readMode(); ok {
|
||||
b.curModeByte = m
|
||||
}
|
||||
}
|
||||
if b.curModeByte != 0 {
|
||||
dataByte := byte(0)
|
||||
if got := b.readDataMode(); got {
|
||||
dataByte = 1
|
||||
}
|
||||
// Logged, not discarded: the first version swallowed the error and a
|
||||
// real 7760's sub VFO kept yesterday's mode with nothing to show why.
|
||||
if err := b.exec(civ.CmdModeDataFil, 0x01, b.curModeByte, dataByte, 0x01); err != nil {
|
||||
applog.Printf("icom: split mode-align (26 01 %02X %d) refused: %v", b.curModeByte, dataByte, err)
|
||||
} else {
|
||||
applog.Printf("icom: split mode-align OK (26 01 %02X %d)", b.curModeByte, dataByte)
|
||||
}
|
||||
}
|
||||
}
|
||||
if err := b.exec(civ.CmdSplit, boolByte(on)); err != nil {
|
||||
return err
|
||||
@@ -1982,6 +2088,17 @@ func (b *IcomSerial) TuneATU() error {
|
||||
return b.exec(civ.CmdATU, civ.SubATU, 0x02)
|
||||
}
|
||||
|
||||
// SetATU engages or DISENGAGES the internal tuner (0x1C 0x01: 1 = in line,
|
||||
// 0 = through). Tune existed without this, which meant a tuner once engaged
|
||||
// could not be taken out of line again from the console.
|
||||
func (b *IcomSerial) SetATU(on bool) error {
|
||||
if err := b.exec(civ.CmdATU, civ.SubATU, boolByte(on)); err != nil {
|
||||
return err
|
||||
}
|
||||
b.setCache(func(s *IcomTXState) { s.ATUOn = on })
|
||||
return nil
|
||||
}
|
||||
|
||||
func (b *IcomSerial) setCache(fn func(*IcomTXState)) {
|
||||
b.dspMu.Lock()
|
||||
fn(&b.dsp)
|
||||
@@ -2024,3 +2141,42 @@ func agcValue(name string) byte {
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
// PlayTXAudio hands a voice-keyer message to the network audio session, when
|
||||
// this rig is reached over one. A USB-connected Icom takes its audio through
|
||||
// its own sound card instead, and says so.
|
||||
func (b *IcomSerial) PlayTXAudio(pcm []byte, rate, ch, bits int, stop <-chan struct{}) error {
|
||||
// port is written once per Connect, on the CAT goroutine this is fetched
|
||||
// from (IcomDo); at worst a reconnect leaves this one connection stale, and
|
||||
// a stale transport fails fast on its closed done channel.
|
||||
port := b.port
|
||||
// A nil port fails the assertions below too — and used to fail them with
|
||||
// the sound-card message, sending an operator whose radio was simply OFF
|
||||
// hunting through their audio devices.
|
||||
if port == nil {
|
||||
return fmt.Errorf("not connected to the radio — check the CAT link")
|
||||
}
|
||||
type txPlayer interface {
|
||||
PlayTXAudio(pcm []byte, rate, ch, bits int, stop <-chan struct{}) error
|
||||
}
|
||||
if p, ok := port.(txPlayer); ok {
|
||||
return p.PlayTXAudio(pcm, rate, ch, bits, stop)
|
||||
}
|
||||
return fmt.Errorf("this rig takes transmit audio through its USB sound card, not the CAT link")
|
||||
}
|
||||
|
||||
// TXAudioSender hands back the network transport's live-mic sender, when this
|
||||
// rig is reached over one.
|
||||
func (b *IcomSerial) TXAudioSender() (func([]byte) error, error) {
|
||||
port := b.port
|
||||
if port == nil {
|
||||
return nil, fmt.Errorf("not connected to the radio — check the CAT link")
|
||||
}
|
||||
type sender interface {
|
||||
TXAudioSender() (func([]byte) error, error)
|
||||
}
|
||||
if p, ok := port.(sender); ok {
|
||||
return p.TXAudioSender()
|
||||
}
|
||||
return nil, fmt.Errorf("this rig takes transmit audio through its USB sound card, not the CAT link")
|
||||
}
|
||||
|
||||
@@ -349,7 +349,7 @@ func (k *Kenwood) readTXMeters() {
|
||||
if v, ok := k.askNum("SW;", "SW", 3); ok {
|
||||
k.panel.SWRRaw = v
|
||||
if v > 0 {
|
||||
k.panel.SWR = float64(k.swrPeak.update(v, now)) / 10
|
||||
k.panel.SWR = float64(k.swrPeak.updateSnap(v, now)) / 10
|
||||
}
|
||||
}
|
||||
if k.metersLogged >= 20 {
|
||||
|
||||
@@ -553,6 +553,13 @@ func (o *OmniRig) SetFrequency(hz int64) error {
|
||||
props := []string{prop, "Freq"}
|
||||
if onSubVFO {
|
||||
props = []string{prop}
|
||||
} else if isYaesu && split&pmSplitOn != 0 && split&pmSplitOff == 0 {
|
||||
// Yaesu with SPLIT engaged: the generic Freq write lands on the TX
|
||||
// VFO — an FT-2000 moved B and left A (the receiver) behind, so a
|
||||
// spot click QSYed the transmitter and nothing audible changed.
|
||||
// Both VFOs are written: the radio arrives on the spot RX and TX
|
||||
// together, split left as the operator had it.
|
||||
props = []string{"FreqA", "FreqB", "Freq"}
|
||||
}
|
||||
for _, p := range props {
|
||||
if _, e := oleutil.PutProperty(o.rig, p, hz32); e != nil {
|
||||
|
||||
@@ -905,3 +905,22 @@ func yaesuSplitCommand(cmd, vfo string, on bool) string {
|
||||
}
|
||||
return cmd + "0;"
|
||||
}
|
||||
|
||||
// updateSnap is update for a meter where lingering is misinformation: the peak
|
||||
// stands for the hold, then the display returns to the live sample AT ONCE.
|
||||
// Made for the K3's SWR — the radio throws a brief SWR spike as an FT8 frame
|
||||
// ends, and the quarter-of-the-gap decay above turned that one bad sample into
|
||||
// twelve seconds of alarming red on the next transmission. A needle's inertia
|
||||
// suits a power meter; an SWR reading is a warning light, and a warning that
|
||||
// fades slowly reads as a fault that is slowly getting better.
|
||||
func (m *meterPeak) updateSnap(sample int, now time.Time) int {
|
||||
if sample >= m.val {
|
||||
m.val, m.at = sample, now
|
||||
return m.val
|
||||
}
|
||||
if now.Sub(m.at) < meterHold {
|
||||
return m.val
|
||||
}
|
||||
m.val, m.at = sample, now
|
||||
return m.val
|
||||
}
|
||||
|
||||
+1
-1
@@ -21,7 +21,7 @@ import (
|
||||
|
||||
const (
|
||||
// appVersion is stamped on every heartbeat (and could feed the About box).
|
||||
appVersion = "0.27.0"
|
||||
appVersion = "0.27.1"
|
||||
|
||||
// posthogHost is the PostHog ingestion endpoint. EU cloud by default; change
|
||||
// to https://us.i.posthog.com for a US project.
|
||||
|
||||
Reference in New Issue
Block a user