From 1707aa8e276656d97d76f05d8e196adf3298ce64 Mon Sep 17 00:00:00 2001 From: f4exb Date: Sun, 15 May 2016 09:26:31 +0200 Subject: [PATCH] Removed gnuradio and osmosdr plugin sources --- Readme.md | 2 - plugins/samplesource/gnuradio/CMakeLists.txt | 87 -- .../cmake/Modules/FindGnuradioOsmosdr.cmake | 29 - .../cmake/Modules/FindGnuradioRuntime.cmake | 29 - plugins/samplesource/gnuradio/gnuradiogui.cpp | 520 ------------ plugins/samplesource/gnuradio/gnuradiogui.h | 107 --- plugins/samplesource/gnuradio/gnuradiogui.ui | 319 ------- .../samplesource/gnuradio/gnuradioinput.cpp | 350 -------- plugins/samplesource/gnuradio/gnuradioinput.h | 156 ---- .../samplesource/gnuradio/gnuradioplugin.cpp | 52 -- .../samplesource/gnuradio/gnuradioplugin.h | 27 - .../samplesource/gnuradio/gnuradiothread.cpp | 144 ---- .../samplesource/gnuradio/gnuradiothread.h | 64 -- plugins/samplesource/osmosdr/CMakeLists.txt | 54 -- plugins/samplesource/osmosdr/osmosdrgui.cpp | 310 ------- plugins/samplesource/osmosdr/osmosdrgui.h | 70 -- plugins/samplesource/osmosdr/osmosdrgui.ui | 792 ------------------ plugins/samplesource/osmosdr/osmosdrinput.cpp | 479 ----------- plugins/samplesource/osmosdr/osmosdrinput.h | 99 --- .../samplesource/osmosdr/osmosdrplugin.cpp | 69 -- plugins/samplesource/osmosdr/osmosdrplugin.h | 27 - .../samplesource/osmosdr/osmosdrthread.cpp | 116 --- plugins/samplesource/osmosdr/osmosdrthread.h | 66 -- .../samplesource/osmosdr/osmosdrupgrade.cpp | 518 ------------ plugins/samplesource/osmosdr/osmosdrupgrade.h | 60 -- .../samplesource/osmosdr/osmosdrupgrade.ui | 219 ----- 26 files changed, 4765 deletions(-) delete mode 100644 plugins/samplesource/gnuradio/CMakeLists.txt delete mode 100644 plugins/samplesource/gnuradio/cmake/Modules/FindGnuradioOsmosdr.cmake delete mode 100644 plugins/samplesource/gnuradio/cmake/Modules/FindGnuradioRuntime.cmake delete mode 100644 plugins/samplesource/gnuradio/gnuradiogui.cpp delete mode 100644 plugins/samplesource/gnuradio/gnuradiogui.h delete mode 100644 plugins/samplesource/gnuradio/gnuradiogui.ui delete mode 100644 plugins/samplesource/gnuradio/gnuradioinput.cpp delete mode 100644 plugins/samplesource/gnuradio/gnuradioinput.h delete mode 100644 plugins/samplesource/gnuradio/gnuradioplugin.cpp delete mode 100644 plugins/samplesource/gnuradio/gnuradioplugin.h delete mode 100644 plugins/samplesource/gnuradio/gnuradiothread.cpp delete mode 100644 plugins/samplesource/gnuradio/gnuradiothread.h delete mode 100644 plugins/samplesource/osmosdr/CMakeLists.txt delete mode 100644 plugins/samplesource/osmosdr/osmosdrgui.cpp delete mode 100644 plugins/samplesource/osmosdr/osmosdrgui.h delete mode 100644 plugins/samplesource/osmosdr/osmosdrgui.ui delete mode 100644 plugins/samplesource/osmosdr/osmosdrinput.cpp delete mode 100644 plugins/samplesource/osmosdr/osmosdrinput.h delete mode 100644 plugins/samplesource/osmosdr/osmosdrplugin.cpp delete mode 100644 plugins/samplesource/osmosdr/osmosdrplugin.h delete mode 100644 plugins/samplesource/osmosdr/osmosdrthread.cpp delete mode 100644 plugins/samplesource/osmosdr/osmosdrthread.h delete mode 100644 plugins/samplesource/osmosdr/osmosdrupgrade.cpp delete mode 100644 plugins/samplesource/osmosdr/osmosdrupgrade.h delete mode 100644 plugins/samplesource/osmosdr/osmosdrupgrade.ui diff --git a/Readme.md b/Readme.md index c85102b78..d7ce56e6f 100644 --- a/Readme.md +++ b/Readme.md @@ -28,8 +28,6 @@ These plugins come from the parent code base and are still present in the source - Channels: - tetra - Sample sources: - - gnuradio - - osmosdr - v4l-msi - v4l-rtl diff --git a/plugins/samplesource/gnuradio/CMakeLists.txt b/plugins/samplesource/gnuradio/CMakeLists.txt deleted file mode 100644 index 0e08608cf..000000000 --- a/plugins/samplesource/gnuradio/CMakeLists.txt +++ /dev/null @@ -1,87 +0,0 @@ -project(gnuradio) - -list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules) - -find_package(GnuradioRuntime) -find_package(GnuradioOsmosdr) - -if(UNIX AND NOT BOOST_ROOT AND EXISTS "/usr/lib64") - list(APPEND BOOST_LIBRARYDIR "/usr/lib64") #fedora 64-bit fix -endif(UNIX AND NOT BOOST_ROOT AND EXISTS "/usr/lib64") - -find_package(Boost COMPONENTS system) - -if(NOT GNURADIO_RUNTIME_FOUND AND GNURADIO_OSMOSDR_FOUND) - - message(STATUS "GNU Radio not found, assuming built-in gr-osmosdr runtime.") - - set(GNURADIO_RUNTIME_FOUND TRUE) - set(GNURADIO_RUNTIME_INCLUDE_DIRS "") - set(GNURADIO_RUNTIME_LIBRARIES "") - - FOREACH(inc ${GNURADIO_OSMOSDR_INCLUDE_DIRS}) - LIST(APPEND GNURADIO_RUNTIME_INCLUDE_DIRS "${inc}/osmosdr/runtime") - ENDFOREACH(inc) - - LIST(APPEND GNURADIO_RUNTIME_LIBRARIES ${GNURADIO_OSMOSDR_LIBRARIES}) - -endif(NOT GNURADIO_RUNTIME_FOUND AND GNURADIO_OSMOSDR_FOUND) - -if(Boost_FOUND AND GNURADIO_RUNTIME_FOUND AND GNURADIO_OSMOSDR_FOUND) - -set(gnuradio_SOURCES - gnuradiogui.cpp - gnuradioinput.cpp - gnuradioplugin.cpp - gnuradiothread.cpp -) - -set(gnuradio_HEADERS - gnuradiogui.h - gnuradioinput.h - gnuradioplugin.h - gnuradiothread.h -) - -set(gnuradio_FORMS - gnuradiogui.ui -) - -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/include - ${CMAKE_SOURCE_DIR}/include-gpl - ${Boost_INCLUDE_DIRS} - ${GNURADIO_RUNTIME_INCLUDE_DIRS} - ${GNURADIO_OSMOSDR_INCLUDE_DIRS} -) - -add_definitions(${QT_DEFINITIONS}) -add_definitions(-DQT_PLUGIN) -add_definitions(-DQT_SHARED) -add_definitions(-DBOOST_ALL_NO_LIB) - -if(MSVC) -add_definitions(-DNOMINMAX) -endif() - -qt5_wrap_ui(gnuradio_FORMS_HEADERS ${gnuradio_FORMS}) - -add_library(inputgnuradio SHARED - ${gnuradio_SOURCES} - ${gnuradio_HEADERS_MOC} - ${gnuradio_FORMS_HEADERS} -) - -target_link_libraries(inputgnuradio - ${QT_LIBRARIES} - ${Boost_LIBRARIES} - ${GNURADIO_RUNTIME_LIBRARIES} - ${GNURADIO_OSMOSDR_LIBRARIES} - sdrbase -) - -qt5_use_modules(inputgnuradio Core Widgets OpenGL Multimedia) - -endif(Boost_FOUND AND GNURADIO_RUNTIME_FOUND AND GNURADIO_OSMOSDR_FOUND) diff --git a/plugins/samplesource/gnuradio/cmake/Modules/FindGnuradioOsmosdr.cmake b/plugins/samplesource/gnuradio/cmake/Modules/FindGnuradioOsmosdr.cmake deleted file mode 100644 index 156a38dd3..000000000 --- a/plugins/samplesource/gnuradio/cmake/Modules/FindGnuradioOsmosdr.cmake +++ /dev/null @@ -1,29 +0,0 @@ -INCLUDE(FindPkgConfig) -PKG_CHECK_MODULES(PC_GNURADIO_OSMOSDR gnuradio-osmosdr) - -FIND_PATH( - GNURADIO_OSMOSDR_INCLUDE_DIRS - NAMES osmosdr/api.h - HINTS $ENV{GNURADIO_OSMOSDR_DIR}/include - ${PC_GNURADIO_OSMOSDR_INCLUDEDIR} - ${CMAKE_INSTALL_PREFIX}/include - PATHS /usr/local/include - /usr/include -) - -FIND_LIBRARY( - GNURADIO_OSMOSDR_LIBRARIES - NAMES gnuradio-osmosdr - HINTS $ENV{GNURADIO_OSMOSDR_DIR}/lib - ${PC_GNURADIO_OSMOSDR_LIBDIR} - ${CMAKE_INSTALL_PREFIX}/lib64 - ${CMAKE_INSTALL_PREFIX}/lib - PATHS /usr/local/lib - /usr/local/lib64 - /usr/lib - /usr/lib64 -) - -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(GNURADIO_OSMOSDR DEFAULT_MSG GNURADIO_OSMOSDR_LIBRARIES GNURADIO_OSMOSDR_INCLUDE_DIRS) -MARK_AS_ADVANCED(GNURADIO_OSMOSDR_LIBRARIES GNURADIO_OSMOSDR_INCLUDE_DIRS) diff --git a/plugins/samplesource/gnuradio/cmake/Modules/FindGnuradioRuntime.cmake b/plugins/samplesource/gnuradio/cmake/Modules/FindGnuradioRuntime.cmake deleted file mode 100644 index 124626e52..000000000 --- a/plugins/samplesource/gnuradio/cmake/Modules/FindGnuradioRuntime.cmake +++ /dev/null @@ -1,29 +0,0 @@ -INCLUDE(FindPkgConfig) -PKG_CHECK_MODULES(PC_GNURADIO_RUNTIME gnuradio-runtime) - -FIND_PATH( - GNURADIO_RUNTIME_INCLUDE_DIRS - NAMES gnuradio/api.h - HINTS $ENV{GNURADIO_RUNTIME_DIR}/include - ${PC_GNURADIO_RUNTIME_INCLUDEDIR} - ${CMAKE_INSTALL_PREFIX}/include - PATHS /usr/local/include - /usr/include -) - -FIND_LIBRARY( - GNURADIO_RUNTIME_LIBRARIES - NAMES gnuradio-runtime - HINTS $ENV{GNURADIO_RUNTIME_DIR}/lib - ${PC_GNURADIO_RUNTIME_LIBDIR} - ${CMAKE_INSTALL_PREFIX}/lib64 - ${CMAKE_INSTALL_PREFIX}/lib - PATHS /usr/local/lib - /usr/local/lib64 - /usr/lib - /usr/lib64 -) - -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(GNURADIO_RUNTIME DEFAULT_MSG GNURADIO_RUNTIME_LIBRARIES GNURADIO_RUNTIME_INCLUDE_DIRS) -MARK_AS_ADVANCED(GNURADIO_RUNTIME_LIBRARIES GNURADIO_RUNTIME_INCLUDE_DIRS) diff --git a/plugins/samplesource/gnuradio/gnuradiogui.cpp b/plugins/samplesource/gnuradio/gnuradiogui.cpp deleted file mode 100644 index 34cb14477..000000000 --- a/plugins/samplesource/gnuradio/gnuradiogui.cpp +++ /dev/null @@ -1,520 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2012 maintech GmbH, Otto-Hahn-Str. 15, 97204 Hoechberg, Germany // -// written by Christian Daniel // -// Copyright (C) 2013 by Dimitri Stolnikov // -// // -// This program is free software; you can redistribute it and/or modify // -// it under the terms of the GNU General Public License as published by // -// the Free Software Foundation as version 3 of the License, or // -// // -// This program is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU General Public License V3 for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with this program. If not, see . // -/////////////////////////////////////////////////////////////////////////////////// - -#include "gnuradiogui.h" -#include "ui_gnuradiogui.h" - -#include -#include -#include - -#include -#include -#include - -GNURadioGui::GNURadioGui(PluginAPI* pluginAPI, QWidget* parent) : - QWidget(parent), - ui(new Ui::GNURadioGui), - m_pluginAPI(pluginAPI), - m_settings(), - m_sampleSource(NULL) -{ - ui->setupUi(this); - connect(&m_updateTimer, SIGNAL(timeout()), this, SLOT(updateHardware())); - //displaySettings(); - updateDisplayDevices(); - - m_sampleSource = new GNURadioInput(m_pluginAPI->getMainWindowMessageQueue()); - m_pluginAPI->setSampleSource(m_sampleSource); -} - -GNURadioGui::~GNURadioGui() -{ - delete ui; -} - -void GNURadioGui::destroy() -{ - delete this; -} - -void GNURadioGui::setName(const QString& name) -{ - setObjectName(name); -} - -void GNURadioGui::resetToDefaults() -{ - m_generalSettings.resetToDefaults(); - m_settings.resetToDefaults(); - displaySettings(); - sendSettings(); -} - -QByteArray GNURadioGui::serializeGeneral() const -{ - return m_generalSettings.serialize(); -} - -bool GNURadioGui::deserializeGeneral(const QByteArray&data) -{ - if(m_generalSettings.deserialize(data)) { - displaySettings(); - sendSettings(); - return true; - } else { - resetToDefaults(); - return false; - } -} - -quint64 GNURadioGui::getCenterFrequency() const -{ - return m_generalSettings.m_centerFrequency; -} - -QByteArray GNURadioGui::serialize() const -{ - return m_settings.serialize(); -} - -bool GNURadioGui::deserialize(const QByteArray& data) -{ - if(m_settings.deserialize(data)) { - displaySettings(); - sendSettings(); - return true; - } else { - resetToDefaults(); - return false; - } -} - -bool GNURadioGui::handleMessage(Message* message) -{ - if(GNURadioInput::MsgReportGNURadio::match(message)) { - GNURadioInput::MsgReportGNURadio* rep = (GNURadioInput::MsgReportGNURadio*)message; - m_namedGains = rep->getNamedGains(); - m_freqMin = rep->getFreqMin(); - m_freqMax = rep->getFreqMax(); - m_freqCorr = rep->getFreqCorr(); - m_sampRates = rep->getSampRates(); - m_antennas = rep->getAntennas(); - m_dcoffs = rep->getDCOffs(); - m_iqbals = rep->getIQBals(); - m_bandwidths = rep->getBandwidths(); - /* insert 0 which will become "Auto" in the combo box */ - m_bandwidths.insert(m_bandwidths.begin(), 0); - //displaySettings(); - updateDisplayConstants(); - return true; - } else { - return false; - } -} - -void GNURadioGui::updateDisplayDevices() -{ - // Device list - osmosdr::devices_t devices = osmosdr::device::find(); - - for ( uint i = 0; i < devices.size(); i++ ) { - osmosdr::device_t dev = devices[i]; - QString label; - - if ( dev.count( "label" ) ) { - label = QString(dev[ "label" ].c_str()); - dev.erase("label"); - } - - QPair< QString, QString > pair(label, dev.to_string().c_str()); - m_devs.append(pair); - - ui->cboDevices->addItem(label); - } - - if ( ui->cboDevices->count() ) { - ui->cboDevices->setEnabled(true); - } else { - ui->cboDevices->setEnabled(false); - } -} - -void GNURadioGui::updateDisplayConstants() -{ - // Device specific gain controls - - m_gainControls.clear(); - QVBoxLayout *layoutGains = ui->verticalLayoutGains; - QLayoutItem *layoutItem; - - while ( ( layoutItem = layoutGains->takeAt( 0 ) ) != NULL ) - { - QLayout *layout = layoutItem->layout(); - - if ( !layout ) - continue; - - while ( ( layoutItem = layout->takeAt( 0 ) ) != NULL ) - { - delete layoutItem->widget(); - delete layoutItem; - } - - delete layout; - } - - for ( uint i = 0; i < m_namedGains.size(); i++ ) - { - std::pair< QString, std::vector > pair = m_namedGains[i]; - - QHBoxLayout *layout = new QHBoxLayout(); - QLabel *gainName = new QLabel( pair.first + " Gain" ); - QSlider *gainSlider = new QSlider(Qt::Horizontal); - QLabel *gainLabel = new QLabel("0"); - gainLabel->setMinimumWidth(30); - gainLabel->setAlignment(Qt::AlignHCenter | Qt::AlignHCenter); - - QPair< QSlider*, QLabel* > pair2( gainSlider, gainLabel ); - m_gainControls.push_back( pair2 ); - - layout->addWidget(gainName); - layout->addWidget(gainSlider); - layout->addWidget(gainLabel); - - m_gainSliders.push_back(gainSlider); - m_gainLabels.push_back(gainLabel); - - layoutGains->addLayout(layout); - - std::vector gain_values = pair.second; - - connect(gainSlider, SIGNAL(valueChanged(int)), - this, SLOT(on_sldGain_valueChanged(int))); - - if ( gain_values.size() ) { - gainSlider->setRange(0, gain_values.size() - 1); - gainSlider->setValue(gain_values.size() / 4); - gainSlider->setEnabled(true); - } else { - gainSlider->setEnabled(false); - } - } - - // Sample rate - - if (m_sampRates.size()) { - for ( uint i = 0; i < m_sampRates.size(); i++ ) - ui->cboSampleRate->addItem( QString::number(m_sampRates[i] / 1e6) ); - } - - if ( ui->cboSampleRate->count() ) { - ui->cboSampleRate->setEnabled(true); - } else { - ui->cboSampleRate->setEnabled(false); - } - - // Antenna - - if ( m_antennas.size() ) { - for ( uint i = 0; i < m_antennas.size(); i++ ) - ui->cboAntennas->addItem( m_antennas[i] ); - } - - if (ui->cboAntennas->count()) { - ui->cboAntennas->setEnabled(true); - } else { - ui->cboAntennas->setEnabled(false); - } - - // DC offset policy - - if ( m_dcoffs.size() ) { - for ( uint i = 0; i < m_dcoffs.size(); i++ ) - ui->cboDCOffset->addItem( m_dcoffs[i] ); - } - - if (ui->cboDCOffset->count()) { - ui->cboDCOffset->setEnabled(true); - } else { - ui->cboDCOffset->setEnabled(false); - } - - // I/Q balance policy - - if ( m_iqbals.size() ) { - for ( uint i = 0; i < m_iqbals.size(); i++ ) - ui->cboIQBalance->addItem( m_iqbals[i] ); - } - - if (ui->cboIQBalance->count()) { - ui->cboIQBalance->setEnabled(true); - } else { - ui->cboIQBalance->setEnabled(false); - } - - // Bandwidths - - for ( uint i = 0; i < m_bandwidths.size(); i++ ) { - if ( 0.0 == m_bandwidths[i] ) - ui->cboBandwidth->addItem( "Auto" ); - else - ui->cboBandwidth->addItem( QString::number(m_bandwidths[i] / 1e6) ); - } - - if ( ui->cboBandwidth->count() ) { - ui->cboBandwidth->setEnabled(true); - } else { - ui->cboBandwidth->setEnabled(false); - } -} - -void GNURadioGui::displaySettings() -{ - int oldIndex = 0; - - // Device list - - oldIndex = ui->cboDevices->currentIndex(); - QString oldArgs = ui->txtDeviceArgs->text(); - - if ( ui->cboDevices->count() && oldIndex >= 0 ) - { - if ( oldIndex > ui->cboDevices->count() - 1 ) - oldIndex = 0; - - ui->cboDevices->setCurrentIndex(oldIndex); - - if ( oldArgs.length() == 0 ) - ui->txtDeviceArgs->setText( m_devs[oldIndex].second ); - } - - if ( oldArgs.length() ) - ui->txtDeviceArgs->setText( oldArgs ); - - // Center frequency - - ui->centerFrequency->setValueRange(7, - unsigned(m_freqMin / 1000.0), - unsigned(m_freqMax / 1000.0)); - - ui->centerFrequency->setValue(m_generalSettings.m_centerFrequency / 1000); - - // Device specific gain controls - - for ( uint i = 0; i < m_namedGains.size(); i++ ) - { - double gain = m_settings.m_namedGains[i].second; - int sliderIndex = getGainIndex(m_namedGains[i].second, gain); - m_gainSliders[i]->setValue(sliderIndex); - m_gainLabels[i]->setText(tr("%1").arg(gain)); - } - - // Frequency correction - - ui->sldFreqCorr->setRange(-100, +100); - ui->sldFreqCorr->setValue( m_freqCorr ); - ui->lblFreqCorr->setText(tr("%1").arg(ui->sldFreqCorr->value())); - - // Sample rate - ui->cboSampleRate->setCurrentIndex(getSampleRateIndex(m_settings.m_sampRate)); - - // Antenna - ui->cboAntennas->setCurrentIndex(getAntennaIndex(m_settings.m_antenna)); - - // DC offset policy - ui->cboDCOffset->setCurrentIndex(getDCOffsetIndex(m_settings.m_dcoff)); - - // I/Q balance policy - ui->cboIQBalance->setCurrentIndex(getIQBalanceIndex(m_settings.m_iqbal)); - - // Bandwidth - ui->cboBandwidth->setCurrentIndex(getBandwidthIndex(m_settings.m_bandwidth)); -} - -int GNURadioGui::getSampleRateIndex(double sampleRate) -{ - int index = m_sampRates.size() - 1; - - for ( uint i = 0; i < m_sampRates.size(); i++ ) { - if (sampleRate >= m_sampRates[i]) { - index = i; - } - } - - return index; -} - -int GNURadioGui::getGainIndex(std::vector steps, double gain) -{ - int index = 0; - - for (std::vector::const_iterator it = steps.begin(); it != steps.end(); ++it, index++) { - if (gain <= *it) { - break; - } - } - - return index; -} - -int GNURadioGui::getBandwidthIndex(double bandwidth) -{ - int index = 0; - - for ( uint i = 0; i < m_bandwidths.size(); index++ ) { - if (bandwidth <= m_bandwidths[i]) { - break; - } - } - - return index; -} - -int GNURadioGui::getDCOffsetIndex(QString offsetStr) -{ - for ( uint i = 0; i < m_dcoffs.size(); i++ ) { - if (offsetStr == m_dcoffs[i]) { - return i; - } - } - - return 0; -} - -int GNURadioGui::getIQBalanceIndex(QString iqBalanceStr) -{ - for ( uint i = 0; i < m_iqbals.size(); i++ ) { - if (iqBalanceStr == m_iqbals[i]) { - return i; - } - } - - return 0; -} - -int GNURadioGui::getAntennaIndex(QString antennaStr) -{ - for ( uint i = 0; i < m_antennas.size(); i++ ) { - if (antennaStr == m_antennas[i]) { - return i; - } - } - - return 0; -} - -void GNURadioGui::sendSettings() -{ - if(!m_updateTimer.isActive()) - m_updateTimer.start(100); -} - -void GNURadioGui::updateHardware() -{ - m_updateTimer.stop(); - GNURadioInput::MsgConfigureGNURadio* msg = GNURadioInput::MsgConfigureGNURadio::create(m_generalSettings, m_settings); - msg->submit(m_pluginAPI->getDSPEngineMessageQueue()); -} - -void GNURadioGui::on_cboDevices_currentIndexChanged(int index) -{ - if ( index < 0 || index >= m_devs.count() ) - return; - - ui->txtDeviceArgs->setText( m_devs[index].second ); -} - -void GNURadioGui::on_txtDeviceArgs_textChanged(const QString &arg1) -{ - m_settings.m_args = arg1; - sendSettings(); -} - -void GNURadioGui::on_centerFrequency_changed(quint64 value) -{ - m_generalSettings.m_centerFrequency = value * 1000; - sendSettings(); -} - -void GNURadioGui::on_sldFreqCorr_valueChanged(int value) -{ - ui->lblFreqCorr->setText(tr("%1").arg(value)); - m_settings.m_freqCorr = value; - sendSettings(); -} - -void GNURadioGui::on_sldGain_valueChanged(int value) -{ - m_settings.m_namedGains.clear(); - - for ( int i = 0; i < m_gainControls.size(); i++ ) - { - QPair< QSlider*, QLabel* > controls = m_gainControls[i]; - - QSlider *slider = controls.first; - QLabel *label = controls.second; - - std::pair< QString, std::vector > named_gain = m_namedGains[ i ]; - - int index = slider->value(); - double gain = named_gain.second[index]; - label->setText(tr("%1").arg(gain)); - - QPair< QString, double > named_gain2( named_gain.first, gain ); - m_settings.m_namedGains.push_back( named_gain2 ); - } - - sendSettings(); -} - -void GNURadioGui::on_cboSampleRate_currentIndexChanged(int index) -{ - if ( index < 0 || (uint)index >= m_sampRates.size() ) - return; - - m_settings.m_sampRate = m_sampRates[index]; - sendSettings(); -} - -void GNURadioGui::on_cboAntennas_currentIndexChanged(const QString &arg1) -{ - m_settings.m_antenna = arg1; - sendSettings(); -} - -void GNURadioGui::on_cboDCOffset_currentIndexChanged(const QString &arg1) -{ - m_settings.m_dcoff = arg1; - sendSettings(); -} - -void GNURadioGui::on_cboIQBalance_currentIndexChanged(const QString &arg1) -{ - m_settings.m_iqbal = arg1; - sendSettings(); -} - -void GNURadioGui::on_cboBandwidth_currentIndexChanged(int index) -{ - if ( index < 0 || (uint)index >= m_bandwidths.size() ) - return; - - m_settings.m_bandwidth = m_bandwidths[index]; - sendSettings(); -} diff --git a/plugins/samplesource/gnuradio/gnuradiogui.h b/plugins/samplesource/gnuradio/gnuradiogui.h deleted file mode 100644 index 2fcbeb42b..000000000 --- a/plugins/samplesource/gnuradio/gnuradiogui.h +++ /dev/null @@ -1,107 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2012 maintech GmbH, Otto-Hahn-Str. 15, 97204 Hoechberg, Germany // -// written by Christian Daniel // -// Copyright (C) 2013 by Dimitri Stolnikov // -// // -// This program is free software; you can redistribute it and/or modify // -// it under the terms of the GNU General Public License as published by // -// the Free Software Foundation as version 3 of the License, or // -// // -// This program is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU General Public License V3 for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with this program. If not, see . // -/////////////////////////////////////////////////////////////////////////////////// - -#ifndef INCLUDE_GNURADIOGUI_H -#define INCLUDE_GNURADIOGUI_H - -#include -#include -#include -#include -#include -#include -#include "plugin/plugingui.h" -#include "gnuradioinput.h" - -namespace Ui { -class GNURadioGui; -} - -class PluginAPI; - -class GNURadioGui : public QWidget, public PluginGUI { - Q_OBJECT - -public: - explicit GNURadioGui(PluginAPI* pluginAPI, QWidget* parent = NULL); - ~GNURadioGui(); - void destroy(); - - void setName(const QString& name); - - void resetToDefaults(); - QByteArray serializeGeneral() const; - bool deserializeGeneral(const QByteArray&data); - quint64 getCenterFrequency() const; - QByteArray serialize() const; - bool deserialize(const QByteArray& data); - bool handleMessage(Message* message); - -private: - Ui::GNURadioGui* ui; - PluginAPI* m_pluginAPI; - QList< QPair > m_devs; - std::vector< std::pair< QString, std::vector > > m_namedGains; - double m_freqMin; - double m_freqMax; - double m_freqCorr; - std::vector m_sampRates; - std::vector m_antennas; - std::vector m_dcoffs; - std::vector m_iqbals; - std::vector m_bandwidths; - - std::vector< QSlider* > m_gainSliders; - std::vector< QLabel* > m_gainLabels; - - QList< QPair< QSlider*, QLabel* > > m_gainControls; - - GNURadioInput::Settings m_settings; - SampleSource* m_sampleSource; - SampleSource::GeneralSettings m_generalSettings; - QTimer m_updateTimer; - - void updateDisplayDevices(); - void updateDisplayConstants(); - void displaySettings(); - void sendSettings(); - -private slots: - void updateHardware(); - int getSampleRateIndex(double sampleRate); - int getDCOffsetIndex(QString offsetStr); - int getIQBalanceIndex(QString iqBalanceStr); - int getAntennaIndex(QString antennaStr); - int getBandwidthIndex(double bandwidth); - int getGainIndex(std::vector steps, double gain); - - void on_cboDevices_currentIndexChanged(int index); - void on_txtDeviceArgs_textChanged(const QString &arg1); - void on_centerFrequency_changed(quint64 value); - void on_sldFreqCorr_valueChanged(int value); - - void on_sldGain_valueChanged(int value); - - void on_cboSampleRate_currentIndexChanged(int index); - void on_cboAntennas_currentIndexChanged(const QString &arg1); - void on_cboDCOffset_currentIndexChanged(const QString &arg1); - void on_cboIQBalance_currentIndexChanged(const QString &arg1); - void on_cboBandwidth_currentIndexChanged(int index); -}; - -#endif // INCLUDE_GNURADIOGUI_H diff --git a/plugins/samplesource/gnuradio/gnuradiogui.ui b/plugins/samplesource/gnuradio/gnuradiogui.ui deleted file mode 100644 index 9a61adb0a..000000000 --- a/plugins/samplesource/gnuradio/gnuradiogui.ui +++ /dev/null @@ -1,319 +0,0 @@ - - - GNURadioGui - - - - 0 - 0 - 246 - 310 - - - - - 0 - 0 - - - - - Sans Serif - 9 - - - - Gnuradio Source - - - - 3 - - - 0 - - - 2 - - - 0 - - - 2 - - - - - - - 2 - - - - - true - - - - 0 - 0 - - - - false - - - QComboBox::AdjustToMinimumContentsLength - - - - - - - true - - - - - - - - - - - Qt::Horizontal - - - - - - - - - Qt::Horizontal - - - - 0 - 0 - - - - - - - - - 0 - 0 - - - - - 32 - 16 - - - - - Monospace - 20 - - - - Qt::StrongFocus - - - Tuner center frequency in kHz - - - - - - - - Sans Serif - - - - kHz - - - - - - - Qt::Horizontal - - - - 0 - 0 - - - - - - - - - - Qt::Horizontal - - - - - - - 3 - - - - - Freq. Corr. - - - - - - - -100 - - - 100 - - - true - - - Qt::Horizontal - - - - - - - - 30 - 0 - - - - Qt::LeftToRight - - - - - - Qt::AlignCenter - - - - - - - - - - - - 3 - - - - - Sample Rate (MHz) - - - Qt::AutoText - - - - - - - QComboBox::AdjustToMinimumContentsLength - - - - - - - - - 3 - - - - - Selected Antenna - - - - - - - true - - - - - - - - - - - DC Offset Corr. - - - - - - - - - - - - 3 - - - - - IQ Imbalance Corr. - - - - - - - - - - - - - - Bandwidth (MHz) - - - - - - - - - - - - - ValueDial - QWidget -
gui/valuedial.h
- 1 - - - - - diff --git a/plugins/samplesource/gnuradio/gnuradioinput.cpp b/plugins/samplesource/gnuradio/gnuradioinput.cpp deleted file mode 100644 index 996abf7cd..000000000 --- a/plugins/samplesource/gnuradio/gnuradioinput.cpp +++ /dev/null @@ -1,350 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2012 maintech GmbH, Otto-Hahn-Str. 15, 97204 Hoechberg, Germany // -// written by Christian Daniel // -// Copyright (C) 2013 by Dimitri Stolnikov // -// // -// This program is free software; you can redistribute it and/or modify // -// it under the terms of the GNU General Public License as published by // -// the Free Software Foundation as version 3 of the License, or // -// // -// This program is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU General Public License V3 for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with this program. If not, see . // -/////////////////////////////////////////////////////////////////////////////////// - -#include -#include -#include "util/simpleserializer.h" -#include "gnuradioinput.h" -#include "gnuradiothread.h" -#include "gnuradiogui.h" - -MESSAGE_CLASS_DEFINITION(GNURadioInput::MsgConfigureGNURadio, Message) -MESSAGE_CLASS_DEFINITION(GNURadioInput::MsgReportGNURadio, Message) - -GNURadioInput::Settings::Settings() : - m_args(""), - m_freqCorr(0), - m_sampRate(0), - m_antenna(""), - m_dcoff("Keep"), - m_iqbal("Keep"), - m_bandwidth(0) -{ -} - -void GNURadioInput::Settings::resetToDefaults() -{ - m_args = ""; - m_sampRate = 0; - m_freqCorr = 0; - m_antenna = ""; - m_dcoff = "Keep"; - m_iqbal = "Keep"; - m_bandwidth = 0; -} - -QByteArray GNURadioInput::Settings::serialize() const -{ - SimpleSerializer s(1); - s.writeString(1, m_args); - s.writeDouble(2, m_freqCorr); - s.writeDouble(3, m_sampRate); - s.writeString(4, m_antenna); - s.writeString(5, m_dcoff); - s.writeString(6, m_iqbal); - s.writeDouble(7, m_bandwidth); - - for (int i=0; i < m_namedGains.size(); i++) - { - s.writeDouble(100+i, m_namedGains[i].second); - } - - return s.final(); -} - -bool GNURadioInput::Settings::deserialize(const QByteArray& data) -{ - SimpleDeserializer d(data); - - if(!d.isValid()) { - resetToDefaults(); - return false; - } - - if(d.getVersion() == 1) { - d.readString(1, &m_args, ""); - d.readDouble(2, &m_freqCorr, 0); - d.readDouble(3, &m_sampRate, 0); - d.readString(4, &m_antenna, ""); - d.readString(5, &m_dcoff, "Keep"); - d.readString(6, &m_iqbal, "Keep"); - d.readDouble(7, &m_bandwidth, 0); - - for (int i = 0; i < m_namedGains.size(); i++) - { - double value; - d.readDouble(100+i, &value, 0); - m_namedGains[i].second = value; - } - - return true; - } else { - resetToDefaults(); - return false; - } -} - -GNURadioInput::GNURadioInput(MessageQueue* msgQueueToGUI) : - SampleSource(msgQueueToGUI), - m_settings(), - m_GnuradioThread(NULL), - m_deviceDescription() -{ -} - -GNURadioInput::~GNURadioInput() -{ - stopInput(); -} - -bool GNURadioInput::startInput(int device) -{ - double freqMin = 0, freqMax = 0, freqCorr = 0; - std::vector< std::pair< QString, std::vector > > namedGains; - std::vector< double > sampRates; - std::vector< QString > antennas; - std::vector< double > bandwidths; - - QMutexLocker mutexLocker(&m_mutex); - - if(m_GnuradioThread != NULL) - stopInput(); - - if(!m_sampleFifo.setSize( 2 * 1024 * 1024 )) { - qCritical("Could not allocate SampleFifo"); - return false; - } - - m_deviceDescription = m_settings.m_args; - - // pass device arguments from the gui - m_GnuradioThread = new GnuradioThread(m_settings.m_args, &m_sampleFifo); - if(m_GnuradioThread == NULL) { - qFatal("out of memory"); - goto failed; - } - m_GnuradioThread->startWork(); - - mutexLocker.unlock(); - //applySettings(m_generalSettings, m_settings, true); - - if(m_GnuradioThread != NULL) { - osmosdr::source::sptr radio = m_GnuradioThread->radio(); - - try { - osmosdr::freq_range_t freq_rage = radio->get_freq_range(); - freqMin = freq_rage.start(); - freqMax = freq_rage.stop(); - } catch ( std::exception &ex ) { - qDebug("%s", ex.what()); - } - - freqCorr = radio->get_freq_corr(); - - namedGains.clear(); - m_settings.m_namedGains.clear(); - std::vector< std::string > gain_names = radio->get_gain_names(); - for ( uint i = 0; i < gain_names.size(); i++ ) - { - std::string gain_name = gain_names[i]; - - try { - std::vector< double > gain_values = \ - radio->get_gain_range( gain_name ).values(); - - std::pair< QString, std::vector > pair( gain_name.c_str(), - gain_values ); - - namedGains.push_back( pair ); - - QPair< QString, double > pair2( gain_name.c_str(), 0 ); - - m_settings.m_namedGains.push_back( pair2 ); - } catch ( std::exception &ex ) { - qDebug("%s", ex.what()); - } - } - - try { - sampRates = radio->get_sample_rates().values(); - } catch ( std::exception &ex ) { - qDebug("%s", ex.what()); - } - - antennas.clear(); - std::vector< std::string > ant = radio->get_antennas(); - for ( uint i = 0; i < ant.size(); i++ ) - antennas.push_back( QString( ant[i].c_str() ) ); - - m_dcoffs.clear(); - m_dcoffs.push_back( "Off" ); - m_dcoffs.push_back( "Keep" ); - m_dcoffs.push_back( "Auto" ); - - m_iqbals.clear(); - m_iqbals.push_back( "Off" ); - m_iqbals.push_back( "Keep" ); - m_iqbals.push_back( "Auto" ); - - try { - bandwidths = radio->get_bandwidth_range().values(); - } catch ( std::exception &ex ) { - qDebug("%s", ex.what()); - } - } - - qDebug("GnuradioInput: start"); - MsgReportGNURadio::create(freqMin, freqMax, freqCorr, namedGains, - sampRates, antennas, m_dcoffs, m_iqbals, - bandwidths) - ->submit(m_guiMessageQueue); - - return true; - -failed: - stopInput(); - return false; -} - -void GNURadioInput::stopInput() -{ - QMutexLocker mutexLocker(&m_mutex); - - if(m_GnuradioThread != NULL) { - m_GnuradioThread->stopWork(); - delete m_GnuradioThread; - m_GnuradioThread = NULL; - } - - m_deviceDescription.clear(); -} - -const QString& GNURadioInput::getDeviceDescription() const -{ - return m_deviceDescription; -} - -int GNURadioInput::getSampleRate() const -{ - return m_settings.m_sampRate; -} - -quint64 GNURadioInput::getCenterFrequency() const -{ - return m_generalSettings.m_centerFrequency; -} - -bool GNURadioInput::handleMessage(Message* message) -{ - if(MsgConfigureGNURadio::match(message)) { - MsgConfigureGNURadio* conf = (MsgConfigureGNURadio*)message; - if(!applySettings(conf->getGeneralSettings(), conf->getSettings(), false)) - qDebug("Gnuradio config error"); - return true; - } else { - return false; - } -} - -bool GNURadioInput::applySettings(const GeneralSettings& generalSettings, - const Settings& settings, - bool force) -{ - QMutexLocker mutexLocker(&m_mutex); - - m_settings.m_args = settings.m_args; - - if ( NULL == m_GnuradioThread ) - return true; - - osmosdr::source::sptr radio = m_GnuradioThread->radio(); - - try { - - if((m_settings.m_freqCorr != settings.m_freqCorr) || force) { - m_settings.m_freqCorr = settings.m_freqCorr; - radio->set_freq_corr( m_settings.m_freqCorr ); - } - - if((m_generalSettings.m_centerFrequency != generalSettings.m_centerFrequency) || force) { - m_generalSettings.m_centerFrequency = generalSettings.m_centerFrequency; - radio->set_center_freq( m_generalSettings.m_centerFrequency ); - } - - for ( int i = 0; i < settings.m_namedGains.size(); i++ ) - { - if((m_settings.m_namedGains[i].second != settings.m_namedGains[i].second) || force) { - m_settings.m_namedGains[i].second = settings.m_namedGains[i].second; - radio->set_gain( settings.m_namedGains[i].second, - settings.m_namedGains[i].first.toStdString() ); - } - } - - if((m_settings.m_sampRate != settings.m_sampRate) || force) { - m_settings.m_sampRate = settings.m_sampRate; - radio->set_sample_rate( m_settings.m_sampRate ); - } - - if((m_settings.m_antenna != settings.m_antenna) || force) { - m_settings.m_antenna = settings.m_antenna; - radio->set_antenna( m_settings.m_antenna.toStdString() ); - } - - /* Removed as it is incapable of handling it correctly (initialize at "Keep"). - * For BladeRF it must be done via bladerRF-cli */ - if((m_settings.m_dcoff != settings.m_dcoff) || force) { - m_settings.m_dcoff = settings.m_dcoff; - - for ( uint i = 0; i < m_dcoffs.size(); i++ ) - { - if ( m_dcoffs[i] != m_settings.m_dcoff ) - continue; - - //radio->set_dc_offset_mode( i ); - break; - } - } - - if((m_settings.m_iqbal != settings.m_iqbal) || force) { - m_settings.m_iqbal = settings.m_iqbal; - - for ( uint i = 0; i < m_iqbals.size(); i++ ) - { - if ( m_iqbals[i] != m_settings.m_iqbal ) - continue; - - //radio->set_iq_balance_mode( i ); - break; - } - } - - if((m_settings.m_bandwidth != settings.m_bandwidth) || - (0.0f == settings.m_bandwidth) || force) { - m_settings.m_bandwidth = settings.m_bandwidth; - /* setting the BW to 0.0 triggers automatic bandwidth - * selection when supported by device */ - radio->set_bandwidth( m_settings.m_bandwidth ); - } - - } catch ( std::exception &ex ) { - qDebug("%s", ex.what()); - return false; - } - - return true; -} diff --git a/plugins/samplesource/gnuradio/gnuradioinput.h b/plugins/samplesource/gnuradio/gnuradioinput.h deleted file mode 100644 index de2da43fe..000000000 --- a/plugins/samplesource/gnuradio/gnuradioinput.h +++ /dev/null @@ -1,156 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2012 maintech GmbH, Otto-Hahn-Str. 15, 97204 Hoechberg, Germany // -// written by Christian Daniel // -// Copyright (C) 2013 by Dimitri Stolnikov // -// // -// This program is free software; you can redistribute it and/or modify // -// it under the terms of the GNU General Public License as published by // -// the Free Software Foundation as version 3 of the License, or // -// // -// This program is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU General Public License V3 for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with this program. If not, see . // -/////////////////////////////////////////////////////////////////////////////////// - -#ifndef INCLUDE_GNURADIOINPUT_H -#define INCLUDE_GNURADIOINPUT_H - -#include "dsp/samplesource/samplesource.h" -#include -#include - -class GnuradioThread; - -class GNURadioInput : public SampleSource { -public: - struct Settings { - QString m_args; - double m_freqMin; - double m_freqMax; - double m_freqCorr; - QList< QPair< QString, double > > m_namedGains; - double m_sampRate; - QString m_antenna; - QString m_dcoff; - QString m_iqbal; - double m_bandwidth; - - Settings(); - void resetToDefaults(); - QByteArray serialize() const; - bool deserialize(const QByteArray& data); - }; - - class MsgConfigureGNURadio : public Message { - MESSAGE_CLASS_DECLARATION - - public: - const GeneralSettings& getGeneralSettings() const { return m_generalSettings; } - const Settings& getSettings() const { return m_settings; } - - static MsgConfigureGNURadio* create(const GeneralSettings& generalSettings, const Settings& settings) - { - return new MsgConfigureGNURadio(generalSettings, settings); - } - - protected: - GeneralSettings m_generalSettings; - Settings m_settings; - - MsgConfigureGNURadio(const GeneralSettings& generalSettings, const Settings& settings) : - Message(), - m_generalSettings(generalSettings), - m_settings(settings) - { } - }; - - class MsgReportGNURadio : public Message { - MESSAGE_CLASS_DECLARATION - - public: - const std::vector< std::pair< QString, std::vector > >& getNamedGains() const { return m_namedGains; } - const double getFreqMin() const { return m_freqMin; } - const double getFreqMax() const { return m_freqMax; } - const double getFreqCorr() const { return m_freqCorr; } - const std::vector& getSampRates() const { return m_sampRates; } - const std::vector& getAntennas() const { return m_antennas; } - const std::vector& getDCOffs() const { return m_dcoffs; } - const std::vector& getIQBals() const { return m_iqbals; } - const std::vector& getBandwidths() const { return m_bandwidths; } - - static MsgReportGNURadio* create(const double freqMin, - const double freqMax, - const double freqCorr, - const std::vector< std::pair< QString, std::vector > >& namedGains, - const std::vector& sampRates, - const std::vector& antennas, - const std::vector& dcoffs, - const std::vector& iqbals, - const std::vector& bandwidths) - { - return new MsgReportGNURadio(freqMin, freqMax, freqCorr, namedGains, sampRates, antennas, dcoffs, iqbals, bandwidths); - } - - protected: - double m_freqMin; - double m_freqMax; - double m_freqCorr; - std::vector< std::pair< QString, std::vector > > m_namedGains; - std::vector m_sampRates; - std::vector m_antennas; - std::vector m_dcoffs; - std::vector m_iqbals; - std::vector m_bandwidths; - - MsgReportGNURadio(const double freqMin, - const double freqMax, - const double freqCorr, - const std::vector< std::pair< QString, std::vector > >& namedGains, - const std::vector& sampRates, - const std::vector& antennas, - const std::vector& dcoffs, - const std::vector& iqbals, - const std::vector& bandwidths) : - Message(), - m_freqMin(freqMin), - m_freqMax(freqMax), - m_freqCorr(freqCorr), - m_namedGains(namedGains), - m_sampRates(sampRates), - m_antennas(antennas), - m_dcoffs(dcoffs), - m_iqbals(iqbals), - m_bandwidths(bandwidths) - { } - }; - - GNURadioInput(MessageQueue* msgQueueToGUI); - ~GNURadioInput(); - - bool startInput(int device); - void stopInput(); - - const QString& getDeviceDescription() const; - int getSampleRate() const; - quint64 getCenterFrequency() const; - - bool handleMessage(Message* message); - -private: - QMutex m_mutex; - Settings m_settings; - GnuradioThread* m_GnuradioThread; - QString m_deviceDescription; - std::vector< QString > m_dcoffs; - std::vector< QString > m_iqbals; - - bool applySettings(const GeneralSettings& generalSettings, - const Settings& settings, - bool force); -}; - -#endif // INCLUDE_GNURADIOINPUT_H diff --git a/plugins/samplesource/gnuradio/gnuradioplugin.cpp b/plugins/samplesource/gnuradio/gnuradioplugin.cpp deleted file mode 100644 index 6702ad330..000000000 --- a/plugins/samplesource/gnuradio/gnuradioplugin.cpp +++ /dev/null @@ -1,52 +0,0 @@ -#include -#include -#include "plugin/pluginapi.h" -#include "util/simpleserializer.h" -#include "gnuradioplugin.h" -#include "gnuradiogui.h" - -const PluginDescriptor GNURadioPlugin::m_pluginDescriptor = { - QString("GR-OsmoSDR Input"), - QString("1.0"), - QString("(c) Edouard Griffiths, F4EXB"), - QString("https://github.com/f4exb/rtl-sdrangelove/tree/f4exb"), - true, - QString("https://github.com/f4exb/rtl-sdrangelove/tree/f4exb") -}; - -GNURadioPlugin::GNURadioPlugin(QObject* parent) : - QObject(parent) -{ -} - -const PluginDescriptor& GNURadioPlugin::getPluginDescriptor() const -{ - return m_pluginDescriptor; -} - -void GNURadioPlugin::initPlugin(PluginAPI* pluginAPI) -{ - m_pluginAPI = pluginAPI; - - m_pluginAPI->registerSampleSource("org.osmocom.sdr.samplesource.gr-osmosdr", this); -} - -PluginInterface::SampleSourceDevices GNURadioPlugin::enumSampleSources() -{ - SampleSourceDevices result; - - result.append(SampleSourceDevice("GNURadio OsmoSDR Driver", "org.osmocom.sdr.samplesource.gr-osmosdr", QByteArray())); - - return result; -} - -PluginGUI* GNURadioPlugin::createSampleSourcePluginGUI(const QString& sourceName, const QByteArray& address) -{ - if(sourceName == "org.osmocom.sdr.samplesource.gr-osmosdr") { - GNURadioGui* gui = new GNURadioGui(m_pluginAPI); - m_pluginAPI->setInputGUI(gui); - return gui; - } else { - return NULL; - } -} diff --git a/plugins/samplesource/gnuradio/gnuradioplugin.h b/plugins/samplesource/gnuradio/gnuradioplugin.h deleted file mode 100644 index a8ca7cc1e..000000000 --- a/plugins/samplesource/gnuradio/gnuradioplugin.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef INCLUDE_GNURADIOPLUGIN_H -#define INCLUDE_GNURADIOPLUGIN_H - -#include -#include "plugin/plugininterface.h" - -class GNURadioPlugin : public QObject, PluginInterface { - Q_OBJECT - Q_INTERFACES(PluginInterface) - Q_PLUGIN_METADATA(IID "org.osmocom.sdr.samplesource.gr-osmosdr") - -public: - explicit GNURadioPlugin(QObject* parent = NULL); - - const PluginDescriptor& getPluginDescriptor() const; - void initPlugin(PluginAPI* pluginAPI); - - SampleSourceDevices enumSampleSources(); - PluginGUI* createSampleSourcePluginGUI(const QString& sourceName, const QByteArray& address); - -private: - static const PluginDescriptor m_pluginDescriptor; - - PluginAPI* m_pluginAPI; -}; - -#endif // INCLUDE_GNURADIOPLUGIN_H diff --git a/plugins/samplesource/gnuradio/gnuradiothread.cpp b/plugins/samplesource/gnuradio/gnuradiothread.cpp deleted file mode 100644 index 9e70d3ebb..000000000 --- a/plugins/samplesource/gnuradio/gnuradiothread.cpp +++ /dev/null @@ -1,144 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2012 maintech GmbH, Otto-Hahn-Str. 15, 97204 Hoechberg, Germany // -// written by Christian Daniel // -// Copyright (C) 2013 by Dimitri Stolnikov // -// // -// This program is free software; you can redistribute it and/or modify // -// it under the terms of the GNU General Public License as published by // -// the Free Software Foundation as version 3 of the License, or // -// // -// This program is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU General Public License V3 for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with this program. If not, see . // -/////////////////////////////////////////////////////////////////////////////////// - -#include -#include -#include "gnuradiothread.h" -#include "dsp/samplefifo.h" - -#include -#include - -//////////////////////////////////////////////////////////////////////////////// -class gr_adaptor; - -typedef boost::shared_ptr< gr_adaptor > gr_adaptor_sptr; - -gr_adaptor_sptr make_gr_adaptor (SampleFifo* sampleFifo); - -class gr_adaptor : public gr::sync_block -{ -public: - gr_adaptor (SampleFifo* sampleFifo); - ~gr_adaptor (); - - int work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); - -private: - SampleFifo *m_sampleFifo; -}; - -gr_adaptor_sptr -make_gr_adaptor (SampleFifo *sampleFifo) -{ - return gr_adaptor_sptr (new gr_adaptor (sampleFifo)); -} - -gr_adaptor::gr_adaptor (SampleFifo *sampleFifo) - : gr::sync_block("gr_adaptor", - gr::io_signature::make(1, 1, sizeof (gr_complex)), - gr::io_signature::make(0, 0, 0)), - m_sampleFifo(sampleFifo) -{ -} - -gr_adaptor::~gr_adaptor () -{ -} - -int -gr_adaptor::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - const gr_complex *in = (const gr_complex *) input_items[0]; - - std::vector buffer(noutput_items * 2, 0); - std::vector::iterator it = buffer.begin(); - - for (int i = 0; i < noutput_items; i++) - { - *it++ = in[i].real() * 32000; - *it++ = in[i].imag() * 32000; - } - - // we must push at least 4 bytes into the fifo - m_sampleFifo->write((const quint8*)buffer.data(), - (it - buffer.begin()) * sizeof(qint16)); - - // Tell runtime system how many input items we consumed on - // each input stream. - consume_each(noutput_items); - - // Tell runtime system how many output items we produced. - return 0; -} - -//////////////////////////////////////////////////////////////////////////////// -GnuradioThread::GnuradioThread(QString args, SampleFifo* sampleFifo, QObject* parent) : - QThread(parent), - m_running(false), - m_args(args), - m_sampleFifo(sampleFifo) -{ -} - -GnuradioThread::~GnuradioThread() -{ - stopWork(); -} - -void GnuradioThread::startWork() -{ - m_startWaitMutex.lock(); - - start(); - while(!m_running) - m_startWaiter.wait(&m_startWaitMutex, 100); - - m_startWaitMutex.unlock(); -} - -void GnuradioThread::stopWork() -{ - m_running = false; - - m_top->stop(); - - wait(); -} - -void GnuradioThread::run() -{ - m_top = gr::make_top_block( "flowgraph" ); - m_src = osmosdr::source::make( m_args.toStdString() ); - - /* now since we've constructed our shared objects, we allow the calling - * thread to continue it's work and send some radio settings to us. */ - m_running = true; - m_startWaiter.wakeAll(); - - gr_adaptor_sptr adaptor = make_gr_adaptor(m_sampleFifo); - m_top->connect(m_src, 0, adaptor, 0); - - m_top->run(); - - m_running = false; -} diff --git a/plugins/samplesource/gnuradio/gnuradiothread.h b/plugins/samplesource/gnuradio/gnuradiothread.h deleted file mode 100644 index 651238d51..000000000 --- a/plugins/samplesource/gnuradio/gnuradiothread.h +++ /dev/null @@ -1,64 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2012 maintech GmbH, Otto-Hahn-Str. 15, 97204 Hoechberg, Germany // -// written by Christian Daniel // -// Copyright (C) 2013 by Dimitri Stolnikov // -// // -// This program is free software; you can redistribute it and/or modify // -// it under the terms of the GNU General Public License as published by // -// the Free Software Foundation as version 3 of the License, or // -// // -// This program is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU General Public License V3 for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with this program. If not, see . // -/////////////////////////////////////////////////////////////////////////////////// - -#ifndef INCLUDE_GNURADIOTHREAD_H -#define INCLUDE_GNURADIOTHREAD_H - -#include -#include -#include - -#include -#include - -class SampleFifo; - -class GnuradioThread : public QThread { - Q_OBJECT - -public: - GnuradioThread(QString args, SampleFifo* sampleFifo, QObject* parent = NULL); - ~GnuradioThread(); - - void startWork(); - void stopWork(); - - osmosdr::source::sptr radio() { return m_src; } - -private: -#pragma pack(push, 1) - struct Sample { - qint16 i; - qint16 q; - }; -#pragma pack(pop) - - QMutex m_startWaitMutex; - QWaitCondition m_startWaiter; - bool m_running; - - QString m_args; - SampleFifo* m_sampleFifo; - - gr::top_block_sptr m_top; - osmosdr::source::sptr m_src; - - void run(); -}; - -#endif // INCLUDE_GNURADIOTHREAD_H diff --git a/plugins/samplesource/osmosdr/CMakeLists.txt b/plugins/samplesource/osmosdr/CMakeLists.txt deleted file mode 100644 index 9dc97059d..000000000 --- a/plugins/samplesource/osmosdr/CMakeLists.txt +++ /dev/null @@ -1,54 +0,0 @@ -project(osmosdr) - -set(osmosdr_SOURCES - osmosdrgui.cpp - osmosdrinput.cpp - osmosdrplugin.cpp - osmosdrthread.cpp -) - -set(osmosdr_HEADERS - osmosdrgui.h - osmosdrinput.h - osmosdrplugin.h - osmosdrthread.h -) - -set(osmosdr_FORMS - osmosdrgui.ui -) - -include_directories( - . - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/include - ${CMAKE_SOURCE_DIR}/include-gpl - ${LIBOSMOSDR_INCLUDE_DIR} -) - -#include(${QT_USE_FILE}) -add_definitions(${QT_DEFINITIONS}) -add_definitions(-DQT_PLUGIN) -add_definitions(-DQT_SHARED) - -if(MSVC) -add_definitions(-DNOMINMAX) -endif() - -#qt4_wrap_cpp(osmosdr_HEADERS_MOC ${osmosdr_HEADERS}) -qt5_wrap_ui(osmosdr_FORMS_HEADERS ${osmosdr_FORMS}) - -add_library(inputosmosdr SHARED - ${osmosdr_SOURCES} - ${osmosdr_HEADERS_MOC} - ${osmosdr_FORMS_HEADERS} -) - -target_link_libraries(inputosmosdr - ${QT_LIBRARIES} - ${LIBOSMOSDR_LIBRARIES} - ${LIBUSB_LIBRARIES} - sdrbase -) - -qt5_use_modules(inputosmosdr Core Widgets OpenGL Multimedia) diff --git a/plugins/samplesource/osmosdr/osmosdrgui.cpp b/plugins/samplesource/osmosdr/osmosdrgui.cpp deleted file mode 100644 index 3ecaa355d..000000000 --- a/plugins/samplesource/osmosdr/osmosdrgui.cpp +++ /dev/null @@ -1,310 +0,0 @@ -#include "osmosdrgui.h" -#include "ui_osmosdrgui.h" -#include "plugin/pluginapi.h" - -OsmoSDRGui::OsmoSDRGui(PluginAPI* pluginAPI, QWidget* parent) : - QWidget(parent), - ui(new Ui::OsmoSDRGui), - m_pluginAPI(pluginAPI), - m_settings(), - m_sampleSource(NULL) -{ - ui->setupUi(this); - ui->centerFrequency->setValueRange(7, 20000U, 2200000U); - connect(&m_updateTimer, SIGNAL(timeout()), this, SLOT(updateHardware())); - displaySettings(); - - m_sampleSource = new OsmoSDRInput(m_pluginAPI->getMainWindowMessageQueue()); - m_pluginAPI->setSampleSource(m_sampleSource); -} - -OsmoSDRGui::~OsmoSDRGui() -{ - delete ui; -} - -void OsmoSDRGui::destroy() -{ - delete this; -} - -void OsmoSDRGui::setName(const QString& name) -{ - setObjectName(name); -} - -void OsmoSDRGui::resetToDefaults() -{ - m_generalSettings.resetToDefaults(); - m_settings.resetToDefaults(); - displaySettings(); - sendSettings(); -} - -QByteArray OsmoSDRGui::serializeGeneral() const -{ - return m_generalSettings.serialize(); -} - -bool OsmoSDRGui::deserializeGeneral(const QByteArray&data) -{ - if(m_generalSettings.deserialize(data)) { - displaySettings(); - sendSettings(); - return true; - } else { - resetToDefaults(); - return false; - } -} - -quint64 OsmoSDRGui::getCenterFrequency() const -{ - return m_generalSettings.m_centerFrequency; -} - -QByteArray OsmoSDRGui::serialize() const -{ - return m_settings.serialize(); -} - -bool OsmoSDRGui::deserialize(const QByteArray& data) -{ - if(m_settings.deserialize(data)) { - displaySettings(); - sendSettings(); - return true; - } else { - resetToDefaults(); - return false; - } -} - -bool OsmoSDRGui::handleMessage(Message* message) -{ - return false; - /* - if(message->id() == OsmoSDRInput::MsgReportOsmoSDR::ID()) { - m_gains = ((RTLSDRInput::MsgReportRTLSDR*)message)->getGains(); - displaySettings(); - message->completed(); - return true; - } else { - return false; - }*/ -} -#if 0 - -OsmoSDRGui::OsmoSDRGui(MessageQueue* msgQueue, QWidget* parent) : - SampleSourceGUI(parent), - ui(new Ui::OsmoSDRGui), - m_msgQueue(msgQueue), - m_settings() -{ - ui->setupUi(this); - ui->centerFrequency->setValueRange(7, 20000U, 2200000U); - connect(&m_updateTimer, SIGNAL(timeout()), this, SLOT(updateHardware())); - displaySettings(); -} - -OsmoSDRGui::~OsmoSDRGui() -{ - delete ui; -} - -QString OsmoSDRGui::serializeSettings() const -{ - return m_settings.serialize(); -} - -bool OsmoSDRGui::deserializeSettings(const QString& settings) -{ - if(m_settings.deserialize(settings)) { - displaySettings(); - sendSettings(); - return true; - } else { - return false; - } -} - -bool OsmoSDRGui::handleSourceMessage(DSPCmdSourceToGUI* cmd) -{ - return false; -} -#endif - -void OsmoSDRGui::displaySettings() -{ - ui->centerFrequency->setValue(m_generalSettings.m_centerFrequency / 1000); - ui->iqSwap->setChecked(m_settings.m_swapIQ); - ui->decimation->setValue(m_settings.m_decimation); - ui->e4000LNAGain->setValue(e4kLNAGainToIdx(m_settings.m_lnaGain)); - - ui->e4000MixerGain->setCurrentIndex((m_settings.m_mixerGain - 40) / 80); - if(m_settings.m_mixerEnhancement == 0) - ui->e4000MixerEnh->setCurrentIndex(0); - else ui->e4000MixerEnh->setCurrentIndex((m_settings.m_mixerEnhancement + 10) / 20); - - ui->e4000if1->setCurrentIndex((m_settings.m_if1gain + 30) / 90); - ui->e4000if2->setCurrentIndex(m_settings.m_if2gain / 30); - ui->e4000if3->setCurrentIndex(m_settings.m_if3gain / 30); - ui->e4000if4->setCurrentIndex(m_settings.m_if4gain / 10); - ui->e4000if5->setCurrentIndex(m_settings.m_if5gain / 30 - 1); - ui->e4000if6->setCurrentIndex(m_settings.m_if6gain / 30 - 1); - ui->filterI1->setValue(m_settings.m_opAmpI1); - ui->filterI2->setValue(m_settings.m_opAmpI2); - ui->filterQ1->setValue(m_settings.m_opAmpQ1); - ui->filterQ2->setValue(m_settings.m_opAmpQ2); - - ui->e4kI->setValue(m_settings.m_dcOfsI); - ui->e4kQ->setValue(m_settings.m_dcOfsQ); -} - -void OsmoSDRGui::sendSettings() -{ - if(!m_updateTimer.isActive()) - m_updateTimer.start(100); -} - -int OsmoSDRGui::e4kLNAGainToIdx(int gain) const -{ - static const quint32 gainList[13] = { - -50, -25, 0, 25, 50, 75, 100, 125, 150, 175, 200, 250, 300 - }; - for(int i = 0; i < 13; i++) { - if(gainList[i] == gain) - return i; - } - return 0; -} - -int OsmoSDRGui::e4kIdxToLNAGain(int idx) const -{ - static const quint32 gainList[13] = { - -50, -25, 0, 25, 50, 75, 100, 125, 150, 175, 200, 250, 300 - }; - if((idx < 0) || (idx >= 13)) - return -50; - else return gainList[idx]; -} - -void OsmoSDRGui::on_iqSwap_toggled(bool checked) -{ - m_settings.m_swapIQ = checked; - sendSettings(); -} - -void OsmoSDRGui::on_e4000MixerGain_currentIndexChanged(int index) -{ - m_settings.m_mixerGain = index * 80 + 40; - sendSettings(); -} - -void OsmoSDRGui::on_e4000MixerEnh_currentIndexChanged(int index) -{ - if(index == 0) - m_settings.m_mixerEnhancement = 0; - else m_settings.m_mixerEnhancement = index * 20 - 10; - sendSettings(); -} - -void OsmoSDRGui::on_e4000if1_currentIndexChanged(int index) -{ - m_settings.m_if1gain = index * 90 - 30; - sendSettings(); -} - -void OsmoSDRGui::on_e4000if2_currentIndexChanged(int index) -{ - m_settings.m_if2gain = index * 30; - sendSettings(); -} - -void OsmoSDRGui::on_e4000if3_currentIndexChanged(int index) -{ - m_settings.m_if3gain = index * 30; - sendSettings(); -} - -void OsmoSDRGui::on_e4000if4_currentIndexChanged(int index) -{ - m_settings.m_if4gain = index * 10; - sendSettings(); -} - -void OsmoSDRGui::on_e4000if5_currentIndexChanged(int index) -{ - m_settings.m_if5gain = (index + 1) * 30; - sendSettings(); -} - -void OsmoSDRGui::on_e4000if6_currentIndexChanged(int index) -{ - m_settings.m_if6gain = (index + 1) * 30; - sendSettings(); -} - -void OsmoSDRGui::on_centerFrequency_changed(quint64 value) -{ - m_generalSettings.m_centerFrequency = value * 1000; - sendSettings(); -} - -void OsmoSDRGui::on_filterI1_valueChanged(int value) -{ - m_settings.m_opAmpI1 = value; - sendSettings(); -} - -void OsmoSDRGui::on_filterI2_valueChanged(int value) -{ - m_settings.m_opAmpI2 = value; - sendSettings(); -} - -void OsmoSDRGui::on_filterQ1_valueChanged(int value) -{ - m_settings.m_opAmpQ1 = value; - sendSettings(); -} - -void OsmoSDRGui::on_filterQ2_valueChanged(int value) -{ - m_settings.m_opAmpQ2 = value; - sendSettings(); -} - -void OsmoSDRGui::on_decimation_valueChanged(int value) -{ - ui->decimationDisplay->setText(tr("1:%1").arg(1 << value)); - m_settings.m_decimation = value; - sendSettings(); -} - -void OsmoSDRGui::on_e4000LNAGain_valueChanged(int value) -{ - int gain = e4kIdxToLNAGain(value); - ui->e4000LNAGainDisplay->setText(tr("%1.%2").arg(gain / 10).arg(abs(gain % 10))); - m_settings.m_lnaGain = gain; - sendSettings(); -} - -void OsmoSDRGui::on_e4kI_valueChanged(int value) -{ - m_settings.m_dcOfsI = value; - sendSettings(); -} - -void OsmoSDRGui::on_e4kQ_valueChanged(int value) -{ - m_settings.m_dcOfsQ = value; - sendSettings(); -} - -void OsmoSDRGui::updateHardware() -{ - m_updateTimer.stop(); - Message* msg = OsmoSDRInput::MsgConfigureOsmoSDR::create(m_generalSettings, m_settings); - msg->submit(m_pluginAPI->getDSPEngineMessageQueue()); -} diff --git a/plugins/samplesource/osmosdr/osmosdrgui.h b/plugins/samplesource/osmosdr/osmosdrgui.h deleted file mode 100644 index f043653ea..000000000 --- a/plugins/samplesource/osmosdr/osmosdrgui.h +++ /dev/null @@ -1,70 +0,0 @@ -#ifndef INCLUDE_OSMOSDRGUI_H -#define INCLUDE_OSMOSDRGUI_H - -#include -#include "plugin/plugingui.h" -#include "osmosdrinput.h" - -class PluginAPI; - -namespace Ui { - class OsmoSDRGui; -} - -class OsmoSDRGui : public QWidget, public PluginGUI { - Q_OBJECT - -public: - explicit OsmoSDRGui(PluginAPI* pluginAPI, QWidget* parent = NULL); - ~OsmoSDRGui(); - void destroy(); - - void setName(const QString& name); - - void resetToDefaults(); - QByteArray serializeGeneral() const; - bool deserializeGeneral(const QByteArray&data); - quint64 getCenterFrequency() const; - QByteArray serialize() const; - bool deserialize(const QByteArray& data); - bool handleMessage(Message* message); - -private: - Ui::OsmoSDRGui* ui; - - PluginAPI* m_pluginAPI; - SampleSource::GeneralSettings m_generalSettings; - OsmoSDRInput::Settings m_settings; - QTimer m_updateTimer; - std::vector m_gains; - SampleSource* m_sampleSource; - - void displaySettings(); - void sendSettings(); - int e4kLNAGainToIdx(int gain) const; - int e4kIdxToLNAGain(int idx) const; - -private slots: - void on_iqSwap_toggled(bool checked); - void on_e4000MixerGain_currentIndexChanged(int index); - void on_e4000MixerEnh_currentIndexChanged(int index); - void on_e4000if1_currentIndexChanged(int index); - void on_e4000if2_currentIndexChanged(int index); - void on_e4000if3_currentIndexChanged(int index); - void on_e4000if4_currentIndexChanged(int index); - void on_e4000if5_currentIndexChanged(int index); - void on_e4000if6_currentIndexChanged(int index); - void on_centerFrequency_changed(quint64 value); - void on_filterI1_valueChanged(int value); - void on_filterI2_valueChanged(int value); - void on_filterQ1_valueChanged(int value); - void on_filterQ2_valueChanged(int value); - void on_decimation_valueChanged(int value); - void on_e4000LNAGain_valueChanged(int value); - void on_e4kI_valueChanged(int value); - void on_e4kQ_valueChanged(int value); - - void updateHardware(); -}; - -#endif // INCLUDE_OSMOSDRGUI_H diff --git a/plugins/samplesource/osmosdr/osmosdrgui.ui b/plugins/samplesource/osmosdr/osmosdrgui.ui deleted file mode 100644 index ab203634f..000000000 --- a/plugins/samplesource/osmosdr/osmosdrgui.ui +++ /dev/null @@ -1,792 +0,0 @@ - - - OsmoSDRGui - - - - 0 - 0 - 259 - 301 - - - - - 0 - 0 - - - - - Sans Serif - 9 - - - - OsmoSDR - - - - 3 - - - 2 - - - 2 - - - 2 - - - 2 - - - - - - - Qt::Horizontal - - - - 0 - 0 - - - - - - - - - 0 - 0 - - - - - 32 - 16 - - - - - Monospace - 20 - - - - Qt::StrongFocus - - - Tuner center frequency in kHz - - - - - - - kHz - - - - - - - Qt::Horizontal - - - - 0 - 0 - - - - - - - - - - Qt::Horizontal - - - - - - - 3 - - - - - Decimation - - - - - - - Signal decimation factor - - - 5 - - - 1 - - - Qt::Horizontal - - - QSlider::TicksBelow - - - - - - - - 40 - 0 - - - - 1:1 - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - Qt::Horizontal - - - - - - - 3 - - - - - - 0 - 0 - - - - LNA - - - - - - - LNA amplification - - - 12 - - - 1 - - - Qt::Horizontal - - - - - - - - 40 - 0 - - - - -5.0 - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - 10 - - - - - - 0 - 0 - - - - Mix - - - - - - - Tuner mixer amplification - - - QComboBox::AdjustToMinimumContentsLength - - - - 4 - - - - - 12 - - - - - - - - Qt::Vertical - - - - - - - - 0 - 0 - - - - Enh. - - - - - - - Tuner LNA amplification enhancement - - - QComboBox::AdjustToMinimumContentsLength - - - - off - - - - - 1 - - - - - 3 - - - - - 5 - - - - - 7 - - - - - - - - Qt::Vertical - - - - - - - Swap IQ - - - true - - - - - - - - - 0 - - - 3 - - - - - Tuner IF 2 amplification - - - QComboBox::AdjustToContents - - - - 0 - - - - - 3 - - - - - 6 - - - - - 9 - - - - - - - - Tuner IF 4 amplification - - - QComboBox::AdjustToContents - - - - 0 - - - - - 1 - - - - - 2 - - - - - - - - - 0 - 0 - - - - IF4 - - - - - - - - 0 - 0 - - - - IF5 - - - - - - - Tuner IF 5 amplification - - - QComboBox::AdjustToContents - - - - 3 - - - - - 6 - - - - - 9 - - - - - 12 - - - - - 15 - - - - - - - - - 0 - 0 - - - - IF6 - - - - - - - Tuner IF 3 amplification - - - QComboBox::AdjustToContents - - - - 0 - - - - - 3 - - - - - 6 - - - - - 9 - - - - - - - - - 0 - 0 - - - - IF2 - - - - - - - Tuner IF 6 amplification - - - QComboBox::AdjustToContents - - - - 3 - - - - - 6 - - - - - 9 - - - - - 12 - - - - - 15 - - - - - - - - - 0 - 0 - - - - IF3 - - - - - - - Tuner IF 1 amplification - - - QComboBox::AdjustToContents - - - - -3 - - - - - 6 - - - - - - - - - 0 - 0 - - - - IF1 - - - - - - - - - Qt::Horizontal - - - - - - - 3 - - - - - Poti 2 - - - - - - - I - - - - - - - - 0 - 0 - - - - I DC offset adjustment - - - 255 - - - 1 - - - Qt::Horizontal - - - - - - - - 0 - 0 - - - - I path amplification - - - 255 - - - 1 - - - Qt::Horizontal - - - - - - - - 0 - 0 - - - - Q path amplification - - - 255 - - - 1 - - - Qt::Horizontal - - - - - - - - 0 - 0 - - - - Q DC offset adjustment - - - 255 - - - 1 - - - Qt::Horizontal - - - - - - - - 0 - 0 - - - - Q DC offset adjustment - - - 255 - - - 1 - - - Qt::Horizontal - - - - - - - E4000 - - - - - - - Q - - - - - - - Poti 1 - - - - - - - - 0 - 0 - - - - Q path amplification - - - 255 - - - 1 - - - Qt::Horizontal - - - - - - - - - - ValueDial - QWidget -
gui/valuedial.h
- 1 - - - - - diff --git a/plugins/samplesource/osmosdr/osmosdrinput.cpp b/plugins/samplesource/osmosdr/osmosdrinput.cpp deleted file mode 100644 index 989eb09ed..000000000 --- a/plugins/samplesource/osmosdr/osmosdrinput.cpp +++ /dev/null @@ -1,479 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2012 maintech GmbH, Otto-Hahn-Str. 15, 97204 Hoechberg, Germany // -// written by Christian Daniel // -// // -// This program is free software; you can redistribute it and/or modify // -// it under the terms of the GNU General Public License as published by // -// the Free Software Foundation as version 3 of the License, or // -// // -// This program is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU General Public License V3 for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with this program. If not, see . // -/////////////////////////////////////////////////////////////////////////////////// - -#include -#include -#include "osmosdrinput.h" -#include "osmosdrthread.h" -#include "osmosdrgui.h" -#include "util/simpleserializer.h" - -MESSAGE_CLASS_DEFINITION(OsmoSDRInput::MsgConfigureOsmoSDR, Message) - -OsmoSDRInput::Settings::Settings() : - m_swapIQ(false), - m_decimation(3), - m_lnaGain(-50), - m_mixerGain(40), - m_mixerEnhancement(0), - m_if1gain(-30), - m_if2gain(0), - m_if3gain(0), - m_if4gain(0), - m_if5gain(30), - m_if6gain(30), - m_opAmpI1(0), - m_opAmpI2(0), - m_opAmpQ1(0), - m_opAmpQ2(0), - m_dcOfsI(0), - m_dcOfsQ(0) -{ -} - -void OsmoSDRInput::Settings::resetToDefaults() -{ - m_swapIQ = false; - m_decimation = 3; - m_lnaGain = -50; - m_mixerGain = 40; - m_mixerEnhancement = 0; - m_if1gain = -30; - m_if2gain = 0; - m_if3gain = 0; - m_if4gain = 0; - m_if5gain = 30; - m_if6gain = 30; - m_opAmpI1 = 0; - m_opAmpI2 = 0; - m_opAmpQ1 = 0; - m_opAmpQ2 = 0; - m_dcOfsI = 0; - m_dcOfsQ = 0; -} - -QByteArray OsmoSDRInput::Settings::serialize() const -{ - SimpleSerializer s(1); - s.writeBool(1, m_swapIQ); - s.writeS32(2, m_decimation); - s.writeS32(3, m_lnaGain); - s.writeS32(4, m_mixerGain); - s.writeS32(5, m_mixerEnhancement); - s.writeS32(6, m_if1gain); - s.writeS32(7, m_if2gain); - s.writeS32(8, m_if3gain); - s.writeS32(9, m_if4gain); - s.writeS32(10, m_if5gain); - s.writeS32(11, m_if6gain); - s.writeS32(12, m_opAmpI1); - s.writeS32(13, m_opAmpI2); - s.writeS32(14, m_opAmpQ1); - s.writeS32(15, m_opAmpQ2); - s.writeS32(16, m_dcOfsI); - s.writeS32(17, m_dcOfsQ); - return s.final(); -} - -bool OsmoSDRInput::Settings::deserialize(const QByteArray& data) -{ - SimpleDeserializer d(data); - - if(!d.isValid()) { - resetToDefaults(); - return false; - } - - if(d.getVersion() == 1) { - d.readBool(1, &m_swapIQ, false); - d.readS32(2, &m_decimation, 3); - d.readS32(3, &m_lnaGain, -50); - d.readS32(4, &m_mixerGain, 40); - d.readS32(5, &m_mixerEnhancement, 0); - d.readS32(6, &m_if1gain, -30); - d.readS32(7, &m_if2gain, 0); - d.readS32(8, &m_if3gain, 0); - d.readS32(9, &m_if4gain, 0); - d.readS32(10, &m_if5gain, 30); - d.readS32(11, &m_if6gain, 30); - d.readS32(12, &m_opAmpI1, 0); - d.readS32(13, &m_opAmpI2, 0); - d.readS32(14, &m_opAmpQ1, 0); - d.readS32(15, &m_opAmpQ2, 0); - d.readS32(16, &m_dcOfsI, 0); - d.readS32(17, &m_dcOfsQ, 0); - return true; - } else { - resetToDefaults(); - return false; - } -} -#if 0 -OsmoSDRInput::Settings::Settings() : -{ -} - -QString OsmoSDRInput::Settings::serialize() const -{ - return QString("osmosdr:a:%1:%2:%3:%4:%5:%6:%7:%8:%9:%10:%11:%12:%13:%14:%15:%16:%17:%18") - .arg(centerFrequency) - .arg(swapIQ ? 1 : 0) - .arg(decimation) - .arg(lnaGain) - .arg(mixerGain) - .arg(mixerEnhancement) - .arg(if1gain) - .arg(if2gain) - .arg(if3gain) - .arg(if4gain) - .arg(if5gain) - .arg(if6gain) - .arg(opAmpI1) - .arg(opAmpI2) - .arg(opAmpQ1) - .arg(opAmpQ2) - .arg(dcOfsI) - .arg(dcOfsQ); -} - -bool OsmoSDRInput::Settings::deserialize(const QString& settings) -{ - QStringList list = settings.split(":"); - if(list.size() < 2) - return false; - if(list[0] != "osmosdr") - return false; - - if(list[1] == "a") { - bool ok; - if(list.size() != 20) - return false; - centerFrequency = list[2].toLongLong(&ok); - if(!ok) - return false; - swapIQ = (list[3].toInt(&ok) != 0) ? true : false; - if(!ok) - return false; - decimation = list[4].toInt(&ok); - if(!ok) - return false; - lnaGain = list[5].toInt(&ok); - if(!ok) - return false; - mixerGain = list[6].toInt(&ok); - if(!ok) - return false; - mixerEnhancement = list[7].toInt(&ok); - if(!ok) - return false; - if1gain = list[8].toInt(&ok); - if(!ok) - return false; - if2gain = list[9].toInt(&ok); - if(!ok) - return false; - if3gain = list[10].toInt(&ok); - if(!ok) - return false; - if4gain = list[11].toInt(&ok); - if(!ok) - return false; - if5gain = list[12].toInt(&ok); - if(!ok) - return false; - if6gain = list[13].toInt(&ok); - if(!ok) - return false; - opAmpI1 = list[14].toInt(&ok); - if(!ok) - return false; - opAmpI2 = list[15].toInt(&ok); - if(!ok) - return false; - opAmpQ1 = list[16].toInt(&ok); - if(!ok) - return false; - opAmpQ2 = list[17].toInt(&ok); - if(!ok) - return false; - dcOfsI = list[18].toInt(&ok); - if(!ok) - return false; - dcOfsQ = list[19].toInt(&ok); - if(!ok) - return false; - return true; - } else { - return false; - } -} - -MessageRegistrator OsmoSDRInput::MsgConfigureSourceOsmoSDR::ID("MsgConfigureSourceOsmoSDR"); -#endif -OsmoSDRInput::OsmoSDRInput(MessageQueue* msgQueueToGUI) : - SampleSource(msgQueueToGUI), - m_settings(), - m_dev(NULL), - m_osmoSDRThread(NULL), - m_deviceDescription() -{ -} - -OsmoSDRInput::~OsmoSDRInput() -{ - stopInput(); -} - -bool OsmoSDRInput::startInput(int device) -{ - QMutexLocker mutexLocker(&m_mutex); - - if(m_dev != NULL) - stopInput(); - - char vendor[256]; - char product[256]; - char serial[256]; - int res; - - if(!m_sampleFifo.setSize(524288)) { - qCritical("Could not allocate SampleFifo"); - return false; - } - - if((res = osmosdr_open(&m_dev, device)) < 0) { - qCritical("could not open OsmoSDR #%d: %s", device, strerror(errno)); - return false; - } - - vendor[0] = '\0'; - product[0] = '\0'; - serial[0] = '\0'; - if((res = osmosdr_get_usb_strings(m_dev, vendor, product, serial)) < 0) { - qCritical("error accessing USB device"); - goto failed; - } - qDebug("OsmoSDRInput open: %s %s, SN: %s", vendor, product, serial); - m_deviceDescription = QString("%1 (SN %2)").arg(product).arg(serial); - - if((res = osmosdr_set_tuner_gain_mode(m_dev, 1)) < 0) { - qCritical("error setting tuner gain mode"); - goto failed; - } - - if((res = osmosdr_reset_buffer(m_dev)) < 0) { - qCritical("could not reset USB EP buffers: %s", strerror(errno)); - goto failed; - } - - if((m_osmoSDRThread = new OsmoSDRThread(m_dev, &m_sampleFifo)) == NULL) { - qFatal("out of memory"); - goto failed; - } - m_osmoSDRThread->startWork(); - - mutexLocker.unlock(); - applySettings(m_generalSettings, m_settings, true); - - qDebug("OsmoSDRInput: start"); - - return true; - -failed: - stopInput(); - return false; -} - -void OsmoSDRInput::stopInput() -{ - QMutexLocker mutexLocker(&m_mutex); - - if(m_osmoSDRThread != NULL) { - m_osmoSDRThread->stopWork(); - delete m_osmoSDRThread; - m_osmoSDRThread = NULL; - } - if(m_dev != NULL) { - osmosdr_close(m_dev); - m_dev = NULL; - } - m_deviceDescription.clear(); -} - -const QString& OsmoSDRInput::getDeviceDescription() const -{ - return m_deviceDescription; -} - -int OsmoSDRInput::getSampleRate() const -{ - return 4000000 / (1 << m_settings.m_decimation); -} - -quint64 OsmoSDRInput::getCenterFrequency() const -{ - return m_generalSettings.m_centerFrequency; -} - -bool OsmoSDRInput::handleMessage(Message* message) -{ - if(MsgConfigureOsmoSDR::match(message)) { - MsgConfigureOsmoSDR* conf = (MsgConfigureOsmoSDR*)message; - if(!applySettings(conf->getGeneralSettings(), conf->getSettings(), false)) - qDebug("OsmoSDR config error"); - message->completed(); - return true; - } else { - return false; - } - - /* - if(cmd->sourceType() != DSPCmdConfigureSourceOsmoSDR::SourceType) - return false; - if(!applySettings(((DSPCmdConfigureSourceOsmoSDR*)cmd)->getSettings(), false)) - qDebug("OsmoSDR config error"); - cmd->completed(); - return true; - */ - return false; -} - -bool OsmoSDRInput::applySettings(const GeneralSettings& generalSettings, const Settings& settings, bool force) -{ - QMutexLocker mutexLocker(&m_mutex); - - if((m_generalSettings.m_centerFrequency != generalSettings.m_centerFrequency) || force) { - m_generalSettings.m_centerFrequency = generalSettings.m_centerFrequency; - if(m_dev != NULL) { - if(osmosdr_set_center_freq(m_dev, m_generalSettings.m_centerFrequency) != 0) - qDebug("osmosdr_set_center_freq(%lld) failed", m_generalSettings.m_centerFrequency); - } - } - - if((m_settings.m_swapIQ != settings.m_swapIQ) || force) { - m_settings.m_swapIQ = settings.m_swapIQ; - if(m_dev != NULL) { - if(osmosdr_set_fpga_iq_swap(m_dev, m_settings.m_swapIQ ? 1 : 0) == 0) - qDebug("osmosdr_set_fpga_iq_swap() failed"); - } - } - - if((m_settings.m_decimation != settings.m_decimation) || force) { - m_settings.m_decimation = settings.m_decimation; - if(m_dev != NULL) { - if(!osmosdr_set_fpga_decimation(m_dev, m_settings.m_decimation)) - qDebug("osmosdr_set_fpga_decimation() failed"); - } - } - - if((m_settings.m_lnaGain != settings.m_lnaGain) || force) { - m_settings.m_lnaGain = settings.m_lnaGain; - if(m_dev != NULL) { - if(!osmosdr_set_tuner_lna_gain(m_dev, m_settings.m_lnaGain)) - qDebug("osmosdr_set_tuner_lna_gain() failed"); - } - } - - if((m_settings.m_mixerGain != settings.m_mixerGain) || force) { - m_settings.m_mixerGain = settings.m_mixerGain; - if(m_dev != NULL) { - if(!osmosdr_set_tuner_mixer_gain(m_dev, m_settings.m_mixerGain)) - qDebug("osmosdr_set_tuner_mixer_gain() failed"); - } - } - - if((m_settings.m_mixerEnhancement != settings.m_mixerEnhancement) || force) { - m_settings.m_mixerEnhancement = settings.m_mixerEnhancement; - if(m_dev != NULL) { - if(!osmosdr_set_tuner_mixer_enh(m_dev, m_settings.m_mixerEnhancement)) - qDebug("osmosdr_set_tuner_mixer_enh() failed"); - } - } - - if((m_settings.m_if1gain != settings.m_if1gain) || force) { - m_settings.m_if1gain = settings.m_if1gain; - if(m_dev != NULL) { - if(!osmosdr_set_tuner_if_gain(m_dev, 1, m_settings.m_if1gain)) - qDebug("osmosdr_set_tuner_if_gain(1) failed"); - } - } - - if((m_settings.m_if2gain != settings.m_if2gain) || force) { - m_settings.m_if2gain = settings.m_if2gain; - if(m_dev != NULL) { - if(!osmosdr_set_tuner_if_gain(m_dev, 2, m_settings.m_if2gain)) - qDebug("osmosdr_set_tuner_if_gain(2) failed"); - } - } - - if((m_settings.m_if3gain != settings.m_if3gain) || force) { - m_settings.m_if3gain = settings.m_if3gain; - if(m_dev != NULL) { - if(!osmosdr_set_tuner_if_gain(m_dev, 3, m_settings.m_if3gain)) - qDebug("osmosdr_set_tuner_if_gain(3) failed"); - } - } - - if((m_settings.m_if4gain != settings.m_if4gain) || force) { - m_settings.m_if4gain = settings.m_if4gain; - if(m_dev != NULL) { - if(!osmosdr_set_tuner_if_gain(m_dev, 4, m_settings.m_if4gain)) - qDebug("osmosdr_set_tuner_if_gain(4) failed"); - } - } - - if((m_settings.m_if5gain != settings.m_if5gain) || force) { - m_settings.m_if5gain = settings.m_if5gain; - if(m_dev != NULL) { - if(!osmosdr_set_tuner_if_gain(m_dev, 5, m_settings.m_if5gain)) - qDebug("osmosdr_set_tuner_if_gain(5) failed"); - } - } - - if((m_settings.m_if6gain != settings.m_if6gain) || force) { - m_settings.m_if6gain = settings.m_if6gain; - if(m_dev != NULL) { - if(!osmosdr_set_tuner_if_gain(m_dev, 6, m_settings.m_if6gain)) - qDebug("osmosdr_set_tuner_if_gain(6) failed"); - } - } - - if((m_settings.m_opAmpI1 != settings.m_opAmpI1) || (m_settings.m_opAmpI2 != settings.m_opAmpI2) || - (m_settings.m_opAmpQ1 != settings.m_opAmpQ1) || (m_settings.m_opAmpQ2 != settings.m_opAmpQ2) || - force) { - m_settings.m_opAmpI1 = settings.m_opAmpI1; - m_settings.m_opAmpI2 = settings.m_opAmpI2; - m_settings.m_opAmpQ1 = settings.m_opAmpQ1; - m_settings.m_opAmpQ2 = settings.m_opAmpQ2; - if(m_dev != NULL) { - if(!osmosdr_set_iq_amp(m_dev, m_settings.m_opAmpI1, m_settings.m_opAmpI2, m_settings.m_opAmpQ1, m_settings.m_opAmpQ2)) - qDebug("osmosdr_set_iq_amp(1) failed"); - } - } - - if((m_settings.m_dcOfsI != settings.m_dcOfsI) || (m_settings.m_dcOfsQ != settings.m_dcOfsQ) || - force) { - m_settings.m_dcOfsI = settings.m_dcOfsI; - m_settings.m_dcOfsQ = settings.m_dcOfsQ; - if(m_dev != NULL) { - if(!osmosdr_set_tuner_dc_offset(m_dev, m_settings.m_dcOfsI, m_settings.m_dcOfsQ)) - qDebug("osmosdr_set_tuner_dc_offset() failed"); - } - } - - return true; -} diff --git a/plugins/samplesource/osmosdr/osmosdrinput.h b/plugins/samplesource/osmosdr/osmosdrinput.h deleted file mode 100644 index dd832caad..000000000 --- a/plugins/samplesource/osmosdr/osmosdrinput.h +++ /dev/null @@ -1,99 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2012 maintech GmbH, Otto-Hahn-Str. 15, 97204 Hoechberg, Germany // -// written by Christian Daniel // -// // -// This program is free software; you can redistribute it and/or modify // -// it under the terms of the GNU General Public License as published by // -// the Free Software Foundation as version 3 of the License, or // -// // -// This program is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU General Public License V3 for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with this program. If not, see . // -/////////////////////////////////////////////////////////////////////////////////// - -#ifndef INCLUDE_OSMOSDRINPUT_H -#define INCLUDE_OSMOSDRINPUT_H - -#include "dsp/samplesource/samplesource.h" -#include -#include - -class OsmoSDRThread; - -class OsmoSDRInput : public SampleSource { -public: - struct Settings { - bool m_swapIQ; - qint32 m_decimation; - qint32 m_lnaGain; - qint32 m_mixerGain; - qint32 m_mixerEnhancement; - qint32 m_if1gain; - qint32 m_if2gain; - qint32 m_if3gain; - qint32 m_if4gain; - qint32 m_if5gain; - qint32 m_if6gain; - qint32 m_opAmpI1; - qint32 m_opAmpI2; - qint32 m_opAmpQ1; - qint32 m_opAmpQ2; - qint32 m_dcOfsI; - qint32 m_dcOfsQ; - - Settings(); - void resetToDefaults(); - QByteArray serialize() const; - bool deserialize(const QByteArray& data); - }; - - class MsgConfigureOsmoSDR : public Message { - MESSAGE_CLASS_DECLARATION - - public: - const GeneralSettings& getGeneralSettings() const { return m_generalSettings; } - const Settings& getSettings() const { return m_settings; } - - static MsgConfigureOsmoSDR* create(const GeneralSettings& generalSettings, const Settings& settings) - { - return new MsgConfigureOsmoSDR(generalSettings, settings); - } - - protected: - GeneralSettings m_generalSettings; - Settings m_settings; - - MsgConfigureOsmoSDR(const GeneralSettings& generalSettings, const Settings& settings) : - Message(), - m_generalSettings(generalSettings), - m_settings(settings) - { } - }; - - OsmoSDRInput(MessageQueue* msgQueueToGUI); - ~OsmoSDRInput(); - - bool startInput(int device); - void stopInput(); - - const QString& getDeviceDescription() const; - int getSampleRate() const; - quint64 getCenterFrequency() const; - - bool handleMessage(Message* message); - -private: - QMutex m_mutex; - Settings m_settings; - osmosdr_dev_t* m_dev; - OsmoSDRThread* m_osmoSDRThread; - QString m_deviceDescription; - - bool applySettings(const GeneralSettings& generalSettings, const Settings& settings, bool force); -}; - -#endif // INCLUDE_OSMOSDRINPUT_H diff --git a/plugins/samplesource/osmosdr/osmosdrplugin.cpp b/plugins/samplesource/osmosdr/osmosdrplugin.cpp deleted file mode 100644 index 907500a79..000000000 --- a/plugins/samplesource/osmosdr/osmosdrplugin.cpp +++ /dev/null @@ -1,69 +0,0 @@ -#include -#include -#include -#include "plugin/pluginapi.h" -#include "util/simpleserializer.h" -#include "osmosdrplugin.h" -#include "osmosdrgui.h" - -const PluginDescriptor OsmoSDRPlugin::m_pluginDescriptor = { - QString("OsmoSDR Input"), - QString("---"), - QString("(c) Christian Daniel"), - QString("http://sdr.osmocom.org/trac/wiki/osmo-sdr"), - true, - QString("http://cgit.osmocom.org/cgit/osmo-sdr") -}; - -OsmoSDRPlugin::OsmoSDRPlugin(QObject* parent) : - QObject(parent) -{ -} - -const PluginDescriptor& OsmoSDRPlugin::getPluginDescriptor() const -{ - return m_pluginDescriptor; -} - -void OsmoSDRPlugin::initPlugin(PluginAPI* pluginAPI) -{ - m_pluginAPI = pluginAPI; - - m_pluginAPI->registerSampleSource("org.osmocom.sdr.samplesource.osmo-sdr", this); -} - -PluginInterface::SampleSourceDevices OsmoSDRPlugin::enumSampleSources() -{ - SampleSourceDevices result; - int count = osmosdr_get_device_count(); - char vendor[256]; - char product[256]; - char serial[256]; - - for(int i = 0; i < count; i++) { - vendor[0] = '\0'; - product[0] = '\0'; - serial[0] = '\0'; - - if(osmosdr_get_device_usb_strings(i, vendor, product, serial) != 0) - continue; - QString displayedName(QString("OsmoSDR #%1 (#%2)").arg(i + 1).arg(serial)); - qDebug("found %s", qPrintable(displayedName)); - SimpleSerializer s(1); - s.writeS32(1, i); - result.append(SampleSourceDevice(displayedName, "org.osmocom.sdr.samplesource.osmo-sdr", s.final())); - } - - return result; -} - -PluginGUI* OsmoSDRPlugin::createSampleSourcePluginGUI(const QString& sourceName, const QByteArray& address) -{ - if(sourceName == "org.osmocom.sdr.samplesource.osmo-sdr") { - OsmoSDRGui* gui = new OsmoSDRGui(m_pluginAPI); - m_pluginAPI->setInputGUI(gui); - return gui; - } else { - return NULL; - } -} diff --git a/plugins/samplesource/osmosdr/osmosdrplugin.h b/plugins/samplesource/osmosdr/osmosdrplugin.h deleted file mode 100644 index 6cebebfbf..000000000 --- a/plugins/samplesource/osmosdr/osmosdrplugin.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef INCLUDE_OSMOSDRPLUGIN_H -#define INCLUDE_OSMOSDRPLUGIN_H - -#include -#include "plugin/plugininterface.h" - -class OsmoSDRPlugin : public QObject, PluginInterface { - Q_OBJECT - Q_INTERFACES(PluginInterface) - Q_PLUGIN_METADATA(IID "org.osmocom.sdr.samplesource.osmo-sdr") - -public: - explicit OsmoSDRPlugin(QObject* parent = NULL); - - const PluginDescriptor& getPluginDescriptor() const; - void initPlugin(PluginAPI* pluginAPI); - - SampleSourceDevices enumSampleSources(); - PluginGUI* createSampleSourcePluginGUI(const QString& sourceName, const QByteArray& address); - -private: - static const PluginDescriptor m_pluginDescriptor; - - PluginAPI* m_pluginAPI; -}; - -#endif // INCLUDE_OSMOSDRPLUGIN_H diff --git a/plugins/samplesource/osmosdr/osmosdrthread.cpp b/plugins/samplesource/osmosdr/osmosdrthread.cpp deleted file mode 100644 index 25fcfdbea..000000000 --- a/plugins/samplesource/osmosdr/osmosdrthread.cpp +++ /dev/null @@ -1,116 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2012 maintech GmbH, Otto-Hahn-Str. 15, 97204 Hoechberg, Germany // -// written by Christian Daniel // -// // -// This program is free software; you can redistribute it and/or modify // -// it under the terms of the GNU General Public License as published by // -// the Free Software Foundation as version 3 of the License, or // -// // -// This program is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU General Public License V3 for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with this program. If not, see . // -/////////////////////////////////////////////////////////////////////////////////// - -#include -#include -#include "osmosdrthread.h" -#include "dsp/samplefifo.h" - -OsmoSDRThread::OsmoSDRThread(osmosdr_dev_t* dev, SampleFifo* sampleFifo, QObject* parent) : - QThread(parent), - m_running(false), - m_dev(dev), - m_sampleFifo(sampleFifo) -{ -} - -OsmoSDRThread::~OsmoSDRThread() -{ - stopWork(); -} - -void OsmoSDRThread::startWork() -{ - m_startWaitMutex.lock(); - start(); - while(!m_running) - m_startWaiter.wait(&m_startWaitMutex, 100); - m_startWaitMutex.unlock(); -} - -void OsmoSDRThread::stopWork() -{ - m_running = false; - wait(); -} - -void OsmoSDRThread::run() -{ - int res; - - m_running = true; - m_startWaiter.wakeAll(); - - //m_f = fopen("/tmp/samples.bin", "wb"); - - while(m_running) { - if((res = osmosdr_read_async(m_dev, &OsmoSDRThread::callbackHelper, this, 16, sizeof(Sample) * 8192 * 2)) < 0) { - qCritical("OsmoSDRThread: async error: %s", strerror(errno)); - break; - } - } - - m_running = false; -} - -void OsmoSDRThread::checkData(const quint8* buf, qint32 len) -{ - const Sample* s = (const Sample*)buf; - len /= sizeof(Sample); - - while(len) { - if((s->i != m_nextI) || (s->q != m_nextQ)) { - qDebug("continuity error after %llu samples", m_samplePos); - m_samplePos = 0; - m_nextI = s->i - 1; - m_nextQ = s->q + 1; - } else { - m_nextI--; - m_nextQ++; - m_samplePos++; - } - len--; - s++; - } -} - -void OsmoSDRThread::callback(const quint8* buf, qint32 len) -{ - /* - qDebug("%d", len); -*/ - /* - for(int i = 0; i < len / 2; i += 2) { - ((qint16*)buf)[i] = sin((float)(cntr) * 1024* 2.0 * M_PI / 65536.0) * 32000.0; - ((qint16*)buf)[i + 1] = -cos((float)(cntr++) * 1024*2.0 * M_PI / 65536.0) * 32000.0; - } - */ - - //m_sampleFifo->write((SampleVector::const_iterator)((Sample*)buf), (SampleVector::const_iterator)((Sample*)(buf + len))); - //fwrite(buf, 1, len, m_f); - //checkData(buf, len); - - m_sampleFifo->write(buf, len); - if(!m_running) - osmosdr_cancel_async(m_dev); -} - -void OsmoSDRThread::callbackHelper(unsigned char* buf, uint32_t len, void* ctx) -{ - OsmoSDRThread* thread = (OsmoSDRThread*)ctx; - thread->callback(buf, len); -} diff --git a/plugins/samplesource/osmosdr/osmosdrthread.h b/plugins/samplesource/osmosdr/osmosdrthread.h deleted file mode 100644 index 0aa014240..000000000 --- a/plugins/samplesource/osmosdr/osmosdrthread.h +++ /dev/null @@ -1,66 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2012 maintech GmbH, Otto-Hahn-Str. 15, 97204 Hoechberg, Germany // -// written by Christian Daniel // -// // -// This program is free software; you can redistribute it and/or modify // -// it under the terms of the GNU General Public License as published by // -// the Free Software Foundation as version 3 of the License, or // -// // -// This program is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU General Public License V3 for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with this program. If not, see . // -/////////////////////////////////////////////////////////////////////////////////// - -#ifndef INCLUDE_OSMOSDRTHREAD_H -#define INCLUDE_OSMOSDRTHREAD_H - -#include -#include -#include -#include - -class SampleFifo; - -class OsmoSDRThread : public QThread { - Q_OBJECT - -public: - OsmoSDRThread(osmosdr_dev_t* dev, SampleFifo* sampleFifo, QObject* parent = NULL); - ~OsmoSDRThread(); - - void startWork(); - void stopWork(); - -private: -#pragma pack(push, 1) - struct Sample { - qint16 i; - qint16 q; - }; -#pragma pack(pop) - - qint16 m_nextI; - qint16 m_nextQ; - quint64 m_samplePos; - - QMutex m_startWaitMutex; - QWaitCondition m_startWaiter; - bool m_running; - FILE* m_f; - - osmosdr_dev_t* m_dev; - SampleFifo* m_sampleFifo; - - void run(); - - void checkData(const quint8* buf, qint32 len); - void callback(const quint8* buf, qint32 len); - - static void callbackHelper(unsigned char* buf, uint32_t len, void* ctx); -}; - -#endif // INCLUDE_OSMOSDRTHREAD_H diff --git a/plugins/samplesource/osmosdr/osmosdrupgrade.cpp b/plugins/samplesource/osmosdr/osmosdrupgrade.cpp deleted file mode 100644 index bba600bf1..000000000 --- a/plugins/samplesource/osmosdr/osmosdrupgrade.cpp +++ /dev/null @@ -1,518 +0,0 @@ -#include -#include -#include -#include -#include -#include "osmosdrupgrade.h" -#include "ui_osmosdrupgrade.h" - -#define OSMOSDR_USB_VID 0x16c0 -#define OSMOSDR_USB_PID 0x0763 - -// DFU commands -#define DFU_DETACH 0x00 -#define DFU_DNLOAD 0x01 -#define DFU_UPLOAD 0x02 -#define DFU_GETSTATUS 0x03 -#define DFU_CLRSTATUS 0x04 -#define DFU_GETSTATE 0x05 -#define DFU_ABORT 0x06 - -// DFU states -#define ST_appIDLE 0 -#define ST_appDETACH 1 -#define ST_dfuIDLE 2 -#define ST_dfuDNLOAD_SYNC 3 -#define ST_dfuDNBUSY 4 -#define ST_dfuDNLOAD_IDLE 5 -#define ST_dfuMANIFEST_SYNC 6 -#define ST_dfuMANIFEST 7 -#define ST_dfuMANIFEST_WAIT_RST 8 -#define ST_dfuUPLOAD_IDLE 9 -#define ST_dfuERROR 10 - -#define DFU_PACKETSIZE 512 - -#pragma pack(push, 1) -struct dfu_getstatus { - quint8 bStatus; - quint8 bwPollTimeout[3]; - quint8 bState; - quint8 iString; -}; -#pragma pack(pop) - - -OsmoSDRUpgrade::OsmoSDRUpgrade(QWidget* parent) : - QDialog(parent), - ui(new Ui::OsmoSDRUpgrade), - m_usb(NULL) -{ - ui->setupUi(this); - connect(&m_searchDeviceTimer, SIGNAL(timeout()), this, SLOT(searchDeviceTick())); -} - -OsmoSDRUpgrade::~OsmoSDRUpgrade() -{ - delete ui; -} - -void OsmoSDRUpgrade::on_browse_clicked() -{ - QString filename = QFileDialog::getOpenFileName(this, tr("OsmoSDR Firmware File"), QString(), tr("OsmoSDR Firmware (*.ofw);;All Files (*)")); - if(filename.isEmpty()) - return; - - QFile file(filename); - if(file.size() > 10 * 1024 * 1024) { - QMessageBox::critical(this, tr("File Open Error"), tr("File is too big to be a firmware update for OsmoSDR.")); - return; - } - - QByteArray dfuApp; - QByteArray radioApp; - QByteArray fpgaBin; - mz_zip_archive zip; - memset(&zip, 0x00, sizeof(zip)); - - if(!mz_zip_reader_init_file(&zip, qPrintable(filename), 0)) { - mz_zip_reader_end(&zip); - QMessageBox::critical(this, tr("File Open Error"), tr("File is not a valid OsmoSDR update.")); - return; - } - - int dfuAppIndex = mz_zip_reader_locate_file(&zip, "dfuapp.bin", NULL, 0); - int radioAppIndex = mz_zip_reader_locate_file(&zip, "radioapp.bin", NULL, 0); - int fpgaIndex = mz_zip_reader_locate_file(&zip, "fpga.bin", NULL, 0); - - if((dfuAppIndex < 0) && (radioAppIndex < 0) && (fpgaIndex < 0)) { - mz_zip_reader_end(&zip); - QMessageBox::critical(this, tr("File Open Error"), tr("File is not a valid OsmoSDR update.")); - return; - } - - if(!mz_zip_reader_extract_to_callback(&zip, dfuAppIndex, zipHelper, &dfuApp, 0)) { - mz_zip_reader_end(&zip); - QMessageBox::critical(this, tr("File Open Error"), tr("File is not a valid OsmoSDR update.")); - return; - } - - if(!mz_zip_reader_extract_to_callback(&zip, radioAppIndex, zipHelper, &radioApp, 0)) { - mz_zip_reader_end(&zip); - QMessageBox::critical(this, tr("File Open Error"), tr("File is not a valid OsmoSDR update.")); - return; - } - - if(!mz_zip_reader_extract_to_callback(&zip, fpgaIndex, zipHelper, &fpgaBin, 0)) { - mz_zip_reader_end(&zip); - QMessageBox::critical(this, tr("File Open Error"), tr("File is not a valid OsmoSDR update.")); - return; - } - - mz_zip_reader_end(&zip); - m_dfuApp = dfuApp; - m_radioApp = radioApp; - m_fpgaBin = fpgaBin; - - if(dfuAppIndex >= 0) { - ui->dfu->setEnabled(true); - ui->dfuSize->setText(tr("%1").arg(m_dfuApp.size())); - } else { - ui->dfu->setEnabled(false); - ui->dfuSize->setText(tr("-")); - } - if(radioAppIndex >= 0) { - ui->radio->setEnabled(true); - ui->radioSize->setText(tr("%1").arg(m_radioApp.size())); - } else { - ui->radio->setEnabled(false); - ui->dfuSize->setText(tr("-")); - } - if(fpgaIndex >= 0) { - ui->fpga->setEnabled(true); - ui->fpgaSize->setText(tr("%1").arg(m_fpgaBin.size())); - } else { - ui->fpga->setEnabled(false); - ui->fpgaSize->setText(tr("-")); - } - - - if((dfuAppIndex >= 0) && (radioAppIndex < 0) && (fpgaIndex < 0)) { - ui->dfu->setChecked(true); - ui->radio->setChecked(false); - ui->fpga->setChecked(false); - } else { - ui->dfu->setChecked(false); - ui->radio->setChecked(radioAppIndex >= 0); - ui->fpga->setChecked(fpgaIndex >= 0); - } - - ui->fwBox->setEnabled(true); - ui->progressBox->setEnabled(true); - - QFileInfo fi(file.fileName()); - ui->filename->setText(fi.fileName()); -} - -void OsmoSDRUpgrade::on_dfu_toggled(bool checked) -{ - updateFlashButton(); -} - -void OsmoSDRUpgrade::on_radio_toggled(bool checked) -{ - updateFlashButton(); -} - -void OsmoSDRUpgrade::on_fpga_toggled(bool checked) -{ - updateFlashButton(); -} - -void OsmoSDRUpgrade::updateFlashButton() -{ - if(ui->dfu->isChecked() || ui->radio->isChecked() || ui->fpga->isChecked()) - ui->progressBox->setEnabled(true); - else ui->progressBox->setEnabled(false); -} - -void OsmoSDRUpgrade::on_start_clicked() -{ - ui->close->setEnabled(false); - ui->start->setEnabled(false); - QApplication::setOverrideCursor(Qt::WaitCursor); - - ui->log->clear(); - log(tr("Starting flash operation...")); - - if(libusb_init(&m_usb) < 0) { - fail(tr("Could not initialize libusb.")); - return; - } - - switchToDFU(); - - m_searchTries = 0; - m_searchDeviceTimer.start(250); -} - -void OsmoSDRUpgrade::searchDeviceTick() -{ - m_searchTries++; - log(tr("Searching device (try %1)").arg(m_searchTries)); - - libusb_device_handle* device = libusb_open_device_with_vid_pid(m_usb, OSMOSDR_USB_VID, OSMOSDR_USB_PID); - if(device == NULL) { - if(m_searchTries >= 10) { - m_searchDeviceTimer.stop(); - finish(); - } - return; - } - - m_searchDeviceTimer.stop(); - - libusb_device_descriptor deviceDescriptor; - - if(libusb_get_descriptor(device, LIBUSB_DT_DEVICE, 0, (unsigned char*)&deviceDescriptor, sizeof(deviceDescriptor)) < 0) { - libusb_close(device); - fail(tr("Could not read device descriptor.")); - return; - } - - char sn[64]; - memset(sn, 0x00, sizeof(sn)); - libusb_get_string_descriptor_ascii(device, deviceDescriptor.iSerialNumber, (unsigned char*)sn, sizeof(sn)); - sn[sizeof(sn) - 1] = '\0'; - - log(tr("OsmoSDR found (SN %1)").arg(sn)); - - quint8 buffer[255]; - if(libusb_get_descriptor(device, LIBUSB_DT_CONFIG, 0, buffer, sizeof(buffer)) < 16) { - libusb_close(device); - fail(tr("Could not get a configuration descriptor")); - return; - } - - if(buffer[15] != 1) { - libusb_close(device); - fail(tr("Device not in DFU mode as it should be")); - return; - } - - quint8 state; - - if(dfuGetState(device, &state) < 0) { - libusb_reset_device(device); - if(dfuGetState(device, &state) < 0) { - libusb_close(device); - fail(tr("Cannot get device DFU state")); - return; - } - } - if((state != ST_dfuIDLE) && (state != ST_dfuDNLOAD_IDLE)) { - dfuGetStatus(device); - libusb_close(device); - fail(tr("Device is not in dfuIDLE or dfuDNLOAD_IDLE state")); - return; - } - - if(libusb_claim_interface(device, 0) < 0) { - libusb_close(device); - fail(tr("Could not claim interface")); - return; - } - - QByteArray* image; - int altSetting; - - while(true) { - if(ui->dfu->isChecked()) { - log(tr("Starting download of DFU application")); - image = &m_dfuApp; - altSetting = 1; - } else if(ui->radio->isChecked()) { - log(tr("Starting download of radio application")); - image = &m_radioApp; - altSetting = 0; - } else if(ui->fpga->isChecked()) { - log(tr("Starting download of FPGA image")); - image = &m_fpgaBin; - altSetting = 2; - } else { - log(tr("Switching back to radio application mode")); - dfuDetach(device); - break; - } - - if(libusb_set_interface_alt_setting(device, 0, altSetting) < 0) { - libusb_close(device); - fail(tr("Could not set alternate interface setting to %1").arg(altSetting)); - return; - } - - ui->progress->setMaximum((image->size() / DFU_PACKETSIZE) + ((image->size() % DFU_PACKETSIZE) ? 1 : 0)); - - int blocknum = 0; - while((state == ST_dfuIDLE) || (state == ST_dfuDNLOAD_IDLE)) { - int offset = blocknum * DFU_PACKETSIZE; - int blocklen = (int)image->size() - offset; - if(blocklen < 0) - blocklen = 0; - if(blocklen > DFU_PACKETSIZE) - blocklen = DFU_PACKETSIZE; - if(dfuDownloadBlock(device, blocknum, (const quint8*)(image->data() + offset), blocklen) < 0) { - if(dfuGetState(device, &state) < 0) { - if(ui->dfu->isChecked()) - break; - libusb_close(device); - fail(tr("Cannot get device DFU state")); - return; - } - dfuGetStatus(device); - libusb_close(device); - fail(tr("Error downloading block %1").arg(blocknum)); - return; - } - dfuGetStatus(device); - if(blocklen == 0) - break; - blocknum++; - ui->progress->setValue(blocknum); - QApplication::processEvents(); - } - log(tr("Download complete (state %1)").arg(state)); - - do { - if(dfuGetState(device, &state) < 0) { - if(ui->dfu->isChecked()) { - break; - } else { - libusb_close(device); - fail(tr("Cannot get device DFU state")); - return; - } - } - dfuGetStatus(device); - } while(state == ST_dfuMANIFEST); - - if(ui->dfu->isChecked()) { - ui->dfu->setChecked(false); - m_searchTries = 0; - m_searchDeviceTimer.start(250); - libusb_close(device); - return; - } else if(ui->radio->isChecked()) { - ui->radio->setChecked(false); - } else if(ui->fpga->isChecked()) { - ui->fpga->setChecked(false); - } - - QApplication::processEvents(); - } - - log(tr("Upgrade finished successfully")); - libusb_close(device); - finish(); -} - -void OsmoSDRUpgrade::switchToDFU() -{ - libusb_device_handle* device = libusb_open_device_with_vid_pid(m_usb, OSMOSDR_USB_VID, OSMOSDR_USB_PID); - if(device == NULL) { - log(tr("No OsmoSDR VID:PID %1:%2 found").arg(OSMOSDR_USB_VID, 4, 16, QChar('0')).arg(OSMOSDR_USB_PID, 4, 16, QChar('0'))); - return; - } - - quint8 buffer[255]; - if(libusb_get_descriptor(device, LIBUSB_DT_CONFIG, 0, buffer, sizeof(buffer)) < 16) { - log(tr("Could not get a valid configuration descriptor")); - libusb_close(device); - return; - } - - if(buffer[15] != 1) { - if(libusb_claim_interface(device, 0) < 0) { - log(tr("Could not claim interface")); - libusb_close(device); - return; - } - - log(tr("Switching device to DFU mode")); - libusb_control_transfer(device, LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_ENDPOINT_OUT, 0x07, 0x0003, 0, NULL, 0, 50); - libusb_release_interface(device, 0); - } else { - log(tr("Device is already in DFU mode")); - } - - libusb_close(device); -} - -int OsmoSDRUpgrade::dfuGetState(libusb_device_handle* device, quint8* state) -{ - int res; - - res = libusb_control_transfer( - device, - 0xa1, - DFU_GETSTATE, - 0, - 0, - (unsigned char*)state, - 1, - 1000); - - return res; -} - -int OsmoSDRUpgrade::dfuGetStatus(libusb_device_handle* device) -{ - int res; - struct dfu_getstatus getstatus; -/* - static const char* statedesc[] = { - "appIDLE", - "appDETACH", - "dfuIDLE", - "dfuDNLOAD-SYNC", - "dfuDNBUSY", - "dfuDNLOAD-IDLE", - "dfuMANIFEST-SYNC", - "dfuMANIFEST", - "dfuMANIFEST-WAIT-RESET", - "dfuUPLOAD-IDLE", - "dfuERROR" - }; -*/ - - res = libusb_control_transfer( - device, - 0xa1, - DFU_GETSTATUS, - 0, - 0, - (unsigned char*)&getstatus, - sizeof(getstatus), - 1000); -/* - if(res >= 0) - log(tr("OsmoSDR bStatus: %1, bState: %2 (%3)").arg(getstatus.bStatus).arg(statedesc[getstatus.bState]).arg(getstatus.bState)); -*/ - return res; -} - -int OsmoSDRUpgrade::dfuClrStatus(libusb_device_handle* device) -{ - return libusb_control_transfer( - device, - 0x21, - DFU_CLRSTATUS, - 0, - 0, - NULL, - 0, - 1000); -} - -int OsmoSDRUpgrade::dfuDownloadBlock(libusb_device_handle* device, quint16 block, const quint8* data, quint16 len) -{ - return libusb_control_transfer( - device, - 0x21, - DFU_DNLOAD, - block, - 0, - (unsigned char*)data, - len, - 10000); -} - -int OsmoSDRUpgrade::dfuDetach(libusb_device_handle* device) -{ - return libusb_control_transfer( - device, - 0x21, - DFU_DETACH, - 0, - 0, - NULL, - 0, - 1000); -} - -void OsmoSDRUpgrade::fail(const QString& msg) -{ - log(tr("Fatal error: %1").arg(msg)); - QMessageBox::critical(this, tr("OsmoSDR Upgrade Failed"), msg); - finish(); -} - -void OsmoSDRUpgrade::finish() -{ - if(m_usb != NULL) { - libusb_exit(m_usb); - m_usb = NULL; - } - QApplication::restoreOverrideCursor(); - ui->start->setEnabled(true); - ui->close->setEnabled(true); -} - -void OsmoSDRUpgrade::log(const QString& msg) -{ - ui->log->appendPlainText(msg); - ui->log->moveCursor(QTextCursor::End); -} - -void OsmoSDRUpgrade::reject() -{ - if(ui->close->isEnabled()) - return QDialog::reject(); -} - -size_t OsmoSDRUpgrade::zipHelper(void* pOpaque, mz_uint64 file_ofs, const void* pBuf, size_t n) -{ - QByteArray* bytes = (QByteArray*)pOpaque; - bytes->append((const char*)pBuf, n); - return n; -} diff --git a/plugins/samplesource/osmosdr/osmosdrupgrade.h b/plugins/samplesource/osmosdr/osmosdrupgrade.h deleted file mode 100644 index efd930bce..000000000 --- a/plugins/samplesource/osmosdr/osmosdrupgrade.h +++ /dev/null @@ -1,60 +0,0 @@ -#ifndef INCLUDE_OSMOSDRUPGRADE_H -#define INCLUDE_OSMOSDRUPGRADE_H - -#include -#include -#include "util/miniz.h" - -typedef struct libusb_context libusb_context; -typedef struct libusb_device_handle libusb_device_handle; - -namespace Ui { - class OsmoSDRUpgrade; -} - -class OsmoSDRUpgrade : public QDialog { - Q_OBJECT - -public: - explicit OsmoSDRUpgrade(QWidget* parent = NULL); - ~OsmoSDRUpgrade(); - -private slots: - void on_browse_clicked(); - void on_dfu_toggled(bool checked); - void on_radio_toggled(bool checked); - void on_fpga_toggled(bool checked); - void on_start_clicked(); - void searchDeviceTick(); - -private: - Ui::OsmoSDRUpgrade* ui; - - libusb_context* m_usb; - - QByteArray m_dfuApp; - QByteArray m_radioApp; - QByteArray m_fpgaBin; - - int m_searchTries; - QTimer m_searchDeviceTimer; - - void updateFlashButton(); - - void switchToDFU(); - int dfuGetState(libusb_device_handle* device, quint8* state); - int dfuGetStatus(libusb_device_handle* device); - int dfuClrStatus(libusb_device_handle* device); - int dfuDownloadBlock(libusb_device_handle* device, quint16 block, const quint8* data, quint16 len); - int dfuDetach(libusb_device_handle* device); - - void fail(const QString& msg); - void finish(); - void log(const QString& msg); - - void reject(); - - static size_t zipHelper(void* pOpaque, mz_uint64 file_ofs, const void* pBuf, size_t n); -}; - -#endif // INCLUDE_OSMOSDRUPGRADE_H diff --git a/plugins/samplesource/osmosdr/osmosdrupgrade.ui b/plugins/samplesource/osmosdr/osmosdrupgrade.ui deleted file mode 100644 index d179f4c8d..000000000 --- a/plugins/samplesource/osmosdr/osmosdrupgrade.ui +++ /dev/null @@ -1,219 +0,0 @@ - - - OsmoSDRUpgrade - - - - 0 - 0 - 398 - 503 - - - - - Sans Serif - 9 - - - - OsmoSDR Firmware Upgrade - - - true - - - - - - Firmware Archive - - - - - - - 0 - 0 - - - - - 256 - 0 - - - - - - - Qt::PlainText - - - - - - - Browse... - - - - - - - - - - false - - - Firmware - - - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Size (Bytes) - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - DFU Application - - - - - - - Radio Application - - - - - - - FPGA Image - - - - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - false - - - Progress - - - - - - - - 0 - - - - - - - Flash! - - - - - - - - - true - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Close - - - - - - - - - - - close - clicked() - OsmoSDRUpgrade - reject() - - - 331 - 247 - - - 190 - 134 - - - - -