diff --git a/Readme.md b/Readme.md index 3dc71fd73..4aade1527 100644 --- a/Readme.md +++ b/Readme.md @@ -92,6 +92,8 @@ If you use your own location for librtlsdr install directory you need to specify

SDRplay

+Linux only. + SDRplay devices are supported through the [libmirisdr-4](https://github.com/f4exb/libmirisdr-4) library found in this very same Github space. There is no package distribution for this library and you will have to clone it, build and install it in your system. However Windows and Debian packages of SDRangel contain a pre-compiled version of this library. If you use your own location for libmirisdr-4 install directory you need to specify library and include locations with cmake. For example with `/opt/install/libmirisdr` the following defines must be added on `cmake` command line: diff --git a/libmirisdr/libmirisdr.pro b/libmirisdr/libmirisdr.pro deleted file mode 100644 index 47302da9d..000000000 --- a/libmirisdr/libmirisdr.pro +++ /dev/null @@ -1,53 +0,0 @@ -#-------------------------------------------------------- -# -# Pro file for Android and Windows builds with Qt Creator -# -#-------------------------------------------------------- - -QT += core - -TEMPLATE = lib -TARGET = libmirisdr - -CONFIG(MINGW32):LIBMIRISDRSRC = "D:\softs\libmirisdr-4" -CONFIG(MINGW64):LIBMIRISDRSRC = "D:\softs\libmirisdr-4" -INCLUDEPATH += $$LIBMIRISDRSRC/include -INCLUDEPATH += $$LIBMIRISDRSRC/src -INCLUDEPATH += $$LIBMIRISDRSRC/src/convert - -CONFIG(MINGW32):INCLUDEPATH += "D:\libusb-1.0.19\include\libusb-1.0" -CONFIG(MINGW64):INCLUDEPATH += "D:\libusb-1.0.19\include\libusb-1.0" - -SOURCES = $$LIBMIRISDRSRC/src/libmirisdr.c \ - $$LIBMIRISDRSRC/src/getopt/getopt.c - -HEADERS = $$LIBMIRISDRSRC/include/mirisdr.h\ - $$LIBMIRISDRSRC/include/mirisdr_export.h\ - $$LIBMIRISDRSRC/src/getopt/getopt.h\ - $$LIBMIRISDRSRC/src/convert/252_s16.c\ - $$LIBMIRISDRSRC/src/convert/336_s16.c\ - $$LIBMIRISDRSRC/src/convert/384_s16.c\ - $$LIBMIRISDRSRC/src/convert/504_s16.c\ - $$LIBMIRISDRSRC/src/convert/504_s8.c\ - $$LIBMIRISDRSRC/src/convert/base.c\ - $$LIBMIRISDRSRC/src/adc.c\ - $$LIBMIRISDRSRC/src/async.c\ - $$LIBMIRISDRSRC/src/constants.h\ - $$LIBMIRISDRSRC/src/convenience.c\ - $$LIBMIRISDRSRC/src/devices.c\ - $$LIBMIRISDRSRC/src/gain.c\ - $$LIBMIRISDRSRC/src/gain.h\ - $$LIBMIRISDRSRC/src/hard.c\ - $$LIBMIRISDRSRC/src/hard.h\ - $$LIBMIRISDRSRC/src/reg.c\ - $$LIBMIRISDRSRC/src/soft.c\ - $$LIBMIRISDRSRC/src/soft.h\ - $$LIBMIRISDRSRC/src/streaming.c\ - $$LIBMIRISDRSRC/src/structs.h\ - $$LIBMIRISDRSRC/src/sync.c - -CONFIG(MINGW32):LIBS += -LD:\libusb-1.0.19\MinGW32\dll -llibusb-1.0 -CONFIG(MINGW64):LIBS += -LD:\libusb-1.0.19\MinGW64\dll -llibusb-1.0 - -CONFIG(ANDROID):CONFIG += mobility -CONFIG(ANDROID):MOBILITY = diff --git a/plugins/samplesource/sdrplay/readme.md b/plugins/samplesource/sdrplay/readme.md index decf332f1..1c33789c4 100644 --- a/plugins/samplesource/sdrplay/readme.md +++ b/plugins/samplesource/sdrplay/readme.md @@ -4,13 +4,9 @@ This plugin supports input from SDRplay devices. SDRplay is based on the MSi001 and MSi2500 chips from Mirics. The standard API provided by Mirics is closed source moreover it could not be implemented successfully in SDRangel. An open source API libmirisdr-2 has been written by Miroslav Slugen and later amended by Leif Asbrink SM5BSZ. This API uses a new flavour called [libmirisdr-4](https://github.com/f4exb/libmirisdr-4) in this very same Github space. It contains enhancements and bug fixes. -Note to Windows users: +No Windows support -this plugin uses the libusbK USB interface provided by [Zadig](http://zadig.akeo.ie). It will not work with any of the other drivers provided by Zadig. It is also not compatible with the drivers from Mirics so you will have to unistall (or you should not install) the Mirics software before you can use this plugin. - -Use it at your own risk! If the device disconnects you will immediately get a BSOD. In Linux it is just a core dump. - -Also sometimes when loading a preset the device will not work correctly. In this case just use the stop/start toggle to reset the device. +Driver is too unstable in Windows randomly stopping the appication and causing BSOD.

Build

diff --git a/plugins/samplesource/sdrplay/sdrplay.pro b/plugins/samplesource/sdrplay/sdrplay.pro deleted file mode 100644 index ff9b8a7bb..000000000 --- a/plugins/samplesource/sdrplay/sdrplay.pro +++ /dev/null @@ -1,45 +0,0 @@ -#-------------------------------------------------------- -# -# Pro file for Android and Windows builds with Qt Creator -# -#-------------------------------------------------------- - -TEMPLATE = lib -CONFIG += plugin - -QT += core gui widgets multimedia opengl - -TARGET = inputsdrplay - -DEFINES += USE_SSE2=1 -QMAKE_CXXFLAGS += -msse2 -DEFINES += USE_SSE4_1=1 -QMAKE_CXXFLAGS += -msse4.1 - -CONFIG(MINGW32):LIBMIRISDRSRC = "D:\softs\libmirisdr-4" -CONFIG(MINGW64):LIBMIRISDRSRC = "D:\softs\libmirisdr-4" -INCLUDEPATH += $$PWD -INCLUDEPATH += ../../../sdrbase -INCLUDEPATH += $$LIBMIRISDRSRC/include - -CONFIG(Release):build_subdir = release -CONFIG(Debug):build_subdir = debug - -SOURCES += sdrplaygui.cpp\ - sdrplayinput.cpp\ - sdrplayplugin.cpp\ - sdrplaysettings.cpp\ - sdrplaythread.cpp - -HEADERS += sdrplaygui.h\ - sdrplayinput.h\ - sdrplayplugin.h\ - sdrplaysettings.h\ - sdrplaythread.h - -FORMS += sdrplaygui.ui - -LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase -LIBS += -L../../../libmirisdr/$${build_subdir} -llibmirisdr - -RESOURCES = ../../../sdrbase/resources/res.qrc diff --git a/sdrangel.windows.pro b/sdrangel.windows.pro index 973a78237..e392cef90 100644 --- a/sdrangel.windows.pro +++ b/sdrangel.windows.pro @@ -14,7 +14,6 @@ SUBDIRS += librtlsdr SUBDIRS += libhackrf SUBDIRS += libairspy SUBDIRS += libbladerf -SUBDIRS += libmirisdr SUBDIRS += mbelib SUBDIRS += dsdcc SUBDIRS += serialdv @@ -26,7 +25,6 @@ SUBDIRS += plugins/samplesource/rtlsdr SUBDIRS += plugins/samplesource/hackrf SUBDIRS += plugins/samplesource/airspy SUBDIRS += plugins/samplesource/bladerf -SUBDIRS += plugins/samplesource/sdrplay SUBDIRS += plugins/samplesink/filesink SUBDIRS += plugins/channelrx/chanalyzer SUBDIRS += plugins/channelrx/demodam