Change limedrv to i16 and changed fifo overflow to discard

Author: racerxdl

.gitignore

@@ -14,3 +14,4 @@
 # Dependency directories (remove the comment below to include it)
 # vendor/
 .idea
+cmd/lms_tcp

cmd/lms_tcp.go

@@ -16,27 +16,21 @@ import (
 var listenAddress = flag.String("a", "", "listen address")
 var listenPort = flag.Int("p", 1234, "listen port (default: 1234)")
 var gain = flag.Int("g", 0, "gain (default: 0 for auto)")
-var sampleRate = flag.Int("s", 2048000, "samplerate in Hz (default: 2048000 Hz)")
+var sampleRate = flag.Int("s", 2048000, "sample rate in Hz (default: 2048000 Hz)")
 var maxBuffers = flag.Int("b", -1, "number of buffers (kept for compatibility, ignored here)")
 var deviceIndex = flag.Int("d", 0, "device index (default: 0)")
-var oversampling = flag.Int("ov", 8, "oversampling (default: 8)")
+var oversampling = flag.Int("ov", 16, "oversampling (default: 8)")
 var antennaName = flag.String("antenna", "LNAL", "antenna name (default: LNAL)")
 var channel = flag.Int("channel", 0, "channel number (default: 0)")
-var lpf = flag.Int("lpf", 2500000, "low pass filter (default 2500000)")
+var lpf = flag.Int("lpf", 3000000, "low pass filter (default 2500000)")
 
 var server *rtltcp.Server
 
 var tunerValues []int
 
 func init() {
 	for i := 0; i < 32; i++ {
-		tunerValues = append(tunerValues, i*6)
-	}
-}
-
-func OnSamples(samples []complex64, _ int, _ uint64) {
-	if server != nil {
-		server.ComplexBroadcast(samples)
+		tunerValues = append(tunerValues, int(float32(i)*2.5))
 	}
 }
 
@@ -71,7 +65,6 @@ func main() {
 
 	dev.SetI16CallbackMode(true)
 	dev.SetI16Callback(OnSamples16)
-	dev.SetCallback(OnSamples)
 
 	dev.SetSampleRate(float64(*sampleRate), *oversampling)
 

go.mod

@@ -4,8 +4,9 @@ go 1.14
 
 require (
 	github.com/google/uuid v1.2.0
-	github.com/myriadrf/limedrv v0.0.0-20210219013226-63abe3cea27a
+	github.com/myriadrf/limedrv v0.0.0-20210219032128-f4b5cc97de4d
 	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
 )
+

rtltcp/server.go

@@ -88,15 +88,15 @@ func (server *Server) Stop() {
 }
 
 func (server *Server) I16Broadcast(data []int16) {
-	if server.bufferFifo.Len()+len(data) > maxFifoLength {
-		// Discard data
-		_ = server.bufferFifo.NextN(len(data))
+	if server.bufferFifo.Len() > maxFifoLength {
+		// Discard one buffer
+		_ = server.bufferFifo.Next()
 	}
 
 	iqBytes := make([]byte, len(data))
 	for i := 0; i < len(data)/2; i++ {
-		rv := data[i*2] >> 8
-		iv := data[i*2+1] >> 8
+		rv := 128 + (data[i*2] / 127)
+		iv := 128 + (data[i*2+1] / 127)
 		iqBytes[i*2] = uint8(rv)
 		iqBytes[i*2+1] = uint8(iv)
 	}
@@ -105,9 +105,9 @@ func (server *Server) I16Broadcast(data []int16) {
 }
 
 func (server *Server) ComplexBroadcast(data []complex64) {
-	if server.bufferFifo.Len()+len(data) > maxFifoLength {
-		// Discard data
-		_ = server.bufferFifo.NextN(len(data))
+	if server.bufferFifo.Len() > maxFifoLength {
+		// Discard one buffer
+		_ = server.bufferFifo.Next()
 	}
 
 	iqBytes := make([]byte, len(data)*2)