diff --git a/Readme.md b/Readme.md
index e7d4bfac0..0253b0f69 100644
--- a/Readme.md
+++ b/Readme.md
@@ -45,7 +45,7 @@ Since version 3 transmission or signal generation is supported for BladeRF, Hack
- [PlutoSDR output plugin](https://github.com/f4exb/sdrangel/tree/dev/plugins/samplesink/plutosdroutput)
- [XTRX output plugin](https://github.com/f4exb/sdrangel/tree/dev/plugins/samplesink/xtrxoutput) Experimental.
- [File output or file sink plugin](https://github.com/f4exb/sdrangel/tree/dev/plugins/samplesink/filesink)
- - [Remote device via Network with SDRdaemon](https://github.com/f4exb/sdrangel/tree/dev/plugins/samplesink/sdrdaemonsink) Linux only
+ - [Remote device via Network](https://github.com/f4exb/sdrangel/tree/dev/plugins/samplesink/remoteoutput) Linux only
REST API
@@ -55,9 +55,9 @@ Since version 4 a REST API is available to interact with the SDRangel applicatio
Since version 4 the `sdrangelsrv` binary launches a server mode SDRangel instance that runs wihout the GUI. More information is provided in the Readme file of the `sdrsrv` folder.
-Detached RF head server (SDRdaemon)
+Detached RF head server
-Since version 4.1 the previously separated project SDRdaemon has been modified and included in SDRangel. The `sdrangelsrv` headless variant can be used for this purpose using the Daemon source or sink channels.
+Since version 4.1 the previously separated project SDRdaemon has been modified and included in SDRangel. The `sdrangelsrv` headless variant can be used for this purpose using the Remote source or sink channels.
Notes on pulseaudio setup
@@ -300,11 +300,11 @@ Note that this plugin does not require any of the hardware support libraries nor
The [Test source plugin](https://github.com/f4exb/sdrangel/tree/master/plugins/samplesource/testsource) is an internal continuous wave generator that can be used to carry out test of software internals.
-SDRdaemon receiver input
+Remote input
Linux only.
-The [SDRdaemon source input plugin](https://github.com/f4exb/sdrangel/tree/dev/plugins/samplesource/sdrdaemonsource) is the client side of an instance of SDRangel running the Daemon Sink channel plugin. On the "Data" line you must specify the local address and UDP port to which the remote 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 receiving center frequency. The remote is entirely controlled by the REST API. On the "API" line you can specify the address and port at which the remote REST API listens. However it is used just to display basic information about the remote.
+The [Remote input plugin](https://github.com/f4exb/sdrangel/tree/dev/plugins/samplesource/remoteinput) is the client side of an instance of SDRangel running the Remote Sink channel plugin. On the "Data" line you must specify the local address and UDP port to which the remote 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 receiving center frequency. The remote is entirely controlled by the REST API. On the "API" line you can specify the address and port at which the remote REST API listens. However it is used just to display basic information about the remote.
The data blocks transmitted via UDP are protected against loss with a Cauchy MDS block erasure codec. This makes the transmission more robust in particular with WiFi links.
@@ -312,19 +312,19 @@ There is an automated skew rate compensation in place. During rate readjustment
This plugin will be built only if the [CM256cc library](https://github.com/f4exb/cm256cc) is installed in your system.
-Note that this plugin does not require any of the hardware support libraries nor the libusb library. It is always available in the list of devices as `SDRdaemonSource[0]` even if no physical device is connected.
+Note that this plugin does not require any of the hardware support libraries nor the libusb library. It is always available in the list of devices as `RemoteInput` even if no physical device is connected.
-SDRdaemon transmitter output
+Remote output
Linux only.
-The [SDRdaemon sink output plugin](https://github.com/f4exb/sdrangel/tree/dev/plugins/samplesink/sdrdaemonsink) is the client side of and instance of SDRangel running the Daemon Source channel plugin. On the "Data" line you must specify the distant address and UDP port to which the plugin connects and samples from the SDRangel application will flow into the transmitter server (default is `127.0.0.1`port `9090`). The remote is entirely controlled by the REST API. On the "API" line you can specify the address and port at which the remote REST API listens. The API is pinged regularly to retrieve the status of the data blocks queue and allow rate control to stabilize the queue length. Therefore it is important to connect to the API properly (The status line must return "API OK" and the API label should be lit in green).
+The [Remote output plugin](https://github.com/f4exb/sdrangel/tree/dev/plugins/samplesink/remoteoutput) is the client side of and instance of SDRangel running the Remote Source channel plugin. On the "Data" line you must specify the distant address and UDP port to which the plugin connects and samples from the SDRangel application will flow into the transmitter server (default is `127.0.0.1`port `9090`). The remote is entirely controlled by the REST API. On the "API" line you can specify the address and port at which the remote REST API listens. The API is pinged regularly to retrieve the status of the data blocks queue and allow rate control to stabilize the queue length. Therefore it is important to connect to the API properly (The status line must return "API OK" and the API label should be lit in green).
The data blocks sent via UDP are protected against loss with a Cauchy MDS block erasure codec. This makes the transmission more robust in particular with WiFi links.
This plugin will be built only if the [CM256cc library](https://github.com/f4exb/cm256cc) IS installed in your system.
-Note that this plugin does not require any of the hardware support libraries nor the libusb library. It is always available in the list of devices as `SDRdaemonSink[0]` even if no physical device is connected.
+Note that this plugin does not require any of the hardware support libraries nor the libusb library. It is always available in the list of devices as `RemoteOutput` even if no physical device is connected.
Channel plugins with special conditions
diff --git a/ReadmeDeveloper.md b/ReadmeDeveloper.md
index 8c04464fb..356dd52bb 100644
--- a/ReadmeDeveloper.md
+++ b/ReadmeDeveloper.md
@@ -40,8 +40,7 @@ At present the following plugins are available:
- `FCDProPlusXxx` classes in `plugins/samplesource/fcdproplus`: Interface with Funcube Pro+ devices
- `HackRFXxx` classes in `plugins/samplesource/hackrf`: Interface with HackRF devices
- `RTLSDRXxx` classes in `plugins/samplesource/rtlsdr`: Interface with RTL-SDR devices
- - `SDRDaemonXxx` classes in `plugins/samplesource/sdrdaemon`: Special interface collecting I/Q samples from an UDP flow sent by a remote device using [SDRdaemon](https://github.com/f4exb/sdrdaemon).
- - `SDRDaemonFECXxx` classes in `plugins/samplesource/sdrdaemonfec`: Special interface collecting I/Q samples from an UDP flow sent by a remote device using [SDRdaemon](https://github.com/f4exb/sdrdaemon) with FEC protection of blocks.
+ - `RemoteInput` class in `plugins/samplesource/remoteinput`: Special interface collecting I/Q samples from an UDP flow sent by a remote instance of SDRangel using Remote sink channel.
- `FileSource` classes in `plugins/samplesource/filesource`: Special interface reading I/Q samples from a file directly into the baseband skipping the downsampling block
Device sample sink plugins
diff --git a/ReadmeWindowsBuild.md b/ReadmeWindowsBuild.md
index 97c9d92de..e88e80ef4 100644
--- a/ReadmeWindowsBuild.md
+++ b/ReadmeWindowsBuild.md
@@ -8,7 +8,7 @@ You should take note that the Windows scheduler is just a piece of crap and not
There are no plugins for both flavours of Funcubes since it uses Alsa interface which is Linux exclusively. Changing for the Qt audio portable interface instead could be a solution that will be investigated in the future.
-Please be aware that the SDRdaemon plugin is not working well mainly due to the fact that it needs an OS with a decent scheduler and Windows is definitely not this sort of OS (see my previous warning). In fact depending on the case your mileage may vary however the Linux version works always beautifully so you know the options if you really want to use it!
+Please be aware that the Remote input/output plugin is not working well mainly due to the fact that it needs an OS with a decent scheduler and Windows is definitely not this sort of OS (see my previous warning). In fact depending on the case your mileage may vary however the Linux version works always beautifully so you know the options if you really want to use it!
Build environment
diff --git a/app/main.cpp b/app/main.cpp
index b4fbf90ca..4a968b01f 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -35,7 +35,7 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo
*/
QCoreApplication::setOrganizationName("f4exb");
QCoreApplication::setApplicationName("SDRangel");
- QCoreApplication::setApplicationVersion("4.4.2");
+ QCoreApplication::setApplicationVersion("4.4.3");
#if QT_VERSION >= 0x050600
QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support
QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps
diff --git a/appbench/main.cpp b/appbench/main.cpp
index 30559fc8e..d0e920058 100644
--- a/appbench/main.cpp
+++ b/appbench/main.cpp
@@ -57,7 +57,7 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo
QCoreApplication::setOrganizationName("f4exb");
QCoreApplication::setApplicationName("SDRangelBench");
- QCoreApplication::setApplicationVersion("4.4.2");
+ QCoreApplication::setApplicationVersion("4.4.3");
int catchSignals[] = {SIGQUIT, SIGINT, SIGTERM, SIGHUP};
std::vector vsig(catchSignals, catchSignals + sizeof(catchSignals) / sizeof(int));
diff --git a/appsrv/main.cpp b/appsrv/main.cpp
index 9d4c3bd3e..c9071ca0c 100644
--- a/appsrv/main.cpp
+++ b/appsrv/main.cpp
@@ -56,7 +56,7 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo
QCoreApplication::setOrganizationName("f4exb");
QCoreApplication::setApplicationName("SDRangelSrv");
- QCoreApplication::setApplicationVersion("4.4.2");
+ QCoreApplication::setApplicationVersion("4.4.3");
int catchSignals[] = {SIGQUIT, SIGINT, SIGTERM, SIGHUP};
std::vector vsig(catchSignals, catchSignals + sizeof(catchSignals) / sizeof(int));
diff --git a/cm256cc/CMakeLists.txt b/cm256cc/CMakeLists.txt
index 6405b9322..0bce855e8 100644
--- a/cm256cc/CMakeLists.txt
+++ b/cm256cc/CMakeLists.txt
@@ -1,11 +1,11 @@
project(cm256cc)
if (HAS_SSSE3)
- message(STATUS "SDRdaemonFEC: use SSSE3 SIMD" )
+ message(STATUS "RemoteFEC: use SSSE3 SIMD" )
elseif (HAS_NEON)
- message(STATUS "SDRdaemonFEC: use Neon SIMD" )
+ message(STATUS "RemoteFEC: use Neon SIMD" )
else()
- message(STATUS "SDRdaemonFEC: Unsupported architecture")
+ message(STATUS "RemoteFEC: Unsupported architecture")
return()
endif()
diff --git a/debian/changelog b/debian/changelog
index 2ac30286d..680f474c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sdrangel (4.4.3-1) unstable; urgency=medium
+
+ * Migration of SDRDaemon* devices to Remote* devices
+ * PlutoSDR: get LP filter bandwidth from device
+
+ -- Edouard Griffiths, F4EXB Sun, 03 Feb 2019 10:14:18 +0100
+
sdrangel (4.4.2-1) unstable; urgency=medium
* Migration of Daemon* channels to Remote* channels
diff --git a/debian/control b/debian/control
index 2da95a2eb..eebac6bb5 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Architecture: any
Depends: libc6, libasound2, libfftw3-single3, libgcc1, libgl1-mesa-glx, libqt5core5a, libqt5gui5, libqt5multimedia5, libqt5network5, libqt5opengl5, libqt5widgets5, libqt5multimedia5-plugins, libstdc++6, libusb-1.0-0, libopencv-dev, pulseaudio, libxml2, ffmpeg, libavcodec-dev, libavformat-dev, ${shlibs:Depends}, ${misc:Depends}
Description: SDR/Analyzer/Generator front-end for various hardware
SDR/Analyzer/Generator front-end for Airspy, BladeRF, HackRF, RTL-SDR, FunCube, LimeSDR, PlutoSDR.
- Also File source and sink for I/Q samples, network I/Q sources with SDRDaemon.
+ Also File source and sink for I/Q samples, network I/Q sources with remote instance.
Based on Qt5 framework and OpenGL for the spectrum and scope rendering.
Builds on Linux, Windows and Mac O/S
Reception modes supported:
diff --git a/plugins/channelrx/remotesink/remotesinkplugin.cpp b/plugins/channelrx/remotesink/remotesinkplugin.cpp
index 72d7ebf98..d86a0812a 100644
--- a/plugins/channelrx/remotesink/remotesinkplugin.cpp
+++ b/plugins/channelrx/remotesink/remotesinkplugin.cpp
@@ -25,7 +25,7 @@
#include "remotesink.h"
const PluginDescriptor RemoteSinkPlugin::m_pluginDescriptor = {
- QString("Remote channel Sink"),
+ QString("Remote channel sink"),
QString("4.4.2"),
QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"),
diff --git a/plugins/samplesink/remoteoutput/remoteoutputplugin.cpp b/plugins/samplesink/remoteoutput/remoteoutputplugin.cpp
index 994d623fa..3dbb2ca87 100644
--- a/plugins/samplesink/remoteoutput/remoteoutputplugin.cpp
+++ b/plugins/samplesink/remoteoutput/remoteoutputplugin.cpp
@@ -28,7 +28,7 @@
#include "remoteoutputplugin.h"
const PluginDescriptor RemoteOutputPlugin::m_pluginDescriptor = {
- QString("Remote output"),
+ QString("Remote device output"),
QString("4.4.3"),
QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"),
diff --git a/plugins/samplesource/airspyhf/readme.md b/plugins/samplesource/airspyhf/readme.md
index e13c0a255..3b9f12b8b 100644
--- a/plugins/samplesource/airspyhf/readme.md
+++ b/plugins/samplesource/airspyhf/readme.md
@@ -20,7 +20,7 @@ For controls 10 to 13 to be effective you will need a recent version (up to date
1: Common stream parameters
-
+
1.1: Frequency
@@ -81,7 +81,7 @@ The I/Q stream from the AirspyHF to host is downsampled by a power of two before
This button opens a dialog to set the transverter mode frequency translation options:
-
+
Note that if you mouse over the button a tooltip appears that displays the translating frequency and if translation is enabled or disabled. When the frequency translation is enabled the button is lit.
diff --git a/plugins/samplesource/bladerf1input/readme.md b/plugins/samplesource/bladerf1input/readme.md
index eb3bc32d1..b39d92aef 100644
--- a/plugins/samplesource/bladerf1input/readme.md
+++ b/plugins/samplesource/bladerf1input/readme.md
@@ -18,7 +18,7 @@ The BladeRF Host library is also provided by many Linux distributions (check its
1: Common stream parameters
-
+
1.1: Frequency
diff --git a/plugins/samplesource/bladerf2input/readme.md b/plugins/samplesource/bladerf2input/readme.md
index 216d20d65..d424272a2 100644
--- a/plugins/samplesource/bladerf2input/readme.md
+++ b/plugins/samplesource/bladerf2input/readme.md
@@ -18,7 +18,7 @@ The BladeRF Host library is also provided by many Linux distributions (check its
1: Common stream parameters
-
+
1.1: Frequency
diff --git a/plugins/samplesource/fcdpro/readme.md b/plugins/samplesource/fcdpro/readme.md
index ce5265148..f423b4fb6 100644
--- a/plugins/samplesource/fcdpro/readme.md
+++ b/plugins/samplesource/fcdpro/readme.md
@@ -10,7 +10,7 @@ This input sample source plugin gets its samples from a [FunCube Dongle (FCD) Pr
1: Common stream parameters
-
+
1.1: Frequency
@@ -62,7 +62,7 @@ The I/Q stream from the FCD Pro ADC is downsampled by a power of two before bein
This button opens a dialog to set the transverter mode frequency translation options:
-
+
Note that if you mouse over the button a tooltip appears that displays the translating frequency and if translation is enabled or disabled. When the frequency translation is enabled the button is lit.
diff --git a/plugins/samplesource/fcdproplus/readme.md b/plugins/samplesource/fcdproplus/readme.md
index 0908f74d6..dd27ac9fb 100644
--- a/plugins/samplesource/fcdproplus/readme.md
+++ b/plugins/samplesource/fcdproplus/readme.md
@@ -10,7 +10,7 @@ This input sample source plugin gets its samples from a [FunCube Dongle (FCD) Pr
1: Common stream parameters
-
+
1.1: Frequency
@@ -62,7 +62,7 @@ The I/Q stream from the FCD Pro+ ADC is downsampled by a power of two before bei
This button opens a dialog to set the transverter mode frequency translation options:
-
+
Note that if you mouse over the button a tooltip appears that displays the translating frequency and if translation is enabled or disabled. When the frequency translation is enabled the button is lit.
diff --git a/plugins/samplesource/hackrfinput/readme.md b/plugins/samplesource/hackrfinput/readme.md
index 48ca75ced..cfff23462 100644
--- a/plugins/samplesource/hackrfinput/readme.md
+++ b/plugins/samplesource/hackrfinput/readme.md
@@ -16,7 +16,7 @@ The HackRF Host library is also provided by many Linux distributions and is buil
1: Common stream parameters
-
+
1.1: Frequency
diff --git a/plugins/samplesource/limesdrinput/readme.md b/plugins/samplesource/limesdrinput/readme.md
index 97dd714c8..80d8d8e6d 100644
--- a/plugins/samplesource/limesdrinput/readme.md
+++ b/plugins/samplesource/limesdrinput/readme.md
@@ -37,7 +37,7 @@ Then add the following defines on `cmake` command line:
1: Common stream parameters
-
+
1.1: Frequency
@@ -71,7 +71,7 @@ LimeSDR is a 2x2 MIMO device so it has two receiving channels. This shows the co
2: NCO, DC/IQ correction and external clock controls
-
+
2.1: NCO toggle
@@ -97,7 +97,7 @@ Enables or disables the auto I/Q balance correction. The DC correction must be e
This button opens a dialog to set the transverter mode frequency translation options:
-
+
Note that if you mouse over the button a tooltip appears that displays the translating frequency and if translation is enabled or disabled. When the frequency translation is enabled the button is lit.
diff --git a/plugins/samplesource/perseus/readme.md b/plugins/samplesource/perseus/readme.md
index 9ce665fd1..935a424b8 100644
--- a/plugins/samplesource/perseus/readme.md
+++ b/plugins/samplesource/perseus/readme.md
@@ -27,7 +27,7 @@ It has a limited number of controls compared to other source interfaces. This is
1: Common stream parameters
-
+
1.1: Frequency
@@ -73,7 +73,7 @@ The I/Q stream from the Perseus to host is downsampled by a power of two before
This button opens a dialog to set the transverter mode frequency translation options:
-
+
Note that if you mouse over the button a tooltip appears that displays the translating frequency and if translation is enabled or disabled. When the frequency translation is enabled the button is lit.
diff --git a/plugins/samplesource/plutosdrinput/readme.md b/plugins/samplesource/plutosdrinput/readme.md
index e63dc071f..ffb6ede8f 100644
--- a/plugins/samplesource/plutosdrinput/readme.md
+++ b/plugins/samplesource/plutosdrinput/readme.md
@@ -76,7 +76,7 @@ These buttons control the software DSP auto correction options:
This button opens a dialog to set the transverter mode frequency translation options:
-
+
Note that if you mouse over the button a tooltip appears that displays the translating frequency and if translation is enabled or disabled. When the frequency translation is enabled the button is lit.
diff --git a/plugins/samplesource/remoteinput/remoteinputplugin.cpp b/plugins/samplesource/remoteinput/remoteinputplugin.cpp
index 484ed2805..4279fb802 100644
--- a/plugins/samplesource/remoteinput/remoteinputplugin.cpp
+++ b/plugins/samplesource/remoteinput/remoteinputplugin.cpp
@@ -28,7 +28,7 @@
#include "remoteinputplugin.h"
const PluginDescriptor RemoteInputPlugin::m_pluginDescriptor = {
- QString("Remote input"),
+ QString("Remote device input"),
QString("4.4.3"),
QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"),
diff --git a/plugins/samplesource/rtlsdr/readme.md b/plugins/samplesource/rtlsdr/readme.md
index a7a7fd5c1..a09ba806f 100644
--- a/plugins/samplesource/rtlsdr/readme.md
+++ b/plugins/samplesource/rtlsdr/readme.md
@@ -16,7 +16,7 @@ If you want to benefit from the direct sampling you will have to compile and ins
1: Common stream parameters
-
+
1.1: Frequency
@@ -64,7 +64,7 @@ With SR as the sample rate before decimation Fc is calculated as:
This button opens a dialog to set the transverter mode frequency translation options:
-
+
Note that if you mouse over the button a tooltip appears that displays the translating frequency and if translation is enabled or disabled. When the frequency translation is enabled the button is lit.
diff --git a/plugins/samplesource/soapysdrinput/readme.md b/plugins/samplesource/soapysdrinput/readme.md
index e84fd2678..885edd16e 100644
--- a/plugins/samplesource/soapysdrinput/readme.md
+++ b/plugins/samplesource/soapysdrinput/readme.md
@@ -71,7 +71,7 @@ The top part described by number tags is common for all devices. The bottom part
1: Common stream parameters
-
+
1.1: Frequency
diff --git a/plugins/samplesource/testsource/readme.md b/plugins/samplesource/testsource/readme.md
index 6b198eaa1..979a42991 100644
--- a/plugins/samplesource/testsource/readme.md
+++ b/plugins/samplesource/testsource/readme.md
@@ -14,7 +14,7 @@ The plugin is present in the core of the software and thus is always present in
1: Common stream parameters
-
+
1.1: Frequency
diff --git a/plugins/samplesource/xtrxinput/readme.md b/plugins/samplesource/xtrxinput/readme.md
index 76b8acdcf..aeae2a42e 100644
--- a/plugins/samplesource/xtrxinput/readme.md
+++ b/plugins/samplesource/xtrxinput/readme.md
@@ -48,7 +48,7 @@ For a group the syntax is the same but the group name is prefixed with `@` like:
1: Common stream parameters
-
+
1.1: Frequency
@@ -82,7 +82,7 @@ LimeSDR is a 2x2 MIMO device so it has two receiving channels. This shows the co
2: NCO, DC/IQ correction and external clock controls
-
+
2.1: NCO toggle
diff --git a/pluginssrv/samplesink/remoteoutput/CMakeLists.txt b/pluginssrv/samplesink/remoteoutput/CMakeLists.txt
index 13514e72c..6db3e06cf 100644
--- a/pluginssrv/samplesink/remoteoutput/CMakeLists.txt
+++ b/pluginssrv/samplesink/remoteoutput/CMakeLists.txt
@@ -4,11 +4,11 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
set(PLUGIN_PREFIX "../../../plugins/samplesink/remoteoutput")
if (HAS_SSSE3)
- message(STATUS "SDRdaemonFEC: use SSSE3 SIMD" )
+ message(STATUS "RemoteOutput: use SSSE3 SIMD" )
elseif (HAS_NEON)
- message(STATUS "SDRdaemonFEC: use Neon SIMD" )
+ message(STATUS "RemoteOutput: use Neon SIMD" )
else()
- message(STATUS "SDRdaemonFEC: Unsupported architecture")
+ message(STATUS "RemoteOutput: Unsupported architecture")
return()
endif()
diff --git a/sdrangel.android.pro b/sdrangel.android.pro
index 82aca4776..502389bd4 100644
--- a/sdrangel.android.pro
+++ b/sdrangel.android.pro
@@ -11,7 +11,7 @@ SUBDIRS += sdrgui
#SUBDIRS += libhackrf
#SUBDIRS += libairspy
SUBDIRS += plugins/samplesource/filesource
-SUBDIRS += plugins/samplesource/sdrdaemon
+SUBDIRS += plugins/samplesource/remoteinput
#SUBDIRS += plugins/samplesource/rtlsdr
#SUBDIRS += plugins/samplesource/hackrf
#SUBDIRS += plugins/samplesource/airspy
diff --git a/sdrangel.macos.pro b/sdrangel.macos.pro
index ffe11b4b7..83ffcc725 100644
--- a/sdrangel.macos.pro
+++ b/sdrangel.macos.pro
@@ -43,7 +43,7 @@ SUBDIRS += plugins/samplesource/limesdrinput
SUBDIRS += plugins/samplesource/perseus
SUBDIRS += plugins/samplesource/plutosdrinput
SUBDIRS += plugins/samplesource/rtlsdr
-SUBDIRS += plugins/samplesource/sdrdaemonsource
+SUBDIRS += plugins/samplesource/remoteinput
SUBDIRS += plugins/samplesource/sdrplay
SUBDIRS += plugins/samplesource/soapysdrinput
SUBDIRS += plugins/samplesource/testsource
@@ -54,11 +54,11 @@ SUBDIRS += plugins/samplesink/filesink
SUBDIRS += plugins/samplesink/hackrfoutput
SUBDIRS += plugins/samplesink/limesdroutput
SUBDIRS += plugins/samplesink/plutosdroutput
-SUBDIRS += plugins/samplesink/sdrdaemonsink
+SUBDIRS += plugins/samplesink/remoteoutput
SUBDIRS += plugins/samplesink/soapysdroutput
SUBDIRS += plugins/channelrx/chanalyzer
-SUBDIRS += plugins/channelrx/daemonsink
+SUBDIRS += plugins/channelrx/remotesink
SUBDIRS += plugins/channelrx/demodam
#SUBDIRS += plugins/channelrx/demodatv
SUBDIRS += plugins/channelrx/demodbfm
@@ -70,7 +70,7 @@ SUBDIRS += plugins/channelrx/demodssb
SUBDIRS += plugins/channelrx/demodwfm
SUBDIRS += plugins/channelrx/udpsink
-SUBDIRS += plugins/channeltx/daemonsource
+SUBDIRS += plugins/channeltx/remotesource
SUBDIRS += plugins/channeltx/modam
SUBDIRS += plugins/channeltx/modatv
SUBDIRS += plugins/channeltx/modnfm
diff --git a/sdrangel.windows.pro b/sdrangel.windows.pro
index a85891506..1c941d474 100644
--- a/sdrangel.windows.pro
+++ b/sdrangel.windows.pro
@@ -37,7 +37,7 @@ SUBDIRS += plugins/samplesource/filesource
SUBDIRS += plugins/samplesource/hackrfinput
SUBDIRS += plugins/samplesource/limesdrinput
CONFIG(!MSVC):SUBDIRS += plugins/samplesource/plutosdrinput
-CONFIG(MSVC):SUBDIRS += plugins/samplesource/sdrdaemonsource
+CONFIG(MSVC):SUBDIRS += plugins/samplesource/remoteinput
SUBDIRS += plugins/samplesource/rtlsdr
CONFIG(MSVC):SUBDIRS += plugins/samplesource/soapysdrinput
SUBDIRS += plugins/samplesource/testsource
@@ -47,7 +47,7 @@ CONFIG(!MSVC):SUBDIRS += plugins/samplesink/bladerf2output
SUBDIRS += plugins/samplesink/hackrfoutput
SUBDIRS += plugins/samplesink/limesdroutput
CONFIG(!MSVC):SUBDIRS += plugins/samplesink/plutosdroutput
-CONFIG(MSVC):SUBDIRS += plugins/samplesink/sdrdaemonsink
+CONFIG(MSVC):SUBDIRS += plugins/samplesink/remoteoutput
CONFIG(MSVC):SUBDIRS += plugins/samplesink/soapysdroutput
SUBDIRS += plugins/channelrx/chanalyzer
SUBDIRS += plugins/channelrx/demodam
diff --git a/sdrbase/channel/remotedatablock.h b/sdrbase/channel/remotedatablock.h
index df8aa76fb..739168dc9 100644
--- a/sdrbase/channel/remotedatablock.h
+++ b/sdrbase/channel/remotedatablock.h
@@ -21,8 +21,8 @@
// along with this program. If not, see . //
///////////////////////////////////////////////////////////////////////////////////
-#ifndef SDRDAEMON_CHANNEL_SDRDAEMONDATABLOCK_H_
-#define SDRDAEMON_CHANNEL_SDRDAEMONDATABLOCK_H_
+#ifndef CHANNEL_REMOTEDATABLOCK_H_
+#define CHANNEL_REMOTEDATABLOCK_H_
#include
#include
@@ -171,4 +171,4 @@ public:
RemoteSuperBlock *m_superBlocks;
};
-#endif /* SDRDAEMON_CHANNEL_SDRDAEMONDATABLOCK_H_ */
+#endif /* CHANNEL_REMOTEDATABLOCK_H_ */
diff --git a/sdrbase/channel/remotedataqueue.cpp b/sdrbase/channel/remotedataqueue.cpp
index 9158cee3c..e298b33ea 100644
--- a/sdrbase/channel/remotedataqueue.cpp
+++ b/sdrbase/channel/remotedataqueue.cpp
@@ -39,7 +39,7 @@ RemoteDataQueue::~RemoteDataQueue()
while ((data = pop()) != 0)
{
- qDebug() << "SDRDaemonDataQueue::~SDRDaemonDataQueue: data block was still in queue";
+ qDebug() << "RemoteDataQueue::~RemoteDataQueue: data block was still in queue";
delete data;
}
}
diff --git a/sdrbase/channel/remotedatareadqueue.cpp b/sdrbase/channel/remotedatareadqueue.cpp
index e2610a305..4d7f27a76 100644
--- a/sdrbase/channel/remotedatareadqueue.cpp
+++ b/sdrbase/channel/remotedatareadqueue.cpp
@@ -41,7 +41,7 @@ RemoteDataReadQueue::~RemoteDataReadQueue()
while ((data = pop()) != 0)
{
- qDebug("SDRDaemonDataReadQueue::~SDRDaemonDataReadQueue: data block was still in queue");
+ qDebug("RemoteDataReadQueue::~RemoteDataReadQueue: data block was still in queue");
delete data;
}
}
@@ -50,7 +50,7 @@ void RemoteDataReadQueue::push(RemoteDataBlock* dataBlock)
{
if (length() >= m_maxSize)
{
- qWarning("SDRDaemonDataReadQueue::push: queue is full");
+ qWarning("RemoteDataReadQueue::push: queue is full");
m_full = true; // stop filling the queue
RemoteDataBlock *data = m_dataReadQueue.takeLast();
delete data;
@@ -94,7 +94,7 @@ void RemoteDataReadQueue::readSample(Sample& s, bool scaleForTx)
{
if (length() >= m_maxSize/2)
{
- qDebug("SDRDaemonDataReadQueue::readSample: initial pop new block: queue size: %u", length());
+ qDebug("RemoteDataReadQueue::readSample: initial pop new block: queue size: %u", length());
m_blockIndex = 1;
m_dataBlock = m_dataReadQueue.takeFirst();
convertDataToSample(s, m_blockIndex, m_sampleIndex, scaleForTx);
@@ -135,12 +135,12 @@ void RemoteDataReadQueue::readSample(Sample& s, bool scaleForTx)
m_dataBlock = 0;
if (length() == 0) {
- qWarning("SDRDaemonDataReadQueue::readSample: try to pop new block but queue is empty");
+ qWarning("RemoteDataReadQueue::readSample: try to pop new block but queue is empty");
}
if (length() > 0)
{
- //qDebug("SDRDaemonDataReadQueue::readSample: pop new block: queue size: %u", length());
+ //qDebug("RemoteDataReadQueue::readSample: pop new block: queue size: %u", length());
m_blockIndex = 1;
m_dataBlock = m_dataReadQueue.takeFirst();
convertDataToSample(s, m_blockIndex, m_sampleIndex, scaleForTx);
diff --git a/sdrbase/plugin/pluginmanager.cpp b/sdrbase/plugin/pluginmanager.cpp
index ce6d09e28..1585af7c1 100644
--- a/sdrbase/plugin/pluginmanager.cpp
+++ b/sdrbase/plugin/pluginmanager.cpp
@@ -32,13 +32,13 @@
#include "plugin/pluginmanager.h"
-const QString PluginManager::m_sdrDaemonSourceHardwareID = "SDRdaemonSource";
-const QString PluginManager::m_sdrDaemonSourceDeviceTypeID = "sdrangel.samplesource.sdrdaemonsource";
+const QString PluginManager::m_remoteInputHardwareID = "RemoteInput";
+const QString PluginManager::m_remoteInputDeviceTypeID = "sdrangel.samplesource.remoteinput";
const QString PluginManager::m_fileSourceHardwareID = "FileSource";
const QString PluginManager::m_fileSourceDeviceTypeID = "sdrangel.samplesource.filesource";
-const QString PluginManager::m_sdrDaemonSinkHardwareID = "SDRdaemonSink";
-const QString PluginManager::m_sdrDaemonSinkDeviceTypeID = "sdrangel.samplesink.sdrdaemonsink";
+const QString PluginManager::m_remoteOutputHardwareID = "RemoteOutput";
+const QString PluginManager::m_remoteOutputDeviceTypeID = "sdrangel.samplesink.remoteoutput";
const QString PluginManager::m_fileSinkHardwareID = "FileSink";
const QString PluginManager::m_fileSinkDeviceTypeID = "sdrangel.samplesink.filesink";
diff --git a/sdrbase/plugin/pluginmanager.h b/sdrbase/plugin/pluginmanager.h
index e313563d9..da5d58d10 100644
--- a/sdrbase/plugin/pluginmanager.h
+++ b/sdrbase/plugin/pluginmanager.h
@@ -103,16 +103,16 @@ private:
PluginAPI::SamplingDeviceRegistrations m_sampleSinkRegistrations; //!< Output sink plugins (one per device kind) register here
// "Local" sample source device IDs
- static const QString m_sdrDaemonSourceHardwareID; //!< SDRdaemon source hardware ID
- static const QString m_sdrDaemonSourceDeviceTypeID; //!< SDRdaemon source plugin ID
- static const QString m_fileSourceHardwareID; //!< FileSource source hardware ID
- static const QString m_fileSourceDeviceTypeID; //!< FileSource source plugin ID
+ static const QString m_remoteInputHardwareID; //!< Remote input hardware ID
+ static const QString m_remoteInputDeviceTypeID; //!< Remote input plugin ID
+ static const QString m_fileSourceHardwareID; //!< FileSource source hardware ID
+ static const QString m_fileSourceDeviceTypeID; //!< FileSource source plugin ID
// "Local" sample sink device IDs
- static const QString m_sdrDaemonSinkHardwareID; //!< SDRdaemon source hardware ID
- static const QString m_sdrDaemonSinkDeviceTypeID; //!< SDRdaemon source plugin ID
- static const QString m_fileSinkHardwareID; //!< FileSource source hardware ID
- static const QString m_fileSinkDeviceTypeID; //!< FileSink sink plugin ID
+ static const QString m_remoteOutputHardwareID; //!< Remote output hardware ID
+ static const QString m_remoteOutputDeviceTypeID; //!< Remote output plugin ID
+ static const QString m_fileSinkHardwareID; //!< FileSource source hardware ID
+ static const QString m_fileSinkDeviceTypeID; //!< FileSink sink plugin ID
void loadPluginsDir(const QDir& dir);
};
diff --git a/sdrbase/sdrbase.pro b/sdrbase/sdrbase.pro
index 28c433bfc..2ac290486 100644
--- a/sdrbase/sdrbase.pro
+++ b/sdrbase/sdrbase.pro
@@ -61,8 +61,8 @@ SOURCES += audio/audiodevicemanager.cpp\
audio/audionetsink.cpp\
channel/channelsinkapi.cpp\
channel/channelsourceapi.cpp\
- channel/sdrdaemondataqueue.cpp\
- channel/sdrdaemondatareadqueue.cpp\
+ channel/remotedataqueue.cpp\
+ channel/remotedatareadqueue.cpp\
commands/command.cpp\
device/devicesourceapi.cpp\
device/devicesinkapi.cpp\
@@ -139,9 +139,9 @@ HEADERS += audio/audiodevicemanager.h\
audio/audionetsink.h\
channel/channelsinkapi.h\
channel/channelsourceapi.h\
- channel/sdrdaemondataqueue.h\
- channel/sdrdaemondatareadqueue.h\
- channel/sdrdaemondatablock.h\
+ channel/remotedataqueue.h\
+ channel/remotedatareadqueue.h\
+ channel/remotedatablock.h\
commands/command.h\
device/devicesourceapi.h\
device/devicesinkapi.h\
diff --git a/sdrbase/util/movingaverage.h b/sdrbase/util/movingaverage.h
index dfd003d8c..c08455816 100644
--- a/sdrbase/util/movingaverage.h
+++ b/sdrbase/util/movingaverage.h
@@ -1,6 +1,4 @@
///////////////////////////////////////////////////////////////////////////////////////
-// SDRdaemon - send I/Q samples read from a SDR device over the network via UDP //
-// with FEC protection. GNUradio interface. //
// //
// http://stackoverflow.com/questions/10990618/calculate-rolling-moving-average-in-c //
// //
@@ -124,4 +122,4 @@ class MovingAverageUtilVar
};
-#endif /* GR_SDRDAEMONFEC_LIB_MOVINGAVERAGE_H_ */
+#endif /* _UTIL_MOVINGAVERAGE_H_ */
diff --git a/sdrgui/readme.md b/sdrgui/readme.md
index 5b976e15e..49c1475a6 100644
--- a/sdrgui/readme.md
+++ b/sdrgui/readme.md
@@ -232,7 +232,7 @@ This is the sampling rate in kS/s of the I/Q stream extracted from the device af
2.4. Center frequency
-This is the current center frequency in kHz with dot separated thousands (MHz, GHz). On devices for which frequency can be directly controlled (i.e. all except File Source and SDRdaemon) you can use the thumbwheels to set the frequency. Thumbwheels move with the mouse wheel when hovering over a digit.
+This is the current center frequency in kHz with dot separated thousands (MHz, GHz). On devices for which frequency can be directly controlled (i.e. all except File Source and Remote Input) you can use the thumbwheels to set the frequency. Thumbwheels move with the mouse wheel when hovering over a digit.
When left clicking on a digit a cursor is set on it and you can also use the arrows to move the corresponding thumbwheel.
diff --git a/sdrsrv/readme.md b/sdrsrv/readme.md
index 80fbf8d6f..df80cf516 100644
--- a/sdrsrv/readme.md
+++ b/sdrsrv/readme.md
@@ -8,7 +8,7 @@ The main motivations are:
- be able to run SDRangel on hardware with less CPU/GPU requirements in particular without OpenGL suport.
- be used in sophisticated remote transponders or repeaters in a headless server configuration.
- possibility to use Docker technology to host SDRangel server instances in a distributed environment.
- - using [SDRdaemon](https://github.com/f4exb/sdrdaemon) for the RF device interface even more distributed architectures can be supported to share workload in a cluster.
+ - possibility to use SDRangel remotely for the RF device interface even more distributed architectures can be supported to share workload in a cluster.
- using the Web REST API interface developers with web technology skills can implement their own GUI.
Plugins supported
@@ -16,7 +16,7 @@ The main motivations are:
- Rx channels:
- AM demodulator
- BFM (Broadcast FM) demodulator
- - Daemon sink
+ - Remote sink
- DSD (Digital Vouice) demodulator
- NFM (Narrowband FM) demodulator
- SSB demodulator
@@ -26,7 +26,7 @@ The main motivations are:
- Tx channels:
- AM modulator
- ATV modulator
- - Daemon source
+ - Remote source
- NFM (Narrowband FM) modulator
- SSB modulator
- WFM (Wideband FM) modulator
@@ -44,7 +44,7 @@ The main motivations are:
- Perseus (24 bit build only)
- PlutoSDR input
- RTL-SDR
- - SDRdaemon source
+ - Remote input
- SDRplay RSP1
- Test source
@@ -54,7 +54,7 @@ The main motivations are:
- HackRF output
- LimeSDR output
- PlutoSDR output
- - SDRdaemon sink
+ - Remote output
Command line options
diff --git a/swagger/sdrangel/examples/devicesets_config.py b/swagger/sdrangel/examples/devicesets_config.py
index 586451f92..e22814da5 100755
--- a/swagger/sdrangel/examples/devicesets_config.py
+++ b/swagger/sdrangel/examples/devicesets_config.py
@@ -15,9 +15,7 @@ commands = [
["/deviceset/0/device", "PUT", None, {"hwType": "AirspyHF"}, "setup AirspyHF on Rx 0"],
["/preset", "PATCH", None, {"deviceSetIndex": 0, "preset": {"groupName": "OM144", "centerFrequency": 145480000, "type": "R", "name": "Rept + Simplex + DV"}}, "load preset on Rx 0"],
["/deviceset", "POST", None, None, "add Rx 1 device set"],
- ["/deviceset/1/device", "PUT", None, {"hwType": "SDRdaemonSource"}, "setup SDRdaemonSource on Rx 1"],
-# ["/preset", "PATCH", None, {"deviceSetIndex": 1, "preset": {"groupName": "OM430", "centerFrequency": 439550000, "type": "R", "name": "F5ZKP Daemon RPi3 SUSE"}}, "load preset on Rx 1"],
-# ["/preset", "PATCH", None, {"deviceSetIndex": 1, "preset": {"groupName": "PRO400", "centerFrequency": 463880000, "type": "R", "name": "PM Nice NXDN daemon"}}, "load preset on Rx 1"],
+ ["/deviceset/1/device", "PUT", None, {"hwType": "RemoteInput"}, "setup RemoteInput on Rx 1"],
["/preset", "PATCH", None, {"deviceSetIndex": 1, "preset": {"groupName": "PRO400", "centerFrequency": 463750000, "type": "R", "name": "PM nice low remote"}}, "load preset on Rx 1"],
["/deviceset", "POST", None, None, "add Rx 2 device set"],
["/deviceset/2/device", "PUT", None, {"hwType": "Perseus"}, "setup Perseus on Rx 2"],
diff --git a/windows.install.bat b/windows.install.bat
index 2acc5c988..45d273f50 100644
--- a/windows.install.bat
+++ b/windows.install.bat
@@ -64,11 +64,11 @@ copy plugins\samplesource\bladerf1input\%1\inputbladerf1.dll %2\plugins\sampleso
copy plugins\samplesource\bladerf2input\%1\inputbladerf2.dll %2\plugins\samplesource
copy plugins\samplesource\limesdrinput\%1\inputlimesdr.dll %2\plugins\samplesource
copy plugins\samplesource\plutosdrinput\%1\inputplutosdr.dll %2\plugins\samplesource
-REM copy plugins\samplesource\sdrdaemonsource\%1\inputsdrdaemonsource.dll %2\plugins\samplesource
+REM copy plugins\samplesource\remoteinput\%1\inputremote.dll %2\plugins\samplesource
copy plugins\samplesink\filesink\%1\outputfilesink.dll %2\plugins\samplesink
copy plugins\samplesink\bladerf1output\%1\outputbladerf1.dll %2\plugins\samplesink
copy plugins\samplesink\bladerf2output\%1\outputbladerf2.dll %2\plugins\samplesink
copy plugins\samplesink\hackrfoutput\%1\outputhackrf.dll %2\plugins\samplesink
copy plugins\samplesink\limesdroutput\%1\outputlimesdr.dll %2\plugins\samplesink
copy plugins\samplesink\plutosdroutput\%1\outputplutosdr.dll %2\plugins\samplesink
-REM copy plugins\samplesink\sdrdaemonsink\%1\outputsdrdaemonsink.dll %2\plugins\samplesink
+REM copy plugins\samplesink\remoteoutput\%1\outputremote.dll %2\plugins\samplesink
diff --git a/windows64.install.bat b/windows64.install.bat
index 43ad5b7b0..492e2f783 100644
--- a/windows64.install.bat
+++ b/windows64.install.bat
@@ -72,7 +72,7 @@ copy plugins\channeltx\modwfm\%1\modwfm.dll %2\plugins\channeltx
copy plugins\channeltx\udpsink\%1\udpsink.dll %2\plugins\channeltx
copy plugins\samplesource\filesource\%1\inputfilesource.dll %2\plugins\samplesource
copy plugins\samplesource\testsource\%1\inputtestsource.dll %2\plugins\samplesource
-copy plugins\samplesource\sdrdaemonsource\%1\inputsdrdaemonsource.dll %2\plugins\samplesource
+copy plugins\samplesource\remoteinput\%1\inputremote.dll %2\plugins\samplesource
copy plugins\samplesource\rtlsdr\%1\inputrtlsdr.dll %2\plugins\samplesource
copy plugins\samplesource\hackrfinput\%1\inputhackrf.dll %2\plugins\samplesource
copy plugins\samplesource\airspy\%1\inputairspy.dll %2\plugins\samplesource