From b2d153ed9e542d7f97b7901acc9c2fd95a81a51f Mon Sep 17 00:00:00 2001 From: f4exb Date: Fri, 6 Apr 2018 01:04:31 +0200 Subject: [PATCH] Build ModAM tx channel server plugin. Bumped version to 3.14.2 --- app/main.cpp | 2 +- appsrv/main.cpp | 2 +- debian/changelog | 8 ++++ plugins/channeltx/modam/ammodplugin.cpp | 2 +- .../bladerfoutput/bladerfoutputplugin.cpp | 2 +- .../samplesource/airspyhf/airspyhfplugin.cpp | 2 +- .../bladerfinput/bladerfinputplugin.cpp | 2 +- pluginssrv/channeltx/CMakeLists.txt | 1 + pluginssrv/channeltx/modam/CMakeLists.txt | 41 +++++++++++++++++++ 9 files changed, 56 insertions(+), 6 deletions(-) create mode 100644 pluginssrv/channeltx/modam/CMakeLists.txt diff --git a/app/main.cpp b/app/main.cpp index 13f5a1121..26cf88c1e 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -35,7 +35,7 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo */ QCoreApplication::setOrganizationName("f4exb"); QCoreApplication::setApplicationName("SDRangel"); - QCoreApplication::setApplicationVersion("3.14.1"); + QCoreApplication::setApplicationVersion("3.14.2"); #if 1 qApp->setStyle(QStyleFactory::create("fusion")); diff --git a/appsrv/main.cpp b/appsrv/main.cpp index 5b06ce273..7ead47de4 100644 --- a/appsrv/main.cpp +++ b/appsrv/main.cpp @@ -56,7 +56,7 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo QCoreApplication::setOrganizationName("f4exb"); QCoreApplication::setApplicationName("SDRangelSrv"); - QCoreApplication::setApplicationVersion("3.14.1"); + QCoreApplication::setApplicationVersion("3.14.2"); int catchSignals[] = {SIGQUIT, SIGINT, SIGTERM, SIGHUP}; std::vector vsig(catchSignals, catchSignals + sizeof(catchSignals) / sizeof(int)); diff --git a/debian/changelog b/debian/changelog index d49c569fc..b969dce39 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +sdrangel (3.14.1-1) unstable; urgency=medium + + * Web API: settings and report for AM mod + * Server: AirspyHF, BladeRF, AM support + * PVS-Studio static analysis corrections (4) + + -- Edouard Griffiths, F4EXB Sun, 08 Apr 2018 12:14:18 +0200 + sdrangel (3.14.1-1) unstable; urgency=medium * NFM: fixed lowpass filter initialization (CTCSS) diff --git a/plugins/channeltx/modam/ammodplugin.cpp b/plugins/channeltx/modam/ammodplugin.cpp index e2f5d903f..4913395e7 100644 --- a/plugins/channeltx/modam/ammodplugin.cpp +++ b/plugins/channeltx/modam/ammodplugin.cpp @@ -24,7 +24,7 @@ const PluginDescriptor AMModPlugin::m_pluginDescriptor = { QString("AM Modulator"), - QString("3.12.0"), + QString("3.14.2"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/samplesink/bladerfoutput/bladerfoutputplugin.cpp b/plugins/samplesink/bladerfoutput/bladerfoutputplugin.cpp index 9d1b2c6fe..d606f2e05 100644 --- a/plugins/samplesink/bladerfoutput/bladerfoutputplugin.cpp +++ b/plugins/samplesink/bladerfoutput/bladerfoutputplugin.cpp @@ -26,7 +26,7 @@ const PluginDescriptor BladerfOutputPlugin::m_pluginDescriptor = { QString("BladeRF Output"), - QString("3.14.1"), + QString("3.14.2"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/samplesource/airspyhf/airspyhfplugin.cpp b/plugins/samplesource/airspyhf/airspyhfplugin.cpp index cb81e2874..d2b77c418 100644 --- a/plugins/samplesource/airspyhf/airspyhfplugin.cpp +++ b/plugins/samplesource/airspyhf/airspyhfplugin.cpp @@ -27,7 +27,7 @@ const PluginDescriptor AirspyHFPlugin::m_pluginDescriptor = { QString("AirspyHF Input"), - QString("3.14.0"), + QString("3.14.2"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/samplesource/bladerfinput/bladerfinputplugin.cpp b/plugins/samplesource/bladerfinput/bladerfinputplugin.cpp index 2cedb7e94..e8c48b3f2 100644 --- a/plugins/samplesource/bladerfinput/bladerfinputplugin.cpp +++ b/plugins/samplesource/bladerfinput/bladerfinputplugin.cpp @@ -27,7 +27,7 @@ const PluginDescriptor BlderfInputPlugin::m_pluginDescriptor = { QString("BladeRF Input"), - QString("3.14.1"), + QString("3.14.2"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/pluginssrv/channeltx/CMakeLists.txt b/pluginssrv/channeltx/CMakeLists.txt index 2bccaebd3..c43165da7 100644 --- a/pluginssrv/channeltx/CMakeLists.txt +++ b/pluginssrv/channeltx/CMakeLists.txt @@ -1,3 +1,4 @@ project(mod) +add_subdirectory(modam) add_subdirectory(modnfm) diff --git a/pluginssrv/channeltx/modam/CMakeLists.txt b/pluginssrv/channeltx/modam/CMakeLists.txt new file mode 100644 index 000000000..c7c948b84 --- /dev/null +++ b/pluginssrv/channeltx/modam/CMakeLists.txt @@ -0,0 +1,41 @@ +project(modam) + +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") +set(PLUGIN_PREFIX "../../../plugins/channeltx/modam") + +set(modam_SOURCES + ${PLUGIN_PREFIX}/ammod.cpp + ${PLUGIN_PREFIX}/ammodplugin.cpp + ${PLUGIN_PREFIX}/ammodsettings.cpp +) + +set(modam_HEADERS + ${PLUGIN_PREFIX}/ammod.h + ${PLUGIN_PREFIX}/ammodplugin.h + ${PLUGIN_PREFIX}/ammodsettings.h +) + +include_directories( + . + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client +) + +add_definitions(${QT_DEFINITIONS}) +add_definitions(-DQT_PLUGIN) +add_definitions(-DQT_SHARED) + +add_library(modamsrv SHARED + ${modam_SOURCES} + ${modam_HEADERS_MOC} +) + +target_link_libraries(modamsrv + ${QT_LIBRARIES} + sdrbase + swagger +) + +qt5_use_modules(modamsrv Core Widgets) + +install(TARGETS modamsrv DESTINATION lib/pluginssrv/channeltx) \ No newline at end of file