Add I16 mode

Author: racerxdl

cmd/lms_tcp.go

@@ -40,6 +40,12 @@ func OnSamples(samples []complex64, _ int, _ uint64) {
 	}
 }
 
+func OnSamples16(samples []int16, _ int, _ uint64) {
+	if server != nil {
+		server.I16Broadcast(samples)
+	}
+}
+
 func main() {
 	flag.Parse()
 	addr := fmt.Sprintf("%s:%d", *listenAddress, *listenPort)
@@ -63,6 +69,10 @@ func main() {
 	dev := limedrv.Open(devices[*deviceIndex])
 	defer dev.Close()
 
+	dev.SetI16CallbackMode(true)
+	dev.SetI16Callback(OnSamples16)
+	dev.SetCallback(OnSamples)
+
 	dev.SetSampleRate(float64(*sampleRate), *oversampling)
 
 	if len(dev.RXChannels) <= *channel {
@@ -82,8 +92,6 @@ func main() {
 		EnableLPF().
 		SetCenterFrequency(106.3e6)
 
-	dev.SetCallback(OnSamples)
-
 	sigs := make(chan os.Signal, 1)
 	done := make(chan bool, 1)
 	signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)

go.mod

@@ -4,7 +4,7 @@ go 1.14
 
 require (
 	github.com/google/uuid v1.2.0
-	github.com/myriadrf/limedrv v0.0.0-20191110180121-2887b3325268
+	github.com/myriadrf/limedrv v0.0.0-20210219013226-63abe3cea27a
 	github.com/quan-to/slog v0.1.1
 	github.com/racerxdl/go.fifo v0.0.0-20190324175329-e4cbb374dbb0
 	github.com/racerxdl/qo100-dedrift v0.0.0-20210123043710-107d0cdc70e1

go.sum

@@ -33,6 +33,8 @@ github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5
 github.com/myriadrf/limedrv v0.0.0-20190225221912-8583a26e3fce/go.mod h1:/SXVBJBHAVLlvLU1B1n0a0QPcZBtqF1VpH5POPZzuBw=
 github.com/myriadrf/limedrv v0.0.0-20191110180121-2887b3325268 h1:eipZKpYRfrubDbzFB0CNksuXMf5eFLOlzK28P89HzSs=
 github.com/myriadrf/limedrv v0.0.0-20191110180121-2887b3325268/go.mod h1:pdymsBM5+Hvv+N9d4mfKKFnkoczunZ+4VtrNwlKSRP0=
+github.com/myriadrf/limedrv v0.0.0-20210219013226-63abe3cea27a h1:UuCXfsb0yZXgZYpcLCFQjotkV9GHN43fY/oh8qv23oM=
+github.com/myriadrf/limedrv v0.0.0-20210219013226-63abe3cea27a/go.mod h1:pdymsBM5+Hvv+N9d4mfKKFnkoczunZ+4VtrNwlKSRP0=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_golang v0.9.2 h1:awm861/B8OKDd2I/6o1dy3ra4BamzKhYOiGItCeZ740=
 github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM=

rtltcp/server.go

@@ -7,7 +7,6 @@ import (
 	"github.com/google/uuid"
 	"github.com/quan-to/slog"
 	"github.com/racerxdl/go.fifo"
-	"github.com/racerxdl/qo100-dedrift/metrics"
 	"net"
 	"runtime"
 	"strings"
@@ -88,10 +87,27 @@ func (server *Server) Stop() {
 	}
 }
 
+func (server *Server) I16Broadcast(data []int16) {
+	if server.bufferFifo.Len()+len(data) > maxFifoLength {
+		// Discard data
+		_ = server.bufferFifo.NextN(len(data))
+	}
+
+	iqBytes := make([]byte, len(data))
+	for i := 0; i < len(data)/2; i++ {
+		rv := data[i*2] >> 8
+		iv := data[i*2+1] >> 8
+		iqBytes[i*2] = uint8(rv)
+		iqBytes[i*2+1] = uint8(iv)
+	}
+
+	server.bufferFifo.Add(iqBytes)
+}
+
 func (server *Server) ComplexBroadcast(data []complex64) {
-	if server.bufferFifo.Len() > maxFifoLength {
-		log.Error("TX Fifo full!")
-		return
+	if server.bufferFifo.Len()+len(data) > maxFifoLength {
+		// Discard data
+		_ = server.bufferFifo.NextN(len(data))
 	}
 
 	iqBytes := make([]byte, len(data)*2)
@@ -134,8 +150,7 @@ func (server *Server) broadcast(data []byte) {
 		payload := data[s:e]
 
 		for _, v := range server.connections {
-			n, _ := v.conn.Write(payload)
-			metrics.BytesOut.Add(float64(n))
+			_, _ = v.conn.Write(payload)
 		}
 	}
 	server.connectionLock.Unlock()
@@ -229,9 +244,6 @@ func (server *Server) handleRequest(conn net.Conn) {
 		server.onConnectCb(session.id, session.conn.RemoteAddr().String())
 	}
 
-	metrics.TotalConnections.Inc()
-	metrics.Connections.Inc()
-
 	for running {
 		_ = conn.SetReadDeadline(time.Now().Add(defaultReadTimeout))
 		n, err := conn.Read(buffer)
@@ -267,7 +279,6 @@ func (server *Server) handleRequest(conn net.Conn) {
 				continue
 			}
 			server.handlePacket(session, cmd)
-			metrics.BytesIn.Add(float64(n))
 		}
 	}
 	server.connectionLock.Lock()
@@ -280,6 +291,5 @@ func (server *Server) handleRequest(conn net.Conn) {
 	server.connectionLock.Unlock()
 	_ = conn.Close()
 
-	metrics.Connections.Dec()
 	clog.Info("Connection closed.")
 }