From dc2df804f7ab4a8237b2e8fe0adf05ecece841e3 Mon Sep 17 00:00:00 2001 From: f4exb Date: Tue, 27 Dec 2016 03:14:50 +0100 Subject: [PATCH] HackRF Tx support: rename more Rx files and cmake items --- plugins/samplesource/CMakeLists.txt | 4 ++-- .../{hackrf => hackrfinput}/CMakeLists.txt | 18 +++++++++--------- .../{hackrf => hackrfinput}/hackrfinput.cpp | 8 ++++---- .../{hackrf => hackrfinput}/hackrfinput.h | 3 ++- .../hackrf.pro => hackrfinput/hackrfinput.pro} | 0 .../{hackrf => hackrfinput}/hackrfinputgui.cpp | 3 ++- .../{hackrf => hackrfinput}/hackrfinputgui.h | 2 +- .../{hackrf => hackrfinput}/hackrfinputgui.ui | 0 .../hackrfinputplugin.cpp | 6 ++++-- .../hackrfinputplugin.h | 0 .../hackrfinputsettings.cpp | 3 ++- .../hackrfinputsettings.h | 2 ++ .../hackrfinputthread.cpp | 3 ++- .../hackrfinputthread.h | 0 14 files changed, 30 insertions(+), 22 deletions(-) rename plugins/samplesource/{hackrf => hackrfinput}/CMakeLists.txt (78%) rename plugins/samplesource/{hackrf => hackrfinput}/hackrfinput.cpp (98%) rename plugins/samplesource/{hackrf => hackrfinput}/hackrfinput.h (98%) rename plugins/samplesource/{hackrf/hackrf.pro => hackrfinput/hackrfinput.pro} (100%) rename plugins/samplesource/{hackrf => hackrfinput}/hackrfinputgui.cpp (99%) rename plugins/samplesource/{hackrf => hackrfinput}/hackrfinputgui.h (98%) rename plugins/samplesource/{hackrf => hackrfinput}/hackrfinputgui.ui (100%) rename plugins/samplesource/{hackrf => hackrfinput}/hackrfinputplugin.cpp (97%) rename plugins/samplesource/{hackrf => hackrfinput}/hackrfinputplugin.h (100%) rename plugins/samplesource/{hackrf => hackrfinput}/hackrfinputsettings.cpp (98%) rename plugins/samplesource/{hackrf => hackrfinput}/hackrfinputsettings.h (98%) rename plugins/samplesource/{hackrf => hackrfinput}/hackrfinputthread.cpp (99%) rename plugins/samplesource/{hackrf => hackrfinput}/hackrfinputthread.h (100%) diff --git a/plugins/samplesource/CMakeLists.txt b/plugins/samplesource/CMakeLists.txt index e5318a504..30b7a158d 100644 --- a/plugins/samplesource/CMakeLists.txt +++ b/plugins/samplesource/CMakeLists.txt @@ -39,7 +39,7 @@ endif(LIBUSB_FOUND AND LIBAIRSPY_FOUND) find_package(LibHACKRF) if(LIBUSB_FOUND AND LIBHACKRF_FOUND) - add_subdirectory(hackrf) + add_subdirectory(hackrfinput) endif(LIBUSB_FOUND AND LIBHACKRF_FOUND) find_package(LibMiriSDR) @@ -66,7 +66,7 @@ if (BUILD_DEBIAN) add_subdirectory(sdrdaemonfec) endif (LIBNANOMSG_FOUND) add_subdirectory(airspy) - add_subdirectory(hackrf) + add_subdirectory(hackrfinput) add_subdirectory(rtlsdr) add_subdirectory(bladerfinput) add_subdirectory(sdrplay) diff --git a/plugins/samplesource/hackrf/CMakeLists.txt b/plugins/samplesource/hackrfinput/CMakeLists.txt similarity index 78% rename from plugins/samplesource/hackrf/CMakeLists.txt rename to plugins/samplesource/hackrfinput/CMakeLists.txt index 8d2f987ed..632095950 100644 --- a/plugins/samplesource/hackrf/CMakeLists.txt +++ b/plugins/samplesource/hackrfinput/CMakeLists.txt @@ -1,6 +1,6 @@ -project(hackrf) +project(hackrfinput) -set(hackrf_SOURCES +set(hackrfinput_SOURCES hackrfinputgui.cpp hackrfinput.cpp hackrfinputplugin.cpp @@ -8,7 +8,7 @@ set(hackrf_SOURCES hackrfinputthread.cpp ) -set(hackrf_HEADERS +set(hackrfinput_HEADERS hackrfinputgui.h hackrfinput.h hackrfinputplugin.h @@ -16,7 +16,7 @@ set(hackrf_HEADERS hackrfinputthread.h ) -set(hackrf_FORMS +set(hackrfinput_FORMS hackrfinputgui.ui ) @@ -41,13 +41,13 @@ add_definitions("${QT_DEFINITIONS} -DLIBHACKRF_DYN_RATES") add_definitions(-DQT_PLUGIN) add_definitions(-DQT_SHARED) -#qt4_wrap_cpp(hackrf_HEADERS_MOC ${hackrf_HEADERS}) -qt5_wrap_ui(hackrf_FORMS_HEADERS ${hackrf_FORMS}) +#qt4_wrap_cpp(hackrfinput_HEADERS_MOC ${hackrfinput_HEADERS}) +qt5_wrap_ui(hackrfinput_FORMS_HEADERS ${hackrfinput_FORMS}) add_library(inputhackrf SHARED - ${hackrf_SOURCES} - ${hackrf_HEADERS_MOC} - ${hackrf_FORMS_HEADERS} + ${hackrfinput_SOURCES} + ${hackrfinput_HEADERS_MOC} + ${hackrfinput_FORMS_HEADERS} ) if (BUILD_DEBIAN) diff --git a/plugins/samplesource/hackrf/hackrfinput.cpp b/plugins/samplesource/hackrfinput/hackrfinput.cpp similarity index 98% rename from plugins/samplesource/hackrf/hackrfinput.cpp rename to plugins/samplesource/hackrfinput/hackrfinput.cpp index 9f68ffccf..b97ffc2d1 100644 --- a/plugins/samplesource/hackrf/hackrfinput.cpp +++ b/plugins/samplesource/hackrfinput/hackrfinput.cpp @@ -14,6 +14,8 @@ // along with this program. If not, see . // /////////////////////////////////////////////////////////////////////////////////// +#include "../hackrfinput/hackrfinput.h" + #include #include #include @@ -21,12 +23,10 @@ #include "util/simpleserializer.h" #include "dsp/dspcommands.h" #include "dsp/dspengine.h" -#include "hackrfinput.h" - #include -#include "hackrfinputgui.h" -#include "hackrfinputthread.h" +#include "../hackrfinput/hackrfinputgui.h" +#include "../hackrfinput/hackrfinputthread.h" MESSAGE_CLASS_DEFINITION(HackRFInput::MsgConfigureHackRF, Message) MESSAGE_CLASS_DEFINITION(HackRFInput::MsgReportHackRF, Message) diff --git a/plugins/samplesource/hackrf/hackrfinput.h b/plugins/samplesource/hackrfinput/hackrfinput.h similarity index 98% rename from plugins/samplesource/hackrf/hackrfinput.h rename to plugins/samplesource/hackrfinput/hackrfinput.h index c0c8dd968..1251572f5 100644 --- a/plugins/samplesource/hackrf/hackrfinput.h +++ b/plugins/samplesource/hackrfinput/hackrfinput.h @@ -20,7 +20,8 @@ #include #include "libhackrf/hackrf.h" #include -#include "hackrfinputsettings.h" + +#include "../hackrfinput/hackrfinputsettings.h" class DeviceSourceAPI; class HackRFInputThread; diff --git a/plugins/samplesource/hackrf/hackrf.pro b/plugins/samplesource/hackrfinput/hackrfinput.pro similarity index 100% rename from plugins/samplesource/hackrf/hackrf.pro rename to plugins/samplesource/hackrfinput/hackrfinput.pro diff --git a/plugins/samplesource/hackrf/hackrfinputgui.cpp b/plugins/samplesource/hackrfinput/hackrfinputgui.cpp similarity index 99% rename from plugins/samplesource/hackrf/hackrfinputgui.cpp rename to plugins/samplesource/hackrfinput/hackrfinputgui.cpp index 72ca8f871..f1d3485e1 100644 --- a/plugins/samplesource/hackrf/hackrfinputgui.cpp +++ b/plugins/samplesource/hackrfinput/hackrfinputgui.cpp @@ -14,6 +14,8 @@ // along with this program. If not, see . // /////////////////////////////////////////////////////////////////////////////////// +#include "../hackrfinput/hackrfinputgui.h" + #include #include @@ -26,7 +28,6 @@ #include #include -#include "hackrfinputgui.h" #include "ui_hackrfinputgui.h" HackRFInputGui::HackRFInputGui(DeviceSourceAPI *deviceAPI, QWidget* parent) : diff --git a/plugins/samplesource/hackrf/hackrfinputgui.h b/plugins/samplesource/hackrfinput/hackrfinputgui.h similarity index 98% rename from plugins/samplesource/hackrf/hackrfinputgui.h rename to plugins/samplesource/hackrfinput/hackrfinputgui.h index ad449dc2f..b21b1f003 100644 --- a/plugins/samplesource/hackrf/hackrfinputgui.h +++ b/plugins/samplesource/hackrfinput/hackrfinputgui.h @@ -19,8 +19,8 @@ #include -#include "hackrfinput.h" #include "plugin/plugingui.h" +#include "../hackrfinput/hackrfinput.h" #define HACKRF_MAX_DEVICE (32) diff --git a/plugins/samplesource/hackrf/hackrfinputgui.ui b/plugins/samplesource/hackrfinput/hackrfinputgui.ui similarity index 100% rename from plugins/samplesource/hackrf/hackrfinputgui.ui rename to plugins/samplesource/hackrfinput/hackrfinputgui.ui diff --git a/plugins/samplesource/hackrf/hackrfinputplugin.cpp b/plugins/samplesource/hackrfinput/hackrfinputplugin.cpp similarity index 97% rename from plugins/samplesource/hackrf/hackrfinputplugin.cpp rename to plugins/samplesource/hackrfinput/hackrfinputplugin.cpp index fbbdc57ab..ce6f1c09a 100644 --- a/plugins/samplesource/hackrf/hackrfinputplugin.cpp +++ b/plugins/samplesource/hackrfinput/hackrfinputplugin.cpp @@ -14,6 +14,8 @@ // along with this program. If not, see . // /////////////////////////////////////////////////////////////////////////////////// +#include "../hackrfinput/hackrfinputplugin.h" + #include #include #include "libhackrf/hackrf.h" @@ -22,8 +24,8 @@ #include "plugin/pluginapi.h" #include "util/simpleserializer.h" -#include "hackrfinputplugin.h" -#include "hackrfinputgui.h" + +#include "../hackrfinput/hackrfinputgui.h" const PluginDescriptor HackRFInputPlugin::m_pluginDescriptor = { QString("HackRF Input"), diff --git a/plugins/samplesource/hackrf/hackrfinputplugin.h b/plugins/samplesource/hackrfinput/hackrfinputplugin.h similarity index 100% rename from plugins/samplesource/hackrf/hackrfinputplugin.h rename to plugins/samplesource/hackrfinput/hackrfinputplugin.h diff --git a/plugins/samplesource/hackrf/hackrfinputsettings.cpp b/plugins/samplesource/hackrfinput/hackrfinputsettings.cpp similarity index 98% rename from plugins/samplesource/hackrf/hackrfinputsettings.cpp rename to plugins/samplesource/hackrfinput/hackrfinputsettings.cpp index 34da99b93..dca1dabe9 100644 --- a/plugins/samplesource/hackrf/hackrfinputsettings.cpp +++ b/plugins/samplesource/hackrfinput/hackrfinputsettings.cpp @@ -14,10 +14,11 @@ // along with this program. If not, see . // /////////////////////////////////////////////////////////////////////////////////// +#include "../hackrfinput/hackrfinputsettings.h" + #include #include "util/simpleserializer.h" -#include "hackrfinputsettings.h" HackRFInputSettings::HackRFInputSettings() { diff --git a/plugins/samplesource/hackrf/hackrfinputsettings.h b/plugins/samplesource/hackrfinput/hackrfinputsettings.h similarity index 98% rename from plugins/samplesource/hackrf/hackrfinputsettings.h rename to plugins/samplesource/hackrfinput/hackrfinputsettings.h index c4f4b792d..104f74de2 100644 --- a/plugins/samplesource/hackrf/hackrfinputsettings.h +++ b/plugins/samplesource/hackrfinput/hackrfinputsettings.h @@ -17,6 +17,8 @@ #ifndef _HACKRF_HACKRFINPUTSETTINGS_H_ #define _HACKRF_HACKRFINPUTSETTINGS_H_ +#include + struct HackRFInputSettings { typedef enum { FC_POS_INFRA = 0, diff --git a/plugins/samplesource/hackrf/hackrfinputthread.cpp b/plugins/samplesource/hackrfinput/hackrfinputthread.cpp similarity index 99% rename from plugins/samplesource/hackrf/hackrfinputthread.cpp rename to plugins/samplesource/hackrfinput/hackrfinputthread.cpp index f861c8bbc..7a4ed7043 100644 --- a/plugins/samplesource/hackrf/hackrfinputthread.cpp +++ b/plugins/samplesource/hackrfinput/hackrfinputthread.cpp @@ -14,11 +14,12 @@ // along with this program. If not, see . // /////////////////////////////////////////////////////////////////////////////////// +#include "../hackrfinput/hackrfinputthread.h" + #include #include #include "../../../sdrbase/dsp/samplesinkfifo.h" -#include "hackrfinputthread.h" HackRFInputThread *HackRFInputThread::m_this = 0; diff --git a/plugins/samplesource/hackrf/hackrfinputthread.h b/plugins/samplesource/hackrfinput/hackrfinputthread.h similarity index 100% rename from plugins/samplesource/hackrf/hackrfinputthread.h rename to plugins/samplesource/hackrfinput/hackrfinputthread.h