From 1187ab99cb8845ec232af3eaa94a35747356e89d Mon Sep 17 00:00:00 2001 From: f4exb Date: Sat, 7 Jan 2017 11:05:07 +0100 Subject: [PATCH] Removed BladeRF output plugin from Windows build due to performance reasons --- Readme.md | 4 +- .../bladerfoutput/bladerfoutput.pro | 47 ------------------- plugins/samplesink/bladerfoutput/readme.md | 2 +- sdrangel.windows.pro | 1 - windows.install.bat | 1 - windows64.install.bat | 1 - 6 files changed, 4 insertions(+), 52 deletions(-) delete mode 100644 plugins/samplesink/bladerfoutput/bladerfoutput.pro diff --git a/Readme.md b/Readme.md index d75db86d4..2a6d8d16f 100644 --- a/Readme.md +++ b/Readme.md @@ -30,9 +30,11 @@ From version 2 SDRangel can integrate more than one hardware device running conc

Transmission support

+Transmision with "real" devices (BladeRF and HackRF) is supported in Linux versions only + From version 3 transmission or signal generation is supported for BladeRF (HackRF is in the plans for the 3.1 version) using a sample sink plugin: - - [BladeRF output plugin](https://github.com/f4exb/sdrangel/tree/dev/plugins/samplesink/bladerfoutput) + - [BladeRF output plugin](https://github.com/f4exb/sdrangel/tree/dev/plugins/samplesink/bladerfoutput) Linux only - [File output or file sink plugin](https://github.com/f4exb/sdrangel/tree/dev/plugins/samplesink/filesink)

Airspy

diff --git a/plugins/samplesink/bladerfoutput/bladerfoutput.pro b/plugins/samplesink/bladerfoutput/bladerfoutput.pro deleted file mode 100644 index eb152df08..000000000 --- a/plugins/samplesink/bladerfoutput/bladerfoutput.pro +++ /dev/null @@ -1,47 +0,0 @@ -#-------------------------------------------- -# -# Pro file for Windows builds with Qt Creator -# -#-------------------------------------------- - -TEMPLATE = lib -CONFIG += plugin - -QT += core gui widgets multimedia opengl - -TARGET = outputbladerf - -DEFINES += USE_SSE2=1 -QMAKE_CXXFLAGS += -msse2 -DEFINES += USE_SSE4_1=1 -QMAKE_CXXFLAGS += -msse4.1 - -CONFIG(MINGW32):LIBBLADERFSRC = "D:\softs\bladeRF\host\libraries\libbladeRF\include" -CONFIG(MINGW64):LIBBLADERFSRC = "D:\softs\bladeRF\host\libraries\libbladeRF\include" -INCLUDEPATH += $$PWD -INCLUDEPATH += ../../../sdrbase -INCLUDEPATH += ../../../devices -INCLUDEPATH += $$LIBBLADERFSRC - -CONFIG(Release):build_subdir = release -CONFIG(Debug):build_subdir = debug - -SOURCES += bladerfoutputgui.cpp\ - bladerfoutput.cpp\ - bladerfoutputplugin.cpp\ - bladerfoutputsettings.cpp\ - bladerfoutputthread.cpp - -HEADERS += bladerfoutputgui.h\ - bladerfoutput.h\ - bladerfoutputplugin.h\ - bladerfoutputsettings.h\ - bladerfoutputthread.h - -FORMS += bladerfoutputgui.ui - -LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase -LIBS += -L../../../libbladerf/$${build_subdir} -llibbladerf -LIBS += -L../../../devices/$${build_subdir} -ldevices - -RESOURCES = ../../../sdrbase/resources/res.qrc diff --git a/plugins/samplesink/bladerfoutput/readme.md b/plugins/samplesink/bladerfoutput/readme.md index 151c4f841..661c8587d 100644 --- a/plugins/samplesink/bladerfoutput/readme.md +++ b/plugins/samplesink/bladerfoutput/readme.md @@ -2,7 +2,7 @@

Introduction

-This output sample sink plugin sends its samples to a [BladeRF device](https://www.nuand.com/). +This output sample sink plugin sends its samples to a [BladeRF device](https://www.nuand.com/). It is supported in Linux only.

Build

diff --git a/sdrangel.windows.pro b/sdrangel.windows.pro index 79a09ea66..abc163dc4 100644 --- a/sdrangel.windows.pro +++ b/sdrangel.windows.pro @@ -27,7 +27,6 @@ SUBDIRS += plugins/samplesource/hackrfinput SUBDIRS += plugins/samplesource/airspy SUBDIRS += plugins/samplesource/bladerfinput SUBDIRS += plugins/samplesink/filesink -SUBDIRS += plugins/samplesink/bladerfoutput SUBDIRS += plugins/channelrx/chanalyzer SUBDIRS += plugins/channelrx/demodam SUBDIRS += plugins/channelrx/demodbfm diff --git a/windows.install.bat b/windows.install.bat index d5f6076b3..f8551ccd4 100644 --- a/windows.install.bat +++ b/windows.install.bat @@ -37,4 +37,3 @@ copy plugins\samplesource\hackrfinput\%1\inputhackrf.dll %2\plugins\samplesource copy plugins\samplesource\airspy\%1\inputairspy.dll %2\plugins\samplesource copy plugins\samplesource\bladerfinput\%1\inputbladerf.dll %2\plugins\samplesource copy plugins\samplesink\filesink\%1\outputfilesink.dll %2\plugins\samplesink -copy plugins\samplesink\bladerfoutput\%1\outputbladerf.dll %2\plugins\samplesink diff --git a/windows64.install.bat b/windows64.install.bat index a93e8c42e..9636384c6 100644 --- a/windows64.install.bat +++ b/windows64.install.bat @@ -52,4 +52,3 @@ copy plugins\samplesource\hackrfinput\%1\inputhackrf.dll %2\plugins\samplesource copy plugins\samplesource\airspy\%1\inputairspy.dll %2\plugins\samplesource copy plugins\samplesource\bladerfinput\%1\inputbladerf.dll %2\plugins\samplesource copy plugins\samplesink\filesink\%1\outputfilesink.dll %2\plugins\samplesink -copy plugins\samplesink\bladerfoutput\%1\outputbladerf.dll %2\plugins\samplesink