diff --git a/devices/devices.pro b/devices/devices.pro index 35aa88312..4d8ea539b 100644 --- a/devices/devices.pro +++ b/devices/devices.pro @@ -59,6 +59,9 @@ CONFIG(Debug):build_subdir = debug bladerf1/devicebladerf1values.cpp\ bladerf1/devicebladerf1shared.cpp +!macx:SOURCES += bladerf2/devicebladerf2.cpp\ + bladerf2/devicebladerf2shared.cpp + SOURCES += hackrf/devicehackrf.cpp\ hackrf/devicehackrfvalues.cpp\ hackrf/devicehackrfshared.cpp @@ -73,6 +76,9 @@ SOURCES += limesdr/devicelimesdr.cpp\ plutosdr/deviceplutosdrscan.cpp\ plutosdr/deviceplutosdrshared.cpp +!macx:HEADERS += bladerf2/devicebladerf2.h\ + bladerf2/devicebladerf2shared.h + !macx:HEADERS += bladerf1/devicebladerf1.h\ bladerf1/devicebladerf1param.h\ bladerf1/devicebladerf1values.h\ diff --git a/plugins/samplesource/bladerf1input/bladerf1input.pro b/plugins/samplesource/bladerf1input/bladerf1input.pro index 78b56e879..035afb49f 100644 --- a/plugins/samplesource/bladerf1input/bladerf1input.pro +++ b/plugins/samplesource/bladerf1input/bladerf1input.pro @@ -9,7 +9,7 @@ CONFIG += plugin QT += core gui widgets multimedia opengl -TARGET = inputbladerf +TARGET = inputbladerf1 DEFINES += USE_SSE2=1 QMAKE_CXXFLAGS += -msse2 diff --git a/plugins/samplesource/bladerf2input/bladerf2input.pro b/plugins/samplesource/bladerf2input/bladerf2input.pro new file mode 100644 index 000000000..e474a41ca --- /dev/null +++ b/plugins/samplesource/bladerf2input/bladerf2input.pro @@ -0,0 +1,53 @@ +#-------------------------------------------- +# +# Pro file for Windows builds with Qt Creator +# +#-------------------------------------------- + +TEMPLATE = lib +CONFIG += plugin + +QT += core gui widgets multimedia opengl + +TARGET = inputbladerf2 + +DEFINES += USE_SSE2=1 +QMAKE_CXXFLAGS += -msse2 +DEFINES += USE_SSE4_1=1 +QMAKE_CXXFLAGS += -msse4.1 +QMAKE_CXXFLAGS += -std=c++11 + +CONFIG(MINGW32):LIBBLADERF = "C:\Programs\bladeRF" +CONFIG(MINGW64):LIBBLADERF = "C:\Programs\bladeRF" +INCLUDEPATH += $$PWD +INCLUDEPATH += ../../../exports +INCLUDEPATH += ../../../sdrbase +INCLUDEPATH += ../../../sdrgui +INCLUDEPATH += ../../../swagger/sdrangel/code/qt5/client +INCLUDEPATH += ../../../devices +INCLUDEPATH += $$LIBBLADERF/include + +CONFIG(Release):build_subdir = release +CONFIG(Debug):build_subdir = debug + +SOURCES += bladerf2inputgui.cpp\ + bladerf2input.cpp\ + bladerf2inputplugin.cpp\ + bladerf2inputsettings.cpp\ + bladerf2inputthread.cpp + +HEADERS += bladerf2inputgui.h\ + bladerf2input.h\ + bladerf2inputplugin.h\ + bladerf2inputsettings.h\ + bladerf2inputthread.h + +FORMS += bladerf2inputgui.ui + +LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase +LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui +LIBS += -L../../../swagger/$${build_subdir} -lswagger +LIBS += -L$$LIBBLADERF/lib -lbladeRF +LIBS += -L../../../devices/$${build_subdir} -ldevices + +RESOURCES = ../../../sdrgui/resources/res.qrc diff --git a/plugins/samplesource/bladerf2input/bladerf2inputgui.cpp b/plugins/samplesource/bladerf2input/bladerf2inputgui.cpp index 1036b9d1a..34f44d6a7 100644 --- a/plugins/samplesource/bladerf2input/bladerf2inputgui.cpp +++ b/plugins/samplesource/bladerf2input/bladerf2inputgui.cpp @@ -280,6 +280,12 @@ void BladeRF2InputGui::on_iqImbalance_toggled(bool checked) sendSettings(); } +void BladeRF2InputGui::on_biasTee_toggled(bool checked) +{ + m_settings.m_biasTee = checked; + sendSettings(); +} + void BladeRF2InputGui::on_bandwidth_changed(quint64 value) { m_settings.m_bandwidth = value * 1000; diff --git a/sdrangel.windows.pro b/sdrangel.windows.pro index e198a12e0..a322cbc3c 100644 --- a/sdrangel.windows.pro +++ b/sdrangel.windows.pro @@ -32,6 +32,7 @@ SUBDIRS += dsdcc SUBDIRS += plugins/samplesource/airspy SUBDIRS += plugins/samplesource/airspyhf SUBDIRS += plugins/samplesource/bladerf1input +SUBDIRS += plugins/samplesource/bladerf2input SUBDIRS += plugins/samplesource/filesource SUBDIRS += plugins/samplesource/hackrfinput SUBDIRS += plugins/samplesource/limesdrinput