Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f50bbc005c | ||
|
|
6a6b7ad6c2 | ||
|
|
01a23ccb77 | ||
|
|
9b8168370f | ||
|
|
efa711af78 |
@@ -15262,7 +15262,11 @@ func (a *App) reloadCAT() {
|
|||||||
a.cat.Start(cat.NewIcomNet(s.IcomNetHost, s.IcomNetUser, s.IcomNetPass, s.IcomAddr, s.DigitalDefault, audioSink))
|
a.cat.Start(cat.NewIcomNet(s.IcomNetHost, s.IcomNetUser, s.IcomNetPass, s.IcomAddr, s.DigitalDefault, audioSink))
|
||||||
case "tci":
|
case "tci":
|
||||||
// Expert Electronics TCI (WebSocket) — SunSDR / ExpertSDR2, or any
|
// Expert Electronics TCI (WebSocket) — SunSDR / ExpertSDR2, or any
|
||||||
// TCI-compatible server.
|
// TCI-compatible server. The receive audio rides the same socket, so
|
||||||
|
// the QSO recorder can take it without a virtual cable — see
|
||||||
|
// app_tci_rec.go. Armed after the backend is up, since it is the
|
||||||
|
// backend that carries the stream.
|
||||||
|
defer a.startTCIRecording()
|
||||||
tb := cat.NewTCI(s.TCIHost, s.TCIPort, s.DigitalDefault, s.TCISpots)
|
tb := cat.NewTCI(s.TCIHost, s.TCIPort, s.DigitalDefault, s.TCISpots)
|
||||||
// Clicking one of our spots on the ExpertSDR panorama fills the entry form.
|
// Clicking one of our spots on the ExpertSDR panorama fills the entry form.
|
||||||
tb.OnSpotClick = func(call string, hz int64) {
|
tb.OnSpotClick = func(call string, hz int64) {
|
||||||
|
|||||||
@@ -0,0 +1,53 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
// TCI receive audio — bindings.
|
||||||
|
//
|
||||||
|
// A SunSDR carries its receive audio on the same WebSocket as its commands, so
|
||||||
|
// OpsLog can take it directly instead of asking the operator to install a
|
||||||
|
// virtual audio cable and wire ExpertSDR's output into it. This is the first
|
||||||
|
// half: RECEIVE only, which is what the QSO recorder and the CW decoder need.
|
||||||
|
// Transmit audio (the voice keyer) is the other half and is not here yet — it
|
||||||
|
// has to answer the radio's chrono packets at the right pace, and that is worth
|
||||||
|
// doing once the receive side has proved the format on a real radio.
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"hamlog/internal/applog"
|
||||||
|
"hamlog/internal/cat"
|
||||||
|
)
|
||||||
|
|
||||||
|
// StartTCIAudio opens the receive-audio stream for one receiver.
|
||||||
|
//
|
||||||
|
// rate 0 means 48 kHz, which is what ExpertSDR streams by default and what the
|
||||||
|
// recorder wants anyway.
|
||||||
|
func (a *App) StartTCIAudio(rx, rate int) error {
|
||||||
|
if a.cat == nil {
|
||||||
|
return fmt.Errorf("CAT not initialized")
|
||||||
|
}
|
||||||
|
applog.Printf("tci: opening the receive-audio stream (rx %d, %d Hz)", rx, rate)
|
||||||
|
return a.cat.TCIAudioDo(func(t cat.TCIAudioController) error { return t.StartTCIAudio(rx, rate) })
|
||||||
|
}
|
||||||
|
|
||||||
|
// StopTCIAudio closes it.
|
||||||
|
func (a *App) StopTCIAudio() error {
|
||||||
|
if a.cat == nil {
|
||||||
|
return fmt.Errorf("CAT not initialized")
|
||||||
|
}
|
||||||
|
applog.Printf("tci: closing the receive-audio stream")
|
||||||
|
return a.cat.TCIAudioDo(func(t cat.TCIAudioController) error { return t.StopTCIAudio() })
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetTCIAudioStatus reports what is arriving: the sample rate the radio chose,
|
||||||
|
// how much has come in, and the peak level of the last second.
|
||||||
|
//
|
||||||
|
// The level is the point. "The stream is open" and "audio is arriving" are
|
||||||
|
// different claims, and only the second one is worth anything to someone
|
||||||
|
// testing this on a radio for the first time.
|
||||||
|
func (a *App) GetTCIAudioStatus() cat.TCIAudioStatus {
|
||||||
|
if a.cat == nil {
|
||||||
|
return cat.TCIAudioStatus{}
|
||||||
|
}
|
||||||
|
st, _ := a.cat.TCIAudioState()
|
||||||
|
return st
|
||||||
|
}
|
||||||
+120
@@ -0,0 +1,120 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
// Feeding the QSO recorder from the TCI stream.
|
||||||
|
//
|
||||||
|
// The recorder works in 16 kHz mono, which is what its files and its mixing are
|
||||||
|
// built around; TCI delivers 48 kHz stereo float32. The conversion is the whole
|
||||||
|
// of this file, and it happens here rather than in internal/cat because the
|
||||||
|
// radio's job is to hand over what it sent, not to know what the recorder wants.
|
||||||
|
//
|
||||||
|
// Confirmed on a SunSDR (ExpertSDR3 1.5): 2048 samples a frame, 8192 bytes,
|
||||||
|
// four bytes per sample — and a test recording that plays back clean.
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/binary"
|
||||||
|
|
||||||
|
"hamlog/internal/applog"
|
||||||
|
"hamlog/internal/audio"
|
||||||
|
"hamlog/internal/cat"
|
||||||
|
)
|
||||||
|
|
||||||
|
// tciRecordSink pushes the receive stream into the QSO recorder.
|
||||||
|
//
|
||||||
|
// Installed whenever the TCI backend starts, and harmless when nothing is
|
||||||
|
// recording: PushRX drops what arrives unless a QSO is being captured, so the
|
||||||
|
// cost while idle is a decimation and a function call.
|
||||||
|
func (a *App) tciRecordSink(rate int, samples []float32) {
|
||||||
|
if a.qsoRec == nil || len(samples) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
a.qsoRec.PushRX(tciToRecorderPCM(rate, samples))
|
||||||
|
}
|
||||||
|
|
||||||
|
// tciToRecorderPCM converts the stream's mono float samples to the recorder's
|
||||||
|
// 16-bit PCM at its own rate.
|
||||||
|
//
|
||||||
|
// Averaging rather than picking every third sample: dropping samples aliases
|
||||||
|
// everything above 8 kHz back down into the voice band, and on a receiver that
|
||||||
|
// is hiss — the one thing a QSO recording has plenty of. A three-tap mean is a
|
||||||
|
// crude low-pass, but it is a low-pass, and it costs two additions.
|
||||||
|
func tciToRecorderPCM(rate int, samples []float32) []byte {
|
||||||
|
if rate <= 0 {
|
||||||
|
rate = 48000
|
||||||
|
}
|
||||||
|
step := rate / audio.RecorderSampleRate
|
||||||
|
if step < 1 {
|
||||||
|
step = 1
|
||||||
|
}
|
||||||
|
out := make([]byte, 0, (len(samples)/step)*2)
|
||||||
|
for i := 0; i+step <= len(samples); i += step {
|
||||||
|
var sum float32
|
||||||
|
for j := 0; j < step; j++ {
|
||||||
|
sum += samples[i+j]
|
||||||
|
}
|
||||||
|
v := sum / float32(step)
|
||||||
|
if v > 1 {
|
||||||
|
v = 1
|
||||||
|
}
|
||||||
|
if v < -1 {
|
||||||
|
v = -1
|
||||||
|
}
|
||||||
|
var b [2]byte
|
||||||
|
binary.LittleEndian.PutUint16(b[:], uint16(int16(v*32767)))
|
||||||
|
out = append(out, b[0], b[1])
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
// startTCIRecording opens the receive stream and routes it to the recorder.
|
||||||
|
//
|
||||||
|
// Called when the TCI backend comes up, and only when the operator has asked
|
||||||
|
// for it: opening a 384 kB/s stream on a station that records nothing is work
|
||||||
|
// the radio does for nobody.
|
||||||
|
func (a *App) startTCIRecording() {
|
||||||
|
if a.cat == nil || a.settingOr(keyTCIRecAudio, "") != "1" {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
err := a.cat.TCIAudioDo(func(t cat.TCIAudioController) error {
|
||||||
|
if s, ok := t.(interface {
|
||||||
|
SetTCIAudioSink(func(int, []float32))
|
||||||
|
}); ok {
|
||||||
|
s.SetTCIAudioSink(a.tciRecordSink)
|
||||||
|
}
|
||||||
|
return t.StartTCIAudio(0, 48000)
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
applog.Printf("tci: could not open the receive stream for recording: %v", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
applog.Printf("tci: recording the receive audio over TCI — no virtual cable needed")
|
||||||
|
}
|
||||||
|
|
||||||
|
// keyTCIRecAudio turns it on. Off by default: it replaces whatever sound card
|
||||||
|
// the operator has already wired up, and a setting that changes where a
|
||||||
|
// recording comes from should be asked for rather than assumed.
|
||||||
|
const keyTCIRecAudio = "audio.tci_rx"
|
||||||
|
|
||||||
|
// GetTCIRecordAudio reports whether the recorder takes its audio from the radio.
|
||||||
|
func (a *App) GetTCIRecordAudio() bool { return a.settingOr(keyTCIRecAudio, "") == "1" }
|
||||||
|
|
||||||
|
// SetTCIRecordAudio turns it on or off, and applies it NOW rather than at the
|
||||||
|
// next restart: an option that needs the application relaunched to take effect
|
||||||
|
// reads as an option that does not work.
|
||||||
|
func (a *App) SetTCIRecordAudio(on bool) error {
|
||||||
|
a.setSetting(keyTCIRecAudio, boolStr(on))
|
||||||
|
if on {
|
||||||
|
a.startTCIRecording()
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if a.cat == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return a.cat.TCIAudioDo(func(t cat.TCIAudioController) error {
|
||||||
|
if s, ok := t.(interface {
|
||||||
|
SetTCIAudioSink(func(int, []float32))
|
||||||
|
}); ok {
|
||||||
|
s.SetTCIAudioSink(nil)
|
||||||
|
}
|
||||||
|
return t.StopTCIAudio()
|
||||||
|
})
|
||||||
|
}
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/binary"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"hamlog/internal/audio"
|
||||||
|
)
|
||||||
|
|
||||||
|
// The stream is 48 kHz and the recorder works at 16 — three to one. A
|
||||||
|
// recording that keeps every sample plays back three times too fast, which is
|
||||||
|
// the fault that gets blamed on the decoding rather than on the rate.
|
||||||
|
func TestTheStreamIsResampledToTheRecorderRate(t *testing.T) {
|
||||||
|
const in = 48000
|
||||||
|
samples := make([]float32, in/10) // a tenth of a second
|
||||||
|
pcm := tciToRecorderPCM(in, samples)
|
||||||
|
want := (audio.RecorderSampleRate / 10) * 2 // 16-bit
|
||||||
|
if len(pcm) != want {
|
||||||
|
t.Fatalf("a tenth of a second produced %d bytes, want %d", len(pcm), want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Full scale must arrive as full scale: a conversion that quietly halves the
|
||||||
|
// level turns a recording into evidence of a fault that is not there.
|
||||||
|
func TestFullScaleSurvivesTheConversion(t *testing.T) {
|
||||||
|
samples := make([]float32, 12)
|
||||||
|
for i := range samples {
|
||||||
|
samples[i] = 1
|
||||||
|
}
|
||||||
|
pcm := tciToRecorderPCM(48000, samples)
|
||||||
|
if len(pcm) < 2 {
|
||||||
|
t.Fatal("no samples came out")
|
||||||
|
}
|
||||||
|
v := int16(binary.LittleEndian.Uint16(pcm[:2]))
|
||||||
|
if v < 32000 {
|
||||||
|
t.Fatalf("full scale came out at %d", v)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A rate the recorder already works in is passed through rather than mangled by
|
||||||
|
// a division that would round to nothing.
|
||||||
|
func TestAStreamAtTheRecorderRateIsNotDecimated(t *testing.T) {
|
||||||
|
samples := make([]float32, 160)
|
||||||
|
if got, want := len(tciToRecorderPCM(audio.RecorderSampleRate, samples)), 160*2; got != want {
|
||||||
|
t.Fatalf("%d bytes, want %d", got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,175 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
// Recording a few seconds of the TCI stream to a WAV file.
|
||||||
|
//
|
||||||
|
// Counting frames proves a socket is delivering bytes. It does not prove those
|
||||||
|
// bytes are the receiver's audio, at the right rate, in the right order — a
|
||||||
|
// stream decoded with the channels swapped, the width wrong or the samples
|
||||||
|
// misaligned counts exactly as well as a correct one and sounds like a fan.
|
||||||
|
//
|
||||||
|
// So the test is a file the operator can play. It is the same reason the CW
|
||||||
|
// decoder was validated on the air rather than on a spectrogram.
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/binary"
|
||||||
|
"fmt"
|
||||||
|
"math"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"hamlog/internal/applog"
|
||||||
|
"hamlog/internal/cat"
|
||||||
|
)
|
||||||
|
|
||||||
|
// tciRec collects samples while a test recording is running.
|
||||||
|
type tciRec struct {
|
||||||
|
mu sync.Mutex
|
||||||
|
active bool
|
||||||
|
rate int
|
||||||
|
samples []float32
|
||||||
|
want int // how many samples to collect before stopping
|
||||||
|
}
|
||||||
|
|
||||||
|
var tciRecorder tciRec
|
||||||
|
|
||||||
|
// RecordTCIAudio captures seconds of the TCI receive stream and writes a WAV
|
||||||
|
// next to the QSO recordings. Returns the path.
|
||||||
|
//
|
||||||
|
// The stream has to be open already — this listens to what is arriving rather
|
||||||
|
// than opening anything, so a recording can never leave a stream running that
|
||||||
|
// the operator did not ask for.
|
||||||
|
func (a *App) RecordTCIAudio(seconds int) (string, error) {
|
||||||
|
if a.cat == nil {
|
||||||
|
return "", fmt.Errorf("CAT not initialized")
|
||||||
|
}
|
||||||
|
if seconds <= 0 || seconds > 60 {
|
||||||
|
seconds = 10
|
||||||
|
}
|
||||||
|
|
||||||
|
// Rate from the radio, not assumed: the file's header has to match what was
|
||||||
|
// actually streamed or the recording plays at the wrong speed, which is the
|
||||||
|
// one fault that would be blamed on the decoding.
|
||||||
|
st := a.GetTCIAudioStatus()
|
||||||
|
if !st.Running {
|
||||||
|
return "", fmt.Errorf("open the TCI audio stream first")
|
||||||
|
}
|
||||||
|
rate := st.SampleRate
|
||||||
|
if rate <= 0 {
|
||||||
|
rate = 48000
|
||||||
|
}
|
||||||
|
|
||||||
|
tciRecorder.mu.Lock()
|
||||||
|
if tciRecorder.active {
|
||||||
|
tciRecorder.mu.Unlock()
|
||||||
|
return "", fmt.Errorf("a test recording is already running")
|
||||||
|
}
|
||||||
|
tciRecorder.active = true
|
||||||
|
tciRecorder.rate = rate
|
||||||
|
tciRecorder.want = rate * seconds
|
||||||
|
tciRecorder.samples = make([]float32, 0, tciRecorder.want)
|
||||||
|
tciRecorder.mu.Unlock()
|
||||||
|
|
||||||
|
err := a.cat.TCIAudioDo(func(t cat.TCIAudioController) error {
|
||||||
|
s, ok := t.(interface{ SetTCIAudioSink(func(int, []float32)) })
|
||||||
|
if !ok {
|
||||||
|
return fmt.Errorf("this backend has no audio sink")
|
||||||
|
}
|
||||||
|
s.SetTCIAudioSink(func(_ int, samples []float32) {
|
||||||
|
tciRecorder.mu.Lock()
|
||||||
|
defer tciRecorder.mu.Unlock()
|
||||||
|
if !tciRecorder.active {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
tciRecorder.samples = append(tciRecorder.samples, samples...)
|
||||||
|
})
|
||||||
|
return nil
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
tciRecorder.mu.Lock()
|
||||||
|
tciRecorder.active = false
|
||||||
|
tciRecorder.mu.Unlock()
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Wait for the samples rather than for the clock: a stream that stalls
|
||||||
|
// halfway should produce a short file that says so, not a long one padded
|
||||||
|
// with silence that hides it.
|
||||||
|
deadline := time.Now().Add(time.Duration(seconds+5) * time.Second)
|
||||||
|
for {
|
||||||
|
tciRecorder.mu.Lock()
|
||||||
|
got := len(tciRecorder.samples)
|
||||||
|
want := tciRecorder.want
|
||||||
|
tciRecorder.mu.Unlock()
|
||||||
|
if got >= want || time.Now().After(deadline) {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
time.Sleep(100 * time.Millisecond)
|
||||||
|
}
|
||||||
|
|
||||||
|
tciRecorder.mu.Lock()
|
||||||
|
tciRecorder.active = false
|
||||||
|
pcm := tciRecorder.samples
|
||||||
|
tciRecorder.samples = nil
|
||||||
|
tciRecorder.mu.Unlock()
|
||||||
|
_ = a.cat.TCIAudioDo(func(t cat.TCIAudioController) error {
|
||||||
|
if s, ok := t.(interface{ SetTCIAudioSink(func(int, []float32)) }); ok {
|
||||||
|
s.SetTCIAudioSink(nil)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
})
|
||||||
|
|
||||||
|
if len(pcm) == 0 {
|
||||||
|
return "", fmt.Errorf("nothing arrived on the stream")
|
||||||
|
}
|
||||||
|
path := filepath.Join(a.qsoRecDir(), fmt.Sprintf("tci-test-%s.wav", time.Now().Format("20060102-150405")))
|
||||||
|
if err := writeMonoWAV(path, pcm, rate); err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
applog.Printf("tci: wrote %.1f s of receive audio to %s (%d Hz)", float64(len(pcm))/float64(rate), path, rate)
|
||||||
|
return path, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// writeMonoWAV writes float samples as 16-bit mono PCM.
|
||||||
|
//
|
||||||
|
// Its own writer rather than internal/audio's: that one is nailed to the voice
|
||||||
|
// keyer's rate, and a test recording written at the wrong rate would play back
|
||||||
|
// at the wrong speed — the one fault that looks exactly like a decoding error.
|
||||||
|
func writeMonoWAV(path string, samples []float32, rate int) error {
|
||||||
|
data := make([]byte, len(samples)*2)
|
||||||
|
for i, v := range samples {
|
||||||
|
s := int(math.Round(float64(v) * 32767))
|
||||||
|
if s > 32767 {
|
||||||
|
s = 32767
|
||||||
|
}
|
||||||
|
if s < -32768 {
|
||||||
|
s = -32768
|
||||||
|
}
|
||||||
|
binary.LittleEndian.PutUint16(data[i*2:], uint16(int16(s)))
|
||||||
|
}
|
||||||
|
var hdr [44]byte
|
||||||
|
copy(hdr[0:], "RIFF")
|
||||||
|
binary.LittleEndian.PutUint32(hdr[4:], uint32(36+len(data)))
|
||||||
|
copy(hdr[8:], "WAVEfmt ")
|
||||||
|
binary.LittleEndian.PutUint32(hdr[16:], 16) // PCM chunk size
|
||||||
|
binary.LittleEndian.PutUint16(hdr[20:], 1) // PCM
|
||||||
|
binary.LittleEndian.PutUint16(hdr[22:], 1) // mono
|
||||||
|
binary.LittleEndian.PutUint32(hdr[24:], uint32(rate))
|
||||||
|
binary.LittleEndian.PutUint32(hdr[28:], uint32(rate*2))
|
||||||
|
binary.LittleEndian.PutUint16(hdr[32:], 2) // block align
|
||||||
|
binary.LittleEndian.PutUint16(hdr[34:], 16) // bits
|
||||||
|
copy(hdr[36:], "data")
|
||||||
|
binary.LittleEndian.PutUint32(hdr[40:], uint32(len(data)))
|
||||||
|
|
||||||
|
f, err := os.Create(path)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer f.Close()
|
||||||
|
if _, err := f.Write(hdr[:]); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
_, err = f.Write(data)
|
||||||
|
return err
|
||||||
|
}
|
||||||
@@ -1 +1 @@
|
|||||||
f9b41e192918fa2511f68cd1b361fcd3
|
704fe1bf370b669665df0606fae8a69d
|
||||||
@@ -58,7 +58,7 @@ import {
|
|||||||
GetFolderSync, SaveFolderSync, PickFolderSyncFolder, GetFolderSyncStatus, SyncFolderNow,
|
GetFolderSync, SaveFolderSync, PickFolderSyncFolder, GetFolderSyncStatus, SyncFolderNow,
|
||||||
GetRelayAuto, SaveRelayAuto, GetStationDevices,
|
GetRelayAuto, SaveRelayAuto, GetStationDevices,
|
||||||
GetAwardDefs, GetTrackedAwards, SaveTrackedAwards,
|
GetAwardDefs, GetTrackedAwards, SaveTrackedAwards,
|
||||||
GetBandOpenSettings, SaveBandOpenSettings, GetGridScopeSettings, SaveGridScopeSettings, GetPSKReporterStatus, GetChaseNewGrids, SetChaseNewGrids, GetChaseNew, SetChaseNew, GetGridCacheStatus, GetLinkedAmps, SetLinkedAmps, GetSpotTTLMinutes, SetSpotTTLMinutes, GetSpotMax, SetSpotMax,
|
GetBandOpenSettings, SaveBandOpenSettings, GetGridScopeSettings, SaveGridScopeSettings, GetPSKReporterStatus, GetChaseNewGrids, SetChaseNewGrids, GetChaseNew, SetChaseNew, GetGridCacheStatus, GetLinkedAmps, SetLinkedAmps, GetSpotTTLMinutes, SetSpotTTLMinutes, GetSpotMax, SetSpotMax, StartTCIAudio, StopTCIAudio, GetTCIAudioStatus, RecordTCIAudio, GetTCIRecordAudio, SetTCIRecordAudio,
|
||||||
} from '../../wailsjs/go/main/App';
|
} from '../../wailsjs/go/main/App';
|
||||||
import type { profile as profileModels } from '../../wailsjs/go/models';
|
import type { profile as profileModels } from '../../wailsjs/go/models';
|
||||||
import type { LookupSettingsForm, StationSettingsForm, ListsSettingsForm, ModePresetForm } from '@/types';
|
import type { LookupSettingsForm, StationSettingsForm, ListsSettingsForm, ModePresetForm } from '@/types';
|
||||||
@@ -1943,6 +1943,20 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
const [spotTTL, setSpotTTL] = useState(0);
|
const [spotTTL, setSpotTTL] = useState(0);
|
||||||
const [spotTTLText, setSpotTTLText] = useState('0');
|
const [spotTTLText, setSpotTTLText] = useState('0');
|
||||||
const [spotMaxText, setSpotMaxText] = useState('1000');
|
const [spotMaxText, setSpotMaxText] = useState('1000');
|
||||||
|
// TCI receive-audio test bench. Polled only while the stream is open: a panel
|
||||||
|
// that asks the backend twice a second for a stream nobody started is work
|
||||||
|
// done for nothing.
|
||||||
|
const [tciAudio, setTciAudio] = useState<any>({ running: false, sample_rate: 0, frames: 0, peak_db: -99 });
|
||||||
|
const [tciRecBusy, setTciRecBusy] = useState(false);
|
||||||
|
// Whether the QSO recorder takes its audio from the radio's own stream.
|
||||||
|
const [tciRec, setTciRec] = useState(false);
|
||||||
|
useEffect(() => { GetTCIRecordAudio().then((v: boolean) => setTciRec(!!v)).catch(() => {}); }, []);
|
||||||
|
const [tciRecPath, setTciRecPath] = useState('');
|
||||||
|
useEffect(() => {
|
||||||
|
if (!tciAudio.running) return;
|
||||||
|
const id = window.setInterval(() => { GetTCIAudioStatus().then(setTciAudio).catch(() => {}); }, 500);
|
||||||
|
return () => window.clearInterval(id);
|
||||||
|
}, [tciAudio.running]);
|
||||||
const [gridStat, setGridStat] = useState<any>(null);
|
const [gridStat, setGridStat] = useState<any>(null);
|
||||||
const [pskrStatus, setPskrStatus] = useState<any>(null);
|
const [pskrStatus, setPskrStatus] = useState<any>(null);
|
||||||
const saveBandOpen = async (next: any) => {
|
const saveBandOpen = async (next: any) => {
|
||||||
@@ -6542,6 +6556,62 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
<strong>{t('aud.fromRadioShort')}</strong> {t('aud.explainFrom')}{' '}
|
<strong>{t('aud.fromRadioShort')}</strong> {t('aud.explainFrom')}{' '}
|
||||||
<strong>{t('aud.toRadioShort')}</strong> {t('aud.explainTo')}
|
<strong>{t('aud.toRadioShort')}</strong> {t('aud.explainTo')}
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
|
{/* TCI receive audio — EXPERIMENTAL, and the panel says so.
|
||||||
|
A SunSDR already carries its receive audio on the WebSocket that
|
||||||
|
carries its commands, so none of the devices above need to exist
|
||||||
|
for it: no virtual cable, no second sound card. This is the test
|
||||||
|
bench for that path — it opens the stream and reports what really
|
||||||
|
arrives, because "the stream is open" and "audio is arriving" are
|
||||||
|
different claims and only the second one is worth anything. */}
|
||||||
|
<div className="rounded-md border border-border p-3 space-y-2">
|
||||||
|
<div className="text-xs font-medium">{t('aud.tciTitle')}</div>
|
||||||
|
<div className="flex items-center gap-3 flex-wrap">
|
||||||
|
<Button variant={tciAudio.running ? 'default' : 'outline'} size="sm" className="h-8"
|
||||||
|
onClick={() => {
|
||||||
|
const p = tciAudio.running ? StopTCIAudio() : StartTCIAudio(0, 48000);
|
||||||
|
p.then(() => GetTCIAudioStatus().then(setTciAudio))
|
||||||
|
.catch((e: any) => setTciAudio((s: any) => ({ ...s, last_err: String(e?.message ?? e) })));
|
||||||
|
}}>
|
||||||
|
{tciAudio.running ? t('aud.tciStop') : t('aud.tciStart')}
|
||||||
|
</Button>
|
||||||
|
{tciAudio.running && (
|
||||||
|
<span className="text-[11px] font-mono text-muted-foreground">
|
||||||
|
{tciAudio.sample_rate || 0} Hz · {tciAudio.frames || 0} frames ·{' '}
|
||||||
|
{tciAudio.peak_db > -90 ? tciAudio.peak_db.toFixed(1) + ' dBFS' : t('aud.tciSilent')}
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
{/* The test that actually settles it. Frames arriving proves a
|
||||||
|
socket is delivering bytes; it says nothing about whether those
|
||||||
|
bytes are the receiver's audio, at the right rate, in the right
|
||||||
|
order. A file the operator can PLAY says all three at once. */}
|
||||||
|
{tciAudio.running && (
|
||||||
|
<div className="flex items-center gap-3 flex-wrap">
|
||||||
|
<Button variant="outline" size="sm" className="h-8" disabled={tciRecBusy}
|
||||||
|
onClick={() => {
|
||||||
|
setTciRecBusy(true); setTciRecPath('');
|
||||||
|
RecordTCIAudio(10)
|
||||||
|
.then((p: string) => setTciRecPath(p))
|
||||||
|
.catch((e: any) => setTciAudio((s: any) => ({ ...s, last_err: String(e?.message ?? e) })))
|
||||||
|
.finally(() => setTciRecBusy(false));
|
||||||
|
}}>
|
||||||
|
{tciRecBusy ? t('aud.tciRecBusy') : t('aud.tciRec')}
|
||||||
|
</Button>
|
||||||
|
{!!tciRecPath && <span className="text-[11px] font-mono text-muted-foreground truncate">{tciRecPath}</span>}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
{!!tciAudio.last_err && <p className="text-[11px] text-danger">{tciAudio.last_err}</p>}
|
||||||
|
<label className="flex items-start gap-2 text-xs cursor-pointer">
|
||||||
|
<Checkbox className="mt-0.5" checked={tciRec}
|
||||||
|
onCheckedChange={(c) => { setTciRec(!!c); SetTCIRecordAudio(!!c).catch(() => {}); }} />
|
||||||
|
<span>
|
||||||
|
{t('aud.tciRecord')}
|
||||||
|
<span className="block text-muted-foreground">{t('aud.tciRecordHint')}</span>
|
||||||
|
</span>
|
||||||
|
</label>
|
||||||
|
<p className="text-[11px] text-muted-foreground">{t('aud.tciHint')}</p>
|
||||||
|
</div>
|
||||||
<div className="flex items-center gap-3">
|
<div className="flex items-center gap-3">
|
||||||
<Button
|
<Button
|
||||||
variant={monitorOn ? 'default' : 'outline'}
|
variant={monitorOn ? 'default' : 'outline'}
|
||||||
|
|||||||
@@ -494,7 +494,7 @@ const en: Dict = {
|
|||||||
'aud.noneDefault': '— none / system default —', 'aud.defaultTag': '(default)',
|
'aud.noneDefault': '— none / system default —', 'aud.defaultTag': '(default)',
|
||||||
'aud.fromRadioShort': 'From Radio', 'aud.toRadioShort': 'To Radio', 'aud.explainFrom': '= what you receive (used by the QSO recorder).', 'aud.explainTo': '= where voice-keyer messages are transmitted.',
|
'aud.fromRadioShort': 'From Radio', 'aud.toRadioShort': 'To Radio', 'aud.explainFrom': '= what you receive (used by the QSO recorder).', 'aud.explainTo': '= where voice-keyer messages are transmitted.',
|
||||||
'aud.monitorTitle': "Hear the rig's RX audio (From Radio) through your Listening device", 'aud.listenRadio': '▶ Listen to radio', 'aud.stopListening': '■ Stop listening',
|
'aud.monitorTitle': "Hear the rig's RX audio (From Radio) through your Listening device", 'aud.listenRadio': '▶ Listen to radio', 'aud.stopListening': '■ Stop listening',
|
||||||
'aud.monitorOn': 'RX monitor running — From Radio → Listening device.', 'aud.monitorHint': 'Live-monitor the rig here (USB codec now; network audio later).',
|
'aud.monitorOn': 'RX monitor running — From Radio → Listening device.', 'aud.tciTitle': 'SunSDR receive audio over TCI (experimental)', 'aud.tciStart': 'Open the stream', 'aud.tciStop': 'Close the stream', 'aud.tciRec': 'Record 10 s to listen', 'aud.tciRecBusy': 'Recording…', 'aud.tciSilent': 'silent', 'aud.tciRecord': 'Record QSOs from this stream', 'aud.tciRecordHint': 'The QSO recorder takes the receive audio from the radio instead of a sound card — no virtual cable, nothing to select above. Your microphone is still recorded from the device chosen there.', 'aud.tciHint': 'Takes the receive audio straight from the radio over TCI, with no virtual audio cable and no second sound card. Receive only for now — the voice keyer still uses the devices above. Requires the CAT backend to be TCI.', 'aud.monitorHint': 'Live-monitor the rig here (USB codec now; network audio later).',
|
||||||
'aud.txTitle': 'Key PTT and pipe your live mic into the rig (To Radio device)', 'aud.talkRadio': '🎙 Talk to radio (TX)', 'aud.stopTalk': '■ Stop talking (TX)',
|
'aud.txTitle': 'Key PTT and pipe your live mic into the rig (To Radio device)', 'aud.talkRadio': '🎙 Talk to radio (TX)', 'aud.stopTalk': '■ Stop talking (TX)',
|
||||||
'aud.txOn': 'TRANSMITTING — mic → To Radio, PTT keyed. Click to stop.', 'aud.txHint': 'Live mic → rig with PTT (USB now; network TX later).',
|
'aud.txOn': 'TRANSMITTING — mic → To Radio, PTT keyed. Click to stop.', 'aud.txHint': 'Live mic → rig with PTT (USB now; network TX later).',
|
||||||
'aud.recorder': 'QSO recorder', 'aud.recordEvery': 'Record every QSO to an audio file (From Radio + your mic)', 'aud.recFolder': 'Recordings folder', 'aud.browse': 'Browse…',
|
'aud.recorder': 'QSO recorder', 'aud.recordEvery': 'Record every QSO to an audio file (From Radio + your mic)', 'aud.recFolder': 'Recordings folder', 'aud.browse': 'Browse…',
|
||||||
@@ -962,7 +962,7 @@ const fr: Dict = {
|
|||||||
'aud.noneDefault': '— aucun / défaut système —', 'aud.defaultTag': '(défaut)',
|
'aud.noneDefault': '— aucun / défaut système —', 'aud.defaultTag': '(défaut)',
|
||||||
'aud.fromRadioShort': 'Depuis la radio', 'aud.toRadioShort': 'Vers la radio', 'aud.explainFrom': "= ce que vous recevez (utilisé par l'enregistreur de QSO).", 'aud.explainTo': '= où sont émis les messages du manipulateur vocal.',
|
'aud.fromRadioShort': 'Depuis la radio', 'aud.toRadioShort': 'Vers la radio', 'aud.explainFrom': "= ce que vous recevez (utilisé par l'enregistreur de QSO).", 'aud.explainTo': '= où sont émis les messages du manipulateur vocal.',
|
||||||
'aud.monitorTitle': "Écouter l'audio RX du poste (Depuis la radio) sur votre périphérique d'écoute", 'aud.listenRadio': '▶ Écouter la radio', 'aud.stopListening': "■ Arrêter l'écoute",
|
'aud.monitorTitle': "Écouter l'audio RX du poste (Depuis la radio) sur votre périphérique d'écoute", 'aud.listenRadio': '▶ Écouter la radio', 'aud.stopListening': "■ Arrêter l'écoute",
|
||||||
'aud.monitorOn': "Écoute RX active — Depuis la radio → périphérique d'écoute.", 'aud.monitorHint': "Écoute directe du poste (codec USB pour l'instant ; audio réseau plus tard).",
|
'aud.monitorOn': "Écoute RX active — Depuis la radio → périphérique d'écoute.", 'aud.tciTitle': 'Audio de réception SunSDR par TCI (expérimental)', 'aud.tciStart': 'Ouvrir le flux', 'aud.tciStop': 'Fermer le flux', 'aud.tciRec': 'Enregistrer 10 s pour écoute', 'aud.tciRecBusy': 'Enregistrement…', 'aud.tciSilent': 'silence', 'aud.tciRecord': 'Enregistrer les QSO depuis ce flux', 'aud.tciRecordHint': "L'enregistreur prend l'audio de réception sur la radio au lieu d'une carte son — aucun câble virtuel, rien à choisir au-dessus. Ton micro reste enregistré depuis le périphérique sélectionné là-haut.", 'aud.tciHint': "Prend l'audio de réception directement sur la radio via TCI, sans câble audio virtuel ni seconde carte son. Réception seulement pour l'instant — le manipulateur vocal utilise toujours les périphériques ci-dessus. Nécessite le CAT réglé sur TCI.", 'aud.monitorHint': "Écoute directe du poste (codec USB pour l'instant ; audio réseau plus tard).",
|
||||||
'aud.txTitle': 'Activer le PTT et envoyer votre micro vers le poste (périphérique « Vers la radio »)', 'aud.talkRadio': '🎙 Parler à la radio (TX)', 'aud.stopTalk': '■ Arrêter de parler (TX)',
|
'aud.txTitle': 'Activer le PTT et envoyer votre micro vers le poste (périphérique « Vers la radio »)', 'aud.talkRadio': '🎙 Parler à la radio (TX)', 'aud.stopTalk': '■ Arrêter de parler (TX)',
|
||||||
'aud.txOn': 'ÉMISSION — micro → Vers la radio, PTT activé. Cliquez pour arrêter.', 'aud.txHint': "Micro direct → poste avec PTT (USB pour l'instant ; TX réseau plus tard).",
|
'aud.txOn': 'ÉMISSION — micro → Vers la radio, PTT activé. Cliquez pour arrêter.', 'aud.txHint': "Micro direct → poste avec PTT (USB pour l'instant ; TX réseau plus tard).",
|
||||||
'aud.recorder': 'Enregistreur de QSO', 'aud.recordEvery': 'Enregistrer chaque QSO dans un fichier audio (Depuis la radio + votre micro)', 'aud.recFolder': 'Dossier des enregistrements', 'aud.browse': 'Parcourir…',
|
'aud.recorder': 'Enregistreur de QSO', 'aud.recordEvery': 'Enregistrer chaque QSO dans un fichier audio (Depuis la radio + votre micro)', 'aud.recFolder': 'Dossier des enregistrements', 'aud.browse': 'Parcourir…',
|
||||||
|
|||||||
Vendored
+12
@@ -575,6 +575,10 @@ export function GetStationSettings():Promise<main.StationSettings>;
|
|||||||
|
|
||||||
export function GetStationStatus():Promise<Array<main.StationDeviceStatus>>;
|
export function GetStationStatus():Promise<Array<main.StationDeviceStatus>>;
|
||||||
|
|
||||||
|
export function GetTCIAudioStatus():Promise<cat.TCIAudioStatus>;
|
||||||
|
|
||||||
|
export function GetTCIRecordAudio():Promise<boolean>;
|
||||||
|
|
||||||
export function GetTelemetryEnabled():Promise<boolean>;
|
export function GetTelemetryEnabled():Promise<boolean>;
|
||||||
|
|
||||||
export function GetTrackedAwards():Promise<Array<string>>;
|
export function GetTrackedAwards():Promise<Array<string>>;
|
||||||
@@ -903,6 +907,8 @@ export function RecomputeAllAwardRefs():Promise<number>;
|
|||||||
|
|
||||||
export function RecomputeAwardRefsForCode(arg1:string):Promise<number>;
|
export function RecomputeAwardRefsForCode(arg1:string):Promise<number>;
|
||||||
|
|
||||||
|
export function RecordTCIAudio(arg1:number):Promise<string>;
|
||||||
|
|
||||||
export function RefreshCtyDat():Promise<main.CtyDatInfo>;
|
export function RefreshCtyDat():Promise<main.CtyDatInfo>;
|
||||||
|
|
||||||
export function RefreshKenwood():Promise<void>;
|
export function RefreshKenwood():Promise<void>;
|
||||||
@@ -1155,6 +1161,8 @@ export function SetSpotMax(arg1:number):Promise<void>;
|
|||||||
|
|
||||||
export function SetSpotTTLMinutes(arg1:number):Promise<void>;
|
export function SetSpotTTLMinutes(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function SetTCIRecordAudio(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
export function SetTelemetryEnabled(arg1:boolean):Promise<void>;
|
export function SetTelemetryEnabled(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
export function SetUIPref(arg1:string,arg2:string):Promise<void>;
|
export function SetUIPref(arg1:string,arg2:string):Promise<void>;
|
||||||
@@ -1207,10 +1215,14 @@ export function SetYaesuVOX(arg1:boolean):Promise<void>;
|
|||||||
|
|
||||||
export function StartCWDecoder():Promise<void>;
|
export function StartCWDecoder():Promise<void>;
|
||||||
|
|
||||||
|
export function StartTCIAudio(arg1:number,arg2:number):Promise<void>;
|
||||||
|
|
||||||
export function StationSetRelay(arg1:string,arg2:number,arg3:boolean):Promise<void>;
|
export function StationSetRelay(arg1:string,arg2:number,arg3:boolean):Promise<void>;
|
||||||
|
|
||||||
export function StopCWDecoder():Promise<void>;
|
export function StopCWDecoder():Promise<void>;
|
||||||
|
|
||||||
|
export function StopTCIAudio():Promise<void>;
|
||||||
|
|
||||||
export function SwitchCATRig(arg1:number):Promise<void>;
|
export function SwitchCATRig(arg1:number):Promise<void>;
|
||||||
|
|
||||||
export function SyncFolderNow():Promise<number>;
|
export function SyncFolderNow():Promise<number>;
|
||||||
|
|||||||
@@ -1090,6 +1090,14 @@ export function GetStationStatus() {
|
|||||||
return window['go']['main']['App']['GetStationStatus']();
|
return window['go']['main']['App']['GetStationStatus']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function GetTCIAudioStatus() {
|
||||||
|
return window['go']['main']['App']['GetTCIAudioStatus']();
|
||||||
|
}
|
||||||
|
|
||||||
|
export function GetTCIRecordAudio() {
|
||||||
|
return window['go']['main']['App']['GetTCIRecordAudio']();
|
||||||
|
}
|
||||||
|
|
||||||
export function GetTelemetryEnabled() {
|
export function GetTelemetryEnabled() {
|
||||||
return window['go']['main']['App']['GetTelemetryEnabled']();
|
return window['go']['main']['App']['GetTelemetryEnabled']();
|
||||||
}
|
}
|
||||||
@@ -1746,6 +1754,10 @@ export function RecomputeAwardRefsForCode(arg1) {
|
|||||||
return window['go']['main']['App']['RecomputeAwardRefsForCode'](arg1);
|
return window['go']['main']['App']['RecomputeAwardRefsForCode'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function RecordTCIAudio(arg1) {
|
||||||
|
return window['go']['main']['App']['RecordTCIAudio'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function RefreshCtyDat() {
|
export function RefreshCtyDat() {
|
||||||
return window['go']['main']['App']['RefreshCtyDat']();
|
return window['go']['main']['App']['RefreshCtyDat']();
|
||||||
}
|
}
|
||||||
@@ -2250,6 +2262,10 @@ export function SetSpotTTLMinutes(arg1) {
|
|||||||
return window['go']['main']['App']['SetSpotTTLMinutes'](arg1);
|
return window['go']['main']['App']['SetSpotTTLMinutes'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function SetTCIRecordAudio(arg1) {
|
||||||
|
return window['go']['main']['App']['SetTCIRecordAudio'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function SetTelemetryEnabled(arg1) {
|
export function SetTelemetryEnabled(arg1) {
|
||||||
return window['go']['main']['App']['SetTelemetryEnabled'](arg1);
|
return window['go']['main']['App']['SetTelemetryEnabled'](arg1);
|
||||||
}
|
}
|
||||||
@@ -2354,6 +2370,10 @@ export function StartCWDecoder() {
|
|||||||
return window['go']['main']['App']['StartCWDecoder']();
|
return window['go']['main']['App']['StartCWDecoder']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function StartTCIAudio(arg1, arg2) {
|
||||||
|
return window['go']['main']['App']['StartTCIAudio'](arg1, arg2);
|
||||||
|
}
|
||||||
|
|
||||||
export function StationSetRelay(arg1, arg2, arg3) {
|
export function StationSetRelay(arg1, arg2, arg3) {
|
||||||
return window['go']['main']['App']['StationSetRelay'](arg1, arg2, arg3);
|
return window['go']['main']['App']['StationSetRelay'](arg1, arg2, arg3);
|
||||||
}
|
}
|
||||||
@@ -2362,6 +2382,10 @@ export function StopCWDecoder() {
|
|||||||
return window['go']['main']['App']['StopCWDecoder']();
|
return window['go']['main']['App']['StopCWDecoder']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function StopTCIAudio() {
|
||||||
|
return window['go']['main']['App']['StopTCIAudio']();
|
||||||
|
}
|
||||||
|
|
||||||
export function SwitchCATRig(arg1) {
|
export function SwitchCATRig(arg1) {
|
||||||
return window['go']['main']['App']['SwitchCATRig'](arg1);
|
return window['go']['main']['App']['SwitchCATRig'](arg1);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1208,6 +1208,28 @@ export namespace cat {
|
|||||||
this.fixed = source["fixed"];
|
this.fixed = source["fixed"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
export class TCIAudioStatus {
|
||||||
|
running: boolean;
|
||||||
|
sample_rate: number;
|
||||||
|
frames: number;
|
||||||
|
samples: number;
|
||||||
|
peak_db: number;
|
||||||
|
last_err?: string;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new TCIAudioStatus(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.running = source["running"];
|
||||||
|
this.sample_rate = source["sample_rate"];
|
||||||
|
this.frames = source["frames"];
|
||||||
|
this.samples = source["samples"];
|
||||||
|
this.peak_db = source["peak_db"];
|
||||||
|
this.last_err = source["last_err"];
|
||||||
|
}
|
||||||
|
}
|
||||||
export class YaesuTXState {
|
export class YaesuTXState {
|
||||||
available: boolean;
|
available: boolean;
|
||||||
model?: string;
|
model?: string;
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
package audio
|
||||||
|
|
||||||
|
// RecorderSampleRate is the rate the QSO recorder works in.
|
||||||
|
//
|
||||||
|
// Exported because a source that is NOT a sound card — the TCI receive stream,
|
||||||
|
// the Icom network audio — has to resample into it, and hard-coding 16000 at
|
||||||
|
// each of those call sites is how one of them ends up at the wrong speed after
|
||||||
|
// this constant is ever changed.
|
||||||
|
const RecorderSampleRate = sampleRate
|
||||||
@@ -14,6 +14,7 @@ import (
|
|||||||
// any device regardless of its native mix format.
|
// any device regardless of its native mix format.
|
||||||
const (
|
const (
|
||||||
sampleRate = 16000
|
sampleRate = 16000
|
||||||
|
|
||||||
channels = 1
|
channels = 1
|
||||||
bitsPerSample = 16
|
bitsPerSample = 16
|
||||||
blockAlign = channels * bitsPerSample / 8 // bytes per frame (=2)
|
blockAlign = channels * bitsPerSample / 8 // bytes per frame (=2)
|
||||||
|
|||||||
+24
-1
@@ -34,6 +34,11 @@ type TCI struct {
|
|||||||
OnSpotClick func(callsign string, freqHz int64)
|
OnSpotClick func(callsign string, freqHz int64)
|
||||||
unhandledSeen map[string]bool // log each unknown TCI message type once
|
unhandledSeen map[string]bool // log each unknown TCI message type once
|
||||||
|
|
||||||
|
// audio holds the receive-audio stream — see tci_audio.go. TCI carries it
|
||||||
|
// on this same WebSocket, which is what lets a SunSDR record and decode
|
||||||
|
// without a virtual audio cable in the way.
|
||||||
|
audio tciAudio
|
||||||
|
|
||||||
mu sync.Mutex // guards conn + writes + state
|
mu sync.Mutex // guards conn + writes + state
|
||||||
conn *websocket.Conn
|
conn *websocket.Conn
|
||||||
dialCancel context.CancelFunc // cancels an in-flight Connect dial (Interrupt/Stop)
|
dialCancel context.CancelFunc // cancels an in-flight Connect dial (Interrupt/Stop)
|
||||||
@@ -354,10 +359,18 @@ func (t *TCI) send(cmd string) error {
|
|||||||
// connection closes.
|
// connection closes.
|
||||||
func (t *TCI) reader(conn *websocket.Conn) {
|
func (t *TCI) reader(conn *websocket.Conn) {
|
||||||
for {
|
for {
|
||||||
_, data, err := conn.ReadMessage()
|
mt, data, err := conn.ReadMessage()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
// TEXT frames are commands, BINARY frames are streams. The type used to
|
||||||
|
// be ignored and every frame split on ';' — harmless only for as long as
|
||||||
|
// no stream was ever opened, since audio bytes would then have been fed
|
||||||
|
// to the command parser a hundred times a second.
|
||||||
|
if wsMessageIsBinary(mt) {
|
||||||
|
t.handleBinary(data)
|
||||||
|
continue
|
||||||
|
}
|
||||||
// A frame may carry several ";"-terminated commands.
|
// A frame may carry several ";"-terminated commands.
|
||||||
for _, cmd := range strings.Split(string(data), ";") {
|
for _, cmd := range strings.Split(string(data), ";") {
|
||||||
t.handle(strings.TrimSpace(cmd))
|
t.handle(strings.TrimSpace(cmd))
|
||||||
@@ -393,6 +406,16 @@ func (t *TCI) handle(msg string) {
|
|||||||
switch strings.ToLower(name) {
|
switch strings.ToLower(name) {
|
||||||
case "device":
|
case "device":
|
||||||
t.device = strings.TrimSpace(args)
|
t.device = strings.TrimSpace(args)
|
||||||
|
// The radio ANNOUNCES its audio format at connect —
|
||||||
|
// "audio_stream_sample_type:float32" and "audio_stream_channels:2" — which
|
||||||
|
// is better evidence than anything derived from a frame, and it arrives
|
||||||
|
// before the first frame does. Both were being logged as unhandled.
|
||||||
|
case "audio_stream_sample_type":
|
||||||
|
t.audio.declaredType = strings.TrimSpace(args)
|
||||||
|
case "audio_stream_channels":
|
||||||
|
if n, err := strconv.Atoi(strings.TrimSpace(args)); err == nil && n > 0 && n <= 8 {
|
||||||
|
t.audio.declaredChans = n
|
||||||
|
}
|
||||||
case "ready", "start":
|
case "ready", "start":
|
||||||
t.ready = true
|
t.ready = true
|
||||||
case "stop":
|
case "stop":
|
||||||
|
|||||||
@@ -0,0 +1,335 @@
|
|||||||
|
//go:build windows
|
||||||
|
|
||||||
|
package cat
|
||||||
|
|
||||||
|
// TCI audio — receiving the radio's audio over the same WebSocket that carries
|
||||||
|
// the commands, so a SunSDR needs no virtual audio cable.
|
||||||
|
//
|
||||||
|
// TCI mixes two kinds of frame on one socket: TEXT frames are the commands
|
||||||
|
// ("trx:0,true;"), BINARY frames are streams. A binary frame is a fixed header
|
||||||
|
// followed by float32 samples:
|
||||||
|
//
|
||||||
|
// uint32 receiver which receiver the stream belongs to
|
||||||
|
// uint32 sampleRate Hz
|
||||||
|
// uint32 format 0 = float32
|
||||||
|
// uint32 codec 0 = uncompressed
|
||||||
|
// uint32 crc unused in practice
|
||||||
|
// uint32 length samples in the payload
|
||||||
|
// uint32 type which stream this is (see tciStream*)
|
||||||
|
// uint32 reserved[9]
|
||||||
|
// float32 payload[…] stereo, interleaved
|
||||||
|
//
|
||||||
|
// The stream is asked for with "audio_samplerate:" then "audio_start:<rx>;",
|
||||||
|
// and stopped with "audio_stop:<rx>;".
|
||||||
|
//
|
||||||
|
// NOTHING HERE IS CONFIRMED ON A RADIO YET. The layout above is read from the
|
||||||
|
// TCI documentation, and the stream-type numbers in particular are the sort of
|
||||||
|
// detail a document gets right and a memory of it does not — so every header is
|
||||||
|
// logged for the first few seconds of a session, and the numbers the radio
|
||||||
|
// actually sends will settle it. Same discipline as the Yaesu meters and the
|
||||||
|
// Flex spot feed: measure on the real thing, then write the constant down.
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/binary"
|
||||||
|
"fmt"
|
||||||
|
"math"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/gorilla/websocket"
|
||||||
|
)
|
||||||
|
|
||||||
|
// TCI stream types. RX audio is the one this file consumes; the others are
|
||||||
|
// named so a log line says what arrived rather than "type 3".
|
||||||
|
const (
|
||||||
|
tciStreamIQ = 0
|
||||||
|
tciStreamRXAudio = 1
|
||||||
|
tciStreamTXAudio = 2
|
||||||
|
tciStreamTXChrono = 3
|
||||||
|
)
|
||||||
|
|
||||||
|
// tciHeaderWords is the header length in uint32 words (7 named + 9 reserved).
|
||||||
|
const tciHeaderWords = 16
|
||||||
|
|
||||||
|
// tciHeaderBytes is the same in bytes.
|
||||||
|
const tciHeaderBytes = tciHeaderWords * 4
|
||||||
|
|
||||||
|
// tciAudioProbeMax bounds the header logging. Enough frames to see the shape
|
||||||
|
// and the rate; few enough that an evening of listening does not fill the log.
|
||||||
|
const tciAudioProbeMax = 40
|
||||||
|
|
||||||
|
// TCIAudioStatus is what the panel polls while testing the stream.
|
||||||
|
type TCIAudioStatus struct {
|
||||||
|
Running bool `json:"running"`
|
||||||
|
SampleRate int `json:"sample_rate"`
|
||||||
|
Frames int64 `json:"frames"` // binary frames accepted
|
||||||
|
Samples int64 `json:"samples"` // audio samples decoded
|
||||||
|
// PeakDB is the loudest sample of the last second, in dBFS: the one number
|
||||||
|
// that says "audio is really arriving" rather than "a socket is open".
|
||||||
|
PeakDB float64 `json:"peak_db"`
|
||||||
|
LastErr string `json:"last_err,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// tciAudio is the receive-side state, kept on the backend so it lives exactly
|
||||||
|
// as long as the connection does.
|
||||||
|
type tciAudio struct {
|
||||||
|
mu sync.Mutex
|
||||||
|
want bool // the host asked for audio
|
||||||
|
rx int // which receiver
|
||||||
|
rate int
|
||||||
|
frames int64
|
||||||
|
samples int64
|
||||||
|
peak float64
|
||||||
|
peakAt time.Time
|
||||||
|
probeByType map[int]int
|
||||||
|
lastErr string
|
||||||
|
// widthLogged keeps the one-line note about the sample width to once a
|
||||||
|
// session — it is a fact about the radio, not an event.
|
||||||
|
widthLogged bool
|
||||||
|
// What the radio SAID about its stream at connect (audio_stream_sample_type,
|
||||||
|
// audio_stream_channels). Its own declaration, and it arrives before the
|
||||||
|
// first frame — the frame arithmetic below stays as the check on it rather
|
||||||
|
// than as the only source.
|
||||||
|
declaredType string
|
||||||
|
declaredChans int
|
||||||
|
|
||||||
|
// OnSamples receives decoded MONO samples (the two channels averaged) at
|
||||||
|
// the negotiated rate. Mono because everything downstream — the QSO
|
||||||
|
// recorder, the CW decoder — works on one channel, and a receiver's two
|
||||||
|
// channels carry the same audio.
|
||||||
|
OnSamples func(rate int, samples []float32)
|
||||||
|
}
|
||||||
|
|
||||||
|
// StartTCIAudio asks the radio to stream receiver rx's audio.
|
||||||
|
func (t *TCI) StartTCIAudio(rx, rate int) error {
|
||||||
|
if rate <= 0 {
|
||||||
|
rate = 48000
|
||||||
|
}
|
||||||
|
t.audio.mu.Lock()
|
||||||
|
t.audio.want = true
|
||||||
|
t.audio.rx = rx
|
||||||
|
t.audio.rate = rate
|
||||||
|
t.audio.frames, t.audio.samples, t.audio.peak = 0, 0, 0
|
||||||
|
t.audio.lastErr = ""
|
||||||
|
t.audio.mu.Unlock()
|
||||||
|
|
||||||
|
// Sample rate first: the radio applies it to the stream it is about to
|
||||||
|
// open, and asking afterwards restarts the stream on some firmware.
|
||||||
|
if err := t.send(fmt.Sprintf("audio_samplerate:%d;", rate)); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return t.send(fmt.Sprintf("audio_start:%d;", rx))
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetTCIAudioSink installs (or removes) the consumer of the decoded samples.
|
||||||
|
//
|
||||||
|
// One sink, not a list: today it is a test recording, tomorrow the QSO
|
||||||
|
// recorder, and two consumers of a live stream would need a policy about which
|
||||||
|
// one wins that nothing yet has an opinion about.
|
||||||
|
func (t *TCI) SetTCIAudioSink(fn func(rate int, samples []float32)) {
|
||||||
|
t.audio.mu.Lock()
|
||||||
|
t.audio.OnSamples = fn
|
||||||
|
t.audio.mu.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
// StopTCIAudio closes the stream.
|
||||||
|
func (t *TCI) StopTCIAudio() error {
|
||||||
|
t.audio.mu.Lock()
|
||||||
|
t.audio.want = false
|
||||||
|
rx := t.audio.rx
|
||||||
|
t.audio.mu.Unlock()
|
||||||
|
return t.send(fmt.Sprintf("audio_stop:%d;", rx))
|
||||||
|
}
|
||||||
|
|
||||||
|
// TCIAudioStatus reports what has arrived.
|
||||||
|
func (t *TCI) TCIAudioStatus() TCIAudioStatus {
|
||||||
|
t.audio.mu.Lock()
|
||||||
|
defer t.audio.mu.Unlock()
|
||||||
|
st := TCIAudioStatus{
|
||||||
|
Running: t.audio.want,
|
||||||
|
SampleRate: t.audio.rate,
|
||||||
|
Frames: t.audio.frames,
|
||||||
|
Samples: t.audio.samples,
|
||||||
|
LastErr: t.audio.lastErr,
|
||||||
|
}
|
||||||
|
// A peak older than a second is not a level, it is a memory. Reported as
|
||||||
|
// silence rather than left standing, so a stream that has stopped arriving
|
||||||
|
// looks stopped.
|
||||||
|
if time.Since(t.audio.peakAt) < time.Second && t.audio.peak > 0 {
|
||||||
|
st.PeakDB = 20 * math.Log10(t.audio.peak)
|
||||||
|
} else {
|
||||||
|
st.PeakDB = -99
|
||||||
|
}
|
||||||
|
return st
|
||||||
|
}
|
||||||
|
|
||||||
|
// handleBinary decodes one binary WebSocket frame.
|
||||||
|
//
|
||||||
|
// Called from the reader goroutine. Anything malformed is counted and dropped:
|
||||||
|
// a stream frame is not worth breaking the command connection over, and the
|
||||||
|
// command connection is what keeps the radio usable.
|
||||||
|
func (t *TCI) handleBinary(data []byte) {
|
||||||
|
if len(data) < tciHeaderBytes {
|
||||||
|
t.audioErr(fmt.Sprintf("binary frame of %d bytes is shorter than a header", len(data)))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
le := binary.LittleEndian
|
||||||
|
receiver := int(le.Uint32(data[0:]))
|
||||||
|
rate := int(le.Uint32(data[4:]))
|
||||||
|
format := le.Uint32(data[8:])
|
||||||
|
codec := le.Uint32(data[12:])
|
||||||
|
length := int(le.Uint32(data[20:]))
|
||||||
|
stype := int(le.Uint32(data[24:]))
|
||||||
|
|
||||||
|
// Counted PER STREAM TYPE, not overall.
|
||||||
|
//
|
||||||
|
// A single counter was spent on the first forty receive-audio frames, which
|
||||||
|
// arrive twenty-four times a second — so a transmit-chrono or transmit-audio
|
||||||
|
// frame, the two this needs to see before the voice keyer can be written,
|
||||||
|
// would never have been logged at all. They only appear once the operator
|
||||||
|
// keys the radio, long after any global budget is gone.
|
||||||
|
t.audio.mu.Lock()
|
||||||
|
if t.audio.probeByType == nil {
|
||||||
|
t.audio.probeByType = map[int]int{}
|
||||||
|
}
|
||||||
|
probe := t.audio.probeByType[stype]
|
||||||
|
if probe < tciAudioProbeMax {
|
||||||
|
t.audio.probeByType[stype]++
|
||||||
|
}
|
||||||
|
t.audio.mu.Unlock()
|
||||||
|
if probe < tciAudioProbeMax {
|
||||||
|
debugLog.Printf("TCI: binary frame — rx=%d rate=%d format=%d codec=%d length=%d type=%d payload=%d bytes",
|
||||||
|
receiver, rate, format, codec, length, stype, len(data)-tciHeaderBytes)
|
||||||
|
}
|
||||||
|
|
||||||
|
if stype != tciStreamRXAudio {
|
||||||
|
// IQ, transmit audio, chrono. Nothing consumes them yet — but the chrono
|
||||||
|
// frames are what a voice keyer over TCI would have to answer, and their
|
||||||
|
// size and cadence cannot be guessed from the documentation. They are
|
||||||
|
// logged (per type, see above) and dropped.
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if codec != 0 {
|
||||||
|
t.audioErr(fmt.Sprintf("stream is codec=%d, and nothing here decodes a compressed stream", codec))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// The FORMAT number is decided by measurement, not by the number itself.
|
||||||
|
//
|
||||||
|
// A real SunSDR answered format=3, where the code expected 0 — and 0 was a
|
||||||
|
// guess from reading the documentation, which is exactly the kind of detail
|
||||||
|
// a memory of a document gets wrong. Rather than swap one magic number for
|
||||||
|
// another, the sample width is derived from what arrived: the header says
|
||||||
|
// how many samples the payload holds, so the bytes per sample follow from
|
||||||
|
// dividing. That is true whatever number the format field carries, on this
|
||||||
|
// firmware and the next.
|
||||||
|
payload := data[tciHeaderBytes:]
|
||||||
|
if len(payload) == 0 || length <= 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
width := len(payload) / length
|
||||||
|
var n int
|
||||||
|
switch width {
|
||||||
|
case 4:
|
||||||
|
n = len(payload) / 4 // float32
|
||||||
|
case 2:
|
||||||
|
n = len(payload) / 2 // 16-bit PCM
|
||||||
|
default:
|
||||||
|
t.audioErr(fmt.Sprintf("frame carries %d bytes for %d samples (format=%d) — not a width this reads",
|
||||||
|
len(payload), length, format))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if n == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// Under the lock like the rest of the counters: the reader is the only
|
||||||
|
// writer today, but a fact about the radio that is read from another
|
||||||
|
// goroutine has no business being the one field left unguarded.
|
||||||
|
t.audio.mu.Lock()
|
||||||
|
first := !t.audio.widthLogged
|
||||||
|
t.audio.widthLogged = true
|
||||||
|
t.audio.mu.Unlock()
|
||||||
|
if first {
|
||||||
|
debugLog.Printf("TCI: audio is %d bytes per sample at %d Hz (format field says %d)", width, rate, format)
|
||||||
|
}
|
||||||
|
// Stereo interleaved → mono. Both channels of a receiver carry the same
|
||||||
|
// audio, and everything downstream works on one.
|
||||||
|
// How many channels are interleaved. The radio says so at connect; two is
|
||||||
|
// the fallback, which is what every SunSDR seen so far streams.
|
||||||
|
t.audio.mu.Lock()
|
||||||
|
chans := t.audio.declaredChans
|
||||||
|
t.audio.mu.Unlock()
|
||||||
|
if chans <= 0 {
|
||||||
|
chans = 2
|
||||||
|
}
|
||||||
|
mono := make([]float32, 0, n/chans+1)
|
||||||
|
var peak float64
|
||||||
|
sample := func(i int) float32 {
|
||||||
|
if width == 2 {
|
||||||
|
// 16-bit PCM, scaled to the same -1…1 the rest of the audio path
|
||||||
|
// works in, so a change of format cannot change what a level means.
|
||||||
|
return float32(int16(le.Uint16(payload[i*2:]))) / 32768
|
||||||
|
}
|
||||||
|
return math.Float32frombits(le.Uint32(payload[i*4:]))
|
||||||
|
}
|
||||||
|
for i := 0; i+chans-1 < n; i += chans {
|
||||||
|
var sum float32
|
||||||
|
for c := 0; c < chans; c++ {
|
||||||
|
sum += sample(i + c)
|
||||||
|
}
|
||||||
|
v := sum / float32(chans)
|
||||||
|
if a := math.Abs(float64(v)); a > peak {
|
||||||
|
peak = a
|
||||||
|
}
|
||||||
|
mono = append(mono, v)
|
||||||
|
}
|
||||||
|
|
||||||
|
t.audio.mu.Lock()
|
||||||
|
t.audio.frames++
|
||||||
|
t.audio.samples += int64(len(mono))
|
||||||
|
if rate > 0 {
|
||||||
|
t.audio.rate = rate
|
||||||
|
}
|
||||||
|
if peak > t.audio.peak || time.Since(t.audio.peakAt) > time.Second {
|
||||||
|
t.audio.peak = peak
|
||||||
|
t.audio.peakAt = time.Now()
|
||||||
|
}
|
||||||
|
cb := t.audio.OnSamples
|
||||||
|
t.audio.mu.Unlock()
|
||||||
|
|
||||||
|
if cb != nil {
|
||||||
|
cb(rate, mono)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// audioErr records a decoding complaint, once, so the panel can show it without
|
||||||
|
// the log filling with the same line at fifty frames a second.
|
||||||
|
func (t *TCI) audioErr(msg string) {
|
||||||
|
t.audio.mu.Lock()
|
||||||
|
first := t.audio.lastErr != msg
|
||||||
|
t.audio.lastErr = msg
|
||||||
|
t.audio.mu.Unlock()
|
||||||
|
if first {
|
||||||
|
debugLog.Printf("TCI: audio: %s", msg)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// resumeAudio re-opens the stream after a reconnect, if the host had asked for
|
||||||
|
// it. A dropped WebSocket takes the audio with it, and an operator who switched
|
||||||
|
// recording on does not expect to switch it on again.
|
||||||
|
func (t *TCI) resumeAudio() {
|
||||||
|
t.audio.mu.Lock()
|
||||||
|
want, rx, rate := t.audio.want, t.audio.rx, t.audio.rate
|
||||||
|
t.audio.mu.Unlock()
|
||||||
|
if !want {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if err := t.StartTCIAudio(rx, rate); err != nil {
|
||||||
|
debugLog.Printf("TCI: re-opening the audio stream failed: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// wsMessageIsBinary keeps the type test in one place — the reader used to
|
||||||
|
// ignore the message type entirely and split every frame on ';', which would
|
||||||
|
// have fed audio bytes to the command parser the moment a stream was opened.
|
||||||
|
func wsMessageIsBinary(mt int) bool { return mt == websocket.BinaryMessage }
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
//go:build windows
|
||||||
|
|
||||||
|
package cat
|
||||||
|
|
||||||
|
import "fmt"
|
||||||
|
|
||||||
|
// TCIAudioController is the receive-audio capability of the TCI backend, kept
|
||||||
|
// as an interface for the same reason as the Flex and Yaesu ones: the host asks
|
||||||
|
// the manager, and a station running something else gets a clear "this backend
|
||||||
|
// does not do that" instead of a nil dereference.
|
||||||
|
type TCIAudioController interface {
|
||||||
|
StartTCIAudio(rx, rate int) error
|
||||||
|
StopTCIAudio() error
|
||||||
|
TCIAudioStatus() TCIAudioStatus
|
||||||
|
}
|
||||||
|
|
||||||
|
// TCIAudioState returns the stream's state, or (zero, false) when the active
|
||||||
|
// backend is not a TCI radio.
|
||||||
|
func (m *Manager) TCIAudioState() (TCIAudioStatus, bool) {
|
||||||
|
m.mu.RLock()
|
||||||
|
b := m.backend
|
||||||
|
m.mu.RUnlock()
|
||||||
|
if tc, ok := b.(TCIAudioController); ok {
|
||||||
|
return tc.TCIAudioStatus(), true
|
||||||
|
}
|
||||||
|
return TCIAudioStatus{}, false
|
||||||
|
}
|
||||||
|
|
||||||
|
// TCIAudioDo dispatches an audio command onto the CAT goroutine, like every
|
||||||
|
// other backend-specific control.
|
||||||
|
func (m *Manager) TCIAudioDo(fn func(TCIAudioController) error) error {
|
||||||
|
return m.exec(func(b Backend) error {
|
||||||
|
tc, ok := b.(TCIAudioController)
|
||||||
|
if !ok {
|
||||||
|
return fmt.Errorf("active CAT backend is not a TCI radio")
|
||||||
|
}
|
||||||
|
return fn(tc)
|
||||||
|
})
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user