diff --git a/app/main.cpp b/app/main.cpp index ac2132170..549e95fe1 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("4.0.7"); + QCoreApplication::setApplicationVersion("4.1.0"); #if 1 qApp->setStyle(QStyleFactory::create("fusion")); diff --git a/appbench/main.cpp b/appbench/main.cpp index eb66ea658..f941b7150 100644 --- a/appbench/main.cpp +++ b/appbench/main.cpp @@ -57,7 +57,7 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo QCoreApplication::setOrganizationName("f4exb"); QCoreApplication::setApplicationName("SDRangelBench"); - QCoreApplication::setApplicationVersion("4.0.7"); + QCoreApplication::setApplicationVersion("4.1.0"); int catchSignals[] = {SIGQUIT, SIGINT, SIGTERM, SIGHUP}; std::vector vsig(catchSignals, catchSignals + sizeof(catchSignals) / sizeof(int)); diff --git a/appsrv/main.cpp b/appsrv/main.cpp index ed59df91a..dda2961ee 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("4.0.7"); + QCoreApplication::setApplicationVersion("4.1.0"); int catchSignals[] = {SIGQUIT, SIGINT, SIGTERM, SIGHUP}; std::vector vsig(catchSignals, catchSignals + sizeof(catchSignals) / sizeof(int)); diff --git a/debian/changelog b/debian/changelog index 87155db8d..d7342e7c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +sdrangel (4.1.0-1) unstable; urgency=medium + + * Integrated SDRdaemon + + -- Edouard Griffiths, F4EXB Sun, 02 Sep 2018 21:14:18 +0200 + sdrangel (4.0.7-1) unstable; urgency=medium * Scope: removed old scope objects diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html index 64864120e..71d0f3a38 100644 --- a/sdrbase/resources/webapi/doc/html2/index.html +++ b/sdrbase/resources/webapi/doc/html2/index.html @@ -1666,6 +1666,47 @@ margin-bottom: 20px; } }, "description" : "DV serial device details" +}; + defs.DaemonSummaryResponse = { + "required" : [ "appname", "architecture", "dspRxBits", "dspTxBits", "os", "pid", "qtVersion", "version" ], + "properties" : { + "version" : { + "type" : "string", + "description" : "Current software version" + }, + "qtVersion" : { + "type" : "string", + "description" : "Qt version with which the software was compiled" + }, + "dspRxBits" : { + "type" : "integer", + "description" : "Number of samples significant bits in software Rx DSP" + }, + "dspTxBits" : { + "type" : "integer", + "description" : "Number of samples significant bits in software Tx DSP" + }, + "pid" : { + "type" : "integer", + "description" : "PID of the SDRangel instance" + }, + "appname" : { + "type" : "string", + "description" : "Application name: SDRangel for a GUI instance and SDRangelSrv for a server instance" + }, + "architecture" : { + "type" : "string", + "description" : "Codename of the CPU architecture on which the instance is running (available with Qt >= 5.4)" + }, + "os" : { + "type" : "string", + "description" : "Descriptive text of the operating system running the instance (available with Qt >= 5.4)" + }, + "samplingDevice" : { + "$ref" : "#/definitions/SamplingDevice" + } + }, + "description" : "Summarized information about this SDRdaemon instance" }; defs.DeviceListItem = { "properties" : { @@ -2197,7 +2238,7 @@ margin-bottom: 20px; "description" : "Summarized information about logical devices from hardware devices attached to this SDRangel instance" }; defs.InstanceSummaryResponse = { - "required" : [ "appname", "devicesetlist", "dspRxBits", "dspTxBits", "pid", "qtVersion", "version" ], + "required" : [ "appname", "architecture", "devicesetlist", "dspRxBits", "dspTxBits", "os", "pid", "qtVersion", "version" ], "properties" : { "version" : { "type" : "string", @@ -3958,6 +3999,31 @@ margin-bottom: 20px; -->
  • API Summary
    • +
  • API Methods - Daemon
    • +
  • + daemonInstanceSummary +
    • +
  • + daemonReportGet +
    • +
  • + daemonRunDelete +
    • +
  • + daemonRunGet +
    • +
  • + daemonRunPost +
    • +
  • + daemonSettingsGet +
    • +
  • + daemonSettingsPatch +
    • +
  • + daemonSettingsPut +
  • API Methods - DeviceSet
  • devicesetChannelDelete @@ -4105,7 +4171,7 @@ margin-bottom: 20px;
  • API Summary
    • +
  • API Methods - Daemon
    • +
  • + daemonInstanceSummary +
    • +
  • + daemonReportGet +
    • +
  • + daemonRunDelete +
    • +
  • + daemonRunGet +
    • +
  • + daemonRunPost +
    • +
  • + daemonSettingsGet +
    • +
  • + daemonSettingsPatch +
    • +
  • + daemonSettingsPut +
  • API Methods - DeviceSet
  • devicesetChannelDelete @@ -4105,7 +4171,7 @@ margin-bottom: 20px;