Build ModAM tx channel server plugin. Bumped version to 3.14.2

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"));

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<int> vsig(catchSignals, catchSignals + sizeof(catchSignals) / sizeof(int));

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 <f4exb06@gmail.com>  Sun, 08 Apr 2018 12:14:18 +0200
+
 sdrangel (3.14.1-1) unstable; urgency=medium
 
   * NFM: fixed lowpass filter initialization (CTCSS)

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,

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,

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,

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,

pluginssrv/channeltx/CMakeLists.txt

@@ -1,3 +1,4 @@
 project(mod)
 
+add_subdirectory(modam)
 add_subdirectory(modnfm)

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)