diff --git a/Readme.md b/Readme.md index 0b5f2e422..edb1d8ed9 100644 --- a/Readme.md +++ b/Readme.md @@ -47,7 +47,7 @@ If you use your own location for gr.osmocom install directory you need to specif `-DGNURADIO_OSMOSDR_LIBRARIES=/opt/install/gr-osmosdr/lib/libgnuradio-osmosdr.so -DGNURADIO_OSMOSDR_INCLUDE_DIRS=/opt/install/gr-osmosdr/include` -

v4l-\*

+

v4l-*

Use `cmake ../ -DV4L-RTL=ON` to build the Linux kernel driver for RTL-SDR (Experimental). Needs a recent kernel and libv4l2. Will need extra work to support SDRPlay. Needs `cp KERNEL_SOURCE/include/linux/compiler.h /usr/include/linux/` and `cp KERNEL_SOURCE/include/uapi/linux/videodev2.h /usr/include/uapi/linux/` and package `libv4l-dev`. @@ -99,7 +99,7 @@ If you use your own location for librtlsdr install directory you need to specify `-DLIBRTLSDR_LIBRARIES=/opt/install/librtlsdr/lib/librtlsdr.so -DLIBRTLSDR_INCLUDE_DIR=/opt/install/librtlsdr/include` -

Plugins for special devices

+

Plugins for special sample sources

File input

@@ -113,7 +113,7 @@ Warning: this is experimental and not fully debugged yet. This is the client side of the SDRdaemon server. See the [SDRdaemon](https://github.com/f4exb/sdrdaemon) project in this Github repository. You must specify the address and UDP port to which the server connects and samples will flow into the SDRangel application (default is `127.0.0.1`port `9090`). It uses the meta data to retrieve the sample flow characteristics such as sample rate and receiveng center frequency. -There is an automated skew rate compensation in place. During rate readjustemnt streaming is suspended for about one second. +There is an automated skew rate compensation in place. During rate readjustemnt streaming can be suspended or signal glitches can occur for about one second. Note that this plugin does not require any of the hardware support libraries nor the libusb library. It is alwasys available in the list of devices as `SDRdaemon[0]` even if no physical device is connected. diff --git a/plugins/samplesource/sdrdaemon/sdrdaemonbuffer.cpp b/plugins/samplesource/sdrdaemon/sdrdaemonbuffer.cpp index 8e999f7d0..a6dffb8e3 100644 --- a/plugins/samplesource/sdrdaemon/sdrdaemonbuffer.cpp +++ b/plugins/samplesource/sdrdaemon/sdrdaemonbuffer.cpp @@ -109,7 +109,7 @@ bool SDRdaemonBuffer::readMeta(char *array, uint32_t length) { m_sampleBytes = metaData->m_sampleBytes & 0x0F; uint32_t frameSize = m_iqSampleSize * metaData->m_nbSamples * metaData->m_nbBlocks; - uint32_t sampleRate = metaData->m_sampleRate; + int sampleRate = metaData->m_sampleRate; if (sampleRate != m_sampleRateStream) { @@ -120,7 +120,9 @@ bool SDRdaemonBuffer::readMeta(char *array, uint32_t length) sampleRate = m_sampleRate; } - sampleRate += (((int) (sampleRate * m_skewRate)) / m_rateDivider) * m_rateDivider; + sampleRate += sampleRate * m_skewRate; + sampleRate = (sampleRate / m_rateDivider) * m_rateDivider; + //sampleRate += (((int) (sampleRate * m_skewRate)) / m_rateDivider) * m_rateDivider; if (metaData->m_sampleBytes & 0x10) { diff --git a/plugins/samplesource/sdrdaemon/sdrdaemongui.ui b/plugins/samplesource/sdrdaemon/sdrdaemongui.ui index c57d99dd5..e15476be9 100644 --- a/plugins/samplesource/sdrdaemon/sdrdaemongui.ui +++ b/plugins/samplesource/sdrdaemon/sdrdaemongui.ui @@ -6,7 +6,7 @@ 0 0 - 343 + 375 207 @@ -120,11 +120,6 @@ 0 - - - 8 - - Nominal sample rate from stream data (kS/s) @@ -214,7 +209,7 @@ false - Record absolute time + Stream timestamp 2015-01-01 00:00:00.000