diff --git a/plugins/channeltx/modssb/ssbmodsettings.cpp b/plugins/channeltx/modssb/ssbmodsettings.cpp
index 09fea178c..21540287b 100644
--- a/plugins/channeltx/modssb/ssbmodsettings.cpp
+++ b/plugins/channeltx/modssb/ssbmodsettings.cpp
@@ -65,8 +65,6 @@ void SSBModSettings::resetToDefaults()
m_agcThresholdGate = 192;
m_agcThresholdDelay = 2400;
m_rgbColor = QColor(0, 255, 0).rgb();
- m_udpAddress = "127.0.0.1";
- m_udpPort = 9999;
m_title = "SSB Modulator";
m_audioDeviceName = AudioDeviceManager::m_defaultDeviceName;
}
diff --git a/plugins/channeltx/modssb/ssbmodsettings.h b/plugins/channeltx/modssb/ssbmodsettings.h
index 1266b0edc..8c994685e 100644
--- a/plugins/channeltx/modssb/ssbmodsettings.h
+++ b/plugins/channeltx/modssb/ssbmodsettings.h
@@ -49,9 +49,6 @@ struct SSBModSettings
int m_agcThresholdDelay;
quint32 m_rgbColor;
- QString m_udpAddress;
- uint16_t m_udpPort;
-
QString m_title;
QString m_audioDeviceName;
diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html
index 0ea7df856..b04303e39 100644
--- a/sdrbase/resources/webapi/doc/html2/index.html
+++ b/sdrbase/resources/webapi/doc/html2/index.html
@@ -1130,6 +1130,9 @@ margin-bottom: 20px;
"NFMModReport" : {
"$ref" : "#/definitions/NFMModReport"
},
+ "SSBModReport" : {
+ "$ref" : "#/definitions/SSBModReport"
+ },
"WFMModReport" : {
"$ref" : "#/definitions/WFMModReport"
}
@@ -1160,6 +1163,9 @@ margin-bottom: 20px;
"NFMModSettings" : {
"$ref" : "#/definitions/NFMModSettings"
},
+ "SSBModSettings" : {
+ "$ref" : "#/definitions/SSBModSettings"
+ },
"WFMModSettings" : {
"$ref" : "#/definitions/WFMModSettings"
}
@@ -1979,6 +1985,105 @@ margin-bottom: 20px;
}
},
"description" : "RTLSDR"
+};
+ defs.SSBModReport = {
+ "properties" : {
+ "channelPowerDB" : {
+ "type" : "number",
+ "format" : "float",
+ "description" : "power transmitted in channel (dB)"
+ },
+ "audioSampleRate" : {
+ "type" : "integer"
+ },
+ "channelSampleRate" : {
+ "type" : "integer"
+ }
+ },
+ "description" : "AMMod"
+};
+ defs.SSBModSettings = {
+ "properties" : {
+ "inputFrequencyOffset" : {
+ "type" : "integer",
+ "format" : "int64"
+ },
+ "bandwidth" : {
+ "type" : "number",
+ "format" : "float"
+ },
+ "lowCutoff" : {
+ "type" : "number",
+ "format" : "float"
+ },
+ "usb" : {
+ "type" : "integer"
+ },
+ "toneFrequency" : {
+ "type" : "number",
+ "format" : "float"
+ },
+ "volumeFactor" : {
+ "type" : "number",
+ "format" : "float"
+ },
+ "spanLog2" : {
+ "type" : "integer"
+ },
+ "audioBinaural" : {
+ "type" : "integer"
+ },
+ "audioFlipChannels" : {
+ "type" : "integer"
+ },
+ "dsb" : {
+ "type" : "integer"
+ },
+ "audioMute" : {
+ "type" : "integer"
+ },
+ "playLoop" : {
+ "type" : "integer"
+ },
+ "agc" : {
+ "type" : "integer"
+ },
+ "agcOrder" : {
+ "type" : "number",
+ "format" : "float"
+ },
+ "agcTime" : {
+ "type" : "integer"
+ },
+ "agcThresholdEnable" : {
+ "type" : "integer"
+ },
+ "agcThreshold" : {
+ "type" : "integer"
+ },
+ "agcThresholdGate" : {
+ "type" : "integer"
+ },
+ "agcThresholdDelay" : {
+ "type" : "integer"
+ },
+ "rgbColor" : {
+ "type" : "integer"
+ },
+ "title" : {
+ "type" : "string"
+ },
+ "audioDeviceName" : {
+ "type" : "string"
+ },
+ "modAFInput" : {
+ "type" : "integer"
+ },
+ "cwKeyer" : {
+ "$ref" : "#/definitions/CWKeyerSettings"
+ }
+ },
+ "description" : "SSBMod"
};
defs.SamplingDevice = {
"required" : [ "bandwidth", "centerFrequency", "hwType", "index", "sequence", "serial", "state", "streamIndex" ],
@@ -20334,7 +20439,7 @@ except ApiException as e:
- Generated 2018-04-08T18:14:01.611+02:00
+ Generated 2018-04-12T23:48:02.735+02:00
diff --git a/sdrbase/resources/webapi/doc/swagger/swagger.yaml b/sdrbase/resources/webapi/doc/swagger/swagger.yaml
index b8e8deeae..b6e1a15ae 100644
--- a/sdrbase/resources/webapi/doc/swagger/swagger.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/swagger.yaml
@@ -1753,6 +1753,8 @@ definitions:
$ref: "/doc/swagger/include/NFMDemod.yaml#/NFMDemodSettings"
NFMModSettings:
$ref: "/doc/swagger/include/NFMMod.yaml#/NFMModSettings"
+ SSBModSettings:
+ $ref: "/doc/swagger/include/SSBMod.yaml#/SSBModSettings"
WFMModSettings:
$ref: "/doc/swagger/include/WFMMod.yaml#/WFMModSettings"
@@ -1774,6 +1776,8 @@ definitions:
$ref: "/doc/swagger/include/NFMDemod.yaml#/NFMDemodReport"
NFMModReport:
$ref: "/doc/swagger/include/NFMMod.yaml#/NFMModReport"
+ SSBModReport:
+ $ref: "/doc/swagger/include/SSBMod.yaml#/SSBModReport"
WFMModReport:
$ref: "/doc/swagger/include/WFMMod.yaml#/WFMModReport"
diff --git a/swagger/sdrangel/api/swagger/swagger.yaml b/swagger/sdrangel/api/swagger/swagger.yaml
index 5d9861671..50a63cb35 100644
--- a/swagger/sdrangel/api/swagger/swagger.yaml
+++ b/swagger/sdrangel/api/swagger/swagger.yaml
@@ -1753,6 +1753,8 @@ definitions:
$ref: "http://localhost:8081/api/swagger/include/NFMDemod.yaml#/NFMDemodSettings"
NFMModSettings:
$ref: "http://localhost:8081/api/swagger/include/NFMMod.yaml#/NFMModSettings"
+ SSBModSettings:
+ $ref: "http://localhost:8081/api/swagger/include/SSBMod.yaml#/SSBModSettings"
WFMModSettings:
$ref: "http://localhost:8081/api/swagger/include/WFMMod.yaml#/WFMModSettings"
@@ -1774,6 +1776,8 @@ definitions:
$ref: "http://localhost:8081/api/swagger/include/NFMDemod.yaml#/NFMDemodReport"
NFMModReport:
$ref: "http://localhost:8081/api/swagger/include/NFMMod.yaml#/NFMModReport"
+ SSBModReport:
+ $ref: "http://localhost:8081/api/swagger/include/SSBMod.yaml#/SSBModReport"
WFMModReport:
$ref: "http://localhost:8081/api/swagger/include/WFMMod.yaml#/WFMModReport"
diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html
index 0ea7df856..b04303e39 100644
--- a/swagger/sdrangel/code/html2/index.html
+++ b/swagger/sdrangel/code/html2/index.html
@@ -1130,6 +1130,9 @@ margin-bottom: 20px;
"NFMModReport" : {
"$ref" : "#/definitions/NFMModReport"
},
+ "SSBModReport" : {
+ "$ref" : "#/definitions/SSBModReport"
+ },
"WFMModReport" : {
"$ref" : "#/definitions/WFMModReport"
}
@@ -1160,6 +1163,9 @@ margin-bottom: 20px;
"NFMModSettings" : {
"$ref" : "#/definitions/NFMModSettings"
},
+ "SSBModSettings" : {
+ "$ref" : "#/definitions/SSBModSettings"
+ },
"WFMModSettings" : {
"$ref" : "#/definitions/WFMModSettings"
}
@@ -1979,6 +1985,105 @@ margin-bottom: 20px;
}
},
"description" : "RTLSDR"
+};
+ defs.SSBModReport = {
+ "properties" : {
+ "channelPowerDB" : {
+ "type" : "number",
+ "format" : "float",
+ "description" : "power transmitted in channel (dB)"
+ },
+ "audioSampleRate" : {
+ "type" : "integer"
+ },
+ "channelSampleRate" : {
+ "type" : "integer"
+ }
+ },
+ "description" : "AMMod"
+};
+ defs.SSBModSettings = {
+ "properties" : {
+ "inputFrequencyOffset" : {
+ "type" : "integer",
+ "format" : "int64"
+ },
+ "bandwidth" : {
+ "type" : "number",
+ "format" : "float"
+ },
+ "lowCutoff" : {
+ "type" : "number",
+ "format" : "float"
+ },
+ "usb" : {
+ "type" : "integer"
+ },
+ "toneFrequency" : {
+ "type" : "number",
+ "format" : "float"
+ },
+ "volumeFactor" : {
+ "type" : "number",
+ "format" : "float"
+ },
+ "spanLog2" : {
+ "type" : "integer"
+ },
+ "audioBinaural" : {
+ "type" : "integer"
+ },
+ "audioFlipChannels" : {
+ "type" : "integer"
+ },
+ "dsb" : {
+ "type" : "integer"
+ },
+ "audioMute" : {
+ "type" : "integer"
+ },
+ "playLoop" : {
+ "type" : "integer"
+ },
+ "agc" : {
+ "type" : "integer"
+ },
+ "agcOrder" : {
+ "type" : "number",
+ "format" : "float"
+ },
+ "agcTime" : {
+ "type" : "integer"
+ },
+ "agcThresholdEnable" : {
+ "type" : "integer"
+ },
+ "agcThreshold" : {
+ "type" : "integer"
+ },
+ "agcThresholdGate" : {
+ "type" : "integer"
+ },
+ "agcThresholdDelay" : {
+ "type" : "integer"
+ },
+ "rgbColor" : {
+ "type" : "integer"
+ },
+ "title" : {
+ "type" : "string"
+ },
+ "audioDeviceName" : {
+ "type" : "string"
+ },
+ "modAFInput" : {
+ "type" : "integer"
+ },
+ "cwKeyer" : {
+ "$ref" : "#/definitions/CWKeyerSettings"
+ }
+ },
+ "description" : "SSBMod"
};
defs.SamplingDevice = {
"required" : [ "bandwidth", "centerFrequency", "hwType", "index", "sequence", "serial", "state", "streamIndex" ],
@@ -20334,7 +20439,7 @@ except ApiException as e:
- Generated 2018-04-08T18:14:01.611+02:00
+ Generated 2018-04-12T23:48:02.735+02:00
diff --git a/swagger/sdrangel/code/qt5/client/SWGChannelReport.cpp b/swagger/sdrangel/code/qt5/client/SWGChannelReport.cpp
index bbb3a9267..5740d89e8 100644
--- a/swagger/sdrangel/code/qt5/client/SWGChannelReport.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGChannelReport.cpp
@@ -40,6 +40,8 @@ SWGChannelReport::SWGChannelReport() {
m_nfm_demod_report_isSet = false;
nfm_mod_report = nullptr;
m_nfm_mod_report_isSet = false;
+ ssb_mod_report = nullptr;
+ m_ssb_mod_report_isSet = false;
wfm_mod_report = nullptr;
m_wfm_mod_report_isSet = false;
}
@@ -62,6 +64,8 @@ SWGChannelReport::init() {
m_nfm_demod_report_isSet = false;
nfm_mod_report = new SWGNFMModReport();
m_nfm_mod_report_isSet = false;
+ ssb_mod_report = new SWGSSBModReport();
+ m_ssb_mod_report_isSet = false;
wfm_mod_report = new SWGWFMModReport();
m_wfm_mod_report_isSet = false;
}
@@ -84,6 +88,9 @@ SWGChannelReport::cleanup() {
if(nfm_mod_report != nullptr) {
delete nfm_mod_report;
}
+ if(ssb_mod_report != nullptr) {
+ delete ssb_mod_report;
+ }
if(wfm_mod_report != nullptr) {
delete wfm_mod_report;
}
@@ -112,6 +119,8 @@ SWGChannelReport::fromJsonObject(QJsonObject &pJson) {
::SWGSDRangel::setValue(&nfm_mod_report, pJson["NFMModReport"], "SWGNFMModReport", "SWGNFMModReport");
+ ::SWGSDRangel::setValue(&ssb_mod_report, pJson["SSBModReport"], "SWGSSBModReport", "SWGSSBModReport");
+
::SWGSDRangel::setValue(&wfm_mod_report, pJson["WFMModReport"], "SWGWFMModReport", "SWGWFMModReport");
}
@@ -148,6 +157,9 @@ SWGChannelReport::asJsonObject() {
if((nfm_mod_report != nullptr) && (nfm_mod_report->isSet())){
toJsonValue(QString("NFMModReport"), nfm_mod_report, obj, QString("SWGNFMModReport"));
}
+ if((ssb_mod_report != nullptr) && (ssb_mod_report->isSet())){
+ toJsonValue(QString("SSBModReport"), ssb_mod_report, obj, QString("SWGSSBModReport"));
+ }
if((wfm_mod_report != nullptr) && (wfm_mod_report->isSet())){
toJsonValue(QString("WFMModReport"), wfm_mod_report, obj, QString("SWGWFMModReport"));
}
@@ -215,6 +227,16 @@ SWGChannelReport::setNfmModReport(SWGNFMModReport* nfm_mod_report) {
this->m_nfm_mod_report_isSet = true;
}
+SWGSSBModReport*
+SWGChannelReport::getSsbModReport() {
+ return ssb_mod_report;
+}
+void
+SWGChannelReport::setSsbModReport(SWGSSBModReport* ssb_mod_report) {
+ this->ssb_mod_report = ssb_mod_report;
+ this->m_ssb_mod_report_isSet = true;
+}
+
SWGWFMModReport*
SWGChannelReport::getWfmModReport() {
return wfm_mod_report;
@@ -236,6 +258,7 @@ SWGChannelReport::isSet(){
if(am_mod_report != nullptr && am_mod_report->isSet()){ isObjectUpdated = true; break;}
if(nfm_demod_report != nullptr && nfm_demod_report->isSet()){ isObjectUpdated = true; break;}
if(nfm_mod_report != nullptr && nfm_mod_report->isSet()){ isObjectUpdated = true; break;}
+ if(ssb_mod_report != nullptr && ssb_mod_report->isSet()){ isObjectUpdated = true; break;}
if(wfm_mod_report != nullptr && wfm_mod_report->isSet()){ isObjectUpdated = true; break;}
}while(false);
return isObjectUpdated;
diff --git a/swagger/sdrangel/code/qt5/client/SWGChannelReport.h b/swagger/sdrangel/code/qt5/client/SWGChannelReport.h
index 8a0810cac..a032b5278 100644
--- a/swagger/sdrangel/code/qt5/client/SWGChannelReport.h
+++ b/swagger/sdrangel/code/qt5/client/SWGChannelReport.h
@@ -26,6 +26,7 @@
#include "SWGAMModReport.h"
#include "SWGNFMDemodReport.h"
#include "SWGNFMModReport.h"
+#include "SWGSSBModReport.h"
#include "SWGWFMModReport.h"
#include
@@ -65,6 +66,9 @@ public:
SWGNFMModReport* getNfmModReport();
void setNfmModReport(SWGNFMModReport* nfm_mod_report);
+ SWGSSBModReport* getSsbModReport();
+ void setSsbModReport(SWGSSBModReport* ssb_mod_report);
+
SWGWFMModReport* getWfmModReport();
void setWfmModReport(SWGWFMModReport* wfm_mod_report);
@@ -90,6 +94,9 @@ private:
SWGNFMModReport* nfm_mod_report;
bool m_nfm_mod_report_isSet;
+ SWGSSBModReport* ssb_mod_report;
+ bool m_ssb_mod_report_isSet;
+
SWGWFMModReport* wfm_mod_report;
bool m_wfm_mod_report_isSet;
diff --git a/swagger/sdrangel/code/qt5/client/SWGChannelSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGChannelSettings.cpp
index 99a2cbf75..66c4f2e75 100644
--- a/swagger/sdrangel/code/qt5/client/SWGChannelSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGChannelSettings.cpp
@@ -40,6 +40,8 @@ SWGChannelSettings::SWGChannelSettings() {
m_nfm_demod_settings_isSet = false;
nfm_mod_settings = nullptr;
m_nfm_mod_settings_isSet = false;
+ ssb_mod_settings = nullptr;
+ m_ssb_mod_settings_isSet = false;
wfm_mod_settings = nullptr;
m_wfm_mod_settings_isSet = false;
}
@@ -62,6 +64,8 @@ SWGChannelSettings::init() {
m_nfm_demod_settings_isSet = false;
nfm_mod_settings = new SWGNFMModSettings();
m_nfm_mod_settings_isSet = false;
+ ssb_mod_settings = new SWGSSBModSettings();
+ m_ssb_mod_settings_isSet = false;
wfm_mod_settings = new SWGWFMModSettings();
m_wfm_mod_settings_isSet = false;
}
@@ -84,6 +88,9 @@ SWGChannelSettings::cleanup() {
if(nfm_mod_settings != nullptr) {
delete nfm_mod_settings;
}
+ if(ssb_mod_settings != nullptr) {
+ delete ssb_mod_settings;
+ }
if(wfm_mod_settings != nullptr) {
delete wfm_mod_settings;
}
@@ -112,6 +119,8 @@ SWGChannelSettings::fromJsonObject(QJsonObject &pJson) {
::SWGSDRangel::setValue(&nfm_mod_settings, pJson["NFMModSettings"], "SWGNFMModSettings", "SWGNFMModSettings");
+ ::SWGSDRangel::setValue(&ssb_mod_settings, pJson["SSBModSettings"], "SWGSSBModSettings", "SWGSSBModSettings");
+
::SWGSDRangel::setValue(&wfm_mod_settings, pJson["WFMModSettings"], "SWGWFMModSettings", "SWGWFMModSettings");
}
@@ -148,6 +157,9 @@ SWGChannelSettings::asJsonObject() {
if((nfm_mod_settings != nullptr) && (nfm_mod_settings->isSet())){
toJsonValue(QString("NFMModSettings"), nfm_mod_settings, obj, QString("SWGNFMModSettings"));
}
+ if((ssb_mod_settings != nullptr) && (ssb_mod_settings->isSet())){
+ toJsonValue(QString("SSBModSettings"), ssb_mod_settings, obj, QString("SWGSSBModSettings"));
+ }
if((wfm_mod_settings != nullptr) && (wfm_mod_settings->isSet())){
toJsonValue(QString("WFMModSettings"), wfm_mod_settings, obj, QString("SWGWFMModSettings"));
}
@@ -215,6 +227,16 @@ SWGChannelSettings::setNfmModSettings(SWGNFMModSettings* nfm_mod_settings) {
this->m_nfm_mod_settings_isSet = true;
}
+SWGSSBModSettings*
+SWGChannelSettings::getSsbModSettings() {
+ return ssb_mod_settings;
+}
+void
+SWGChannelSettings::setSsbModSettings(SWGSSBModSettings* ssb_mod_settings) {
+ this->ssb_mod_settings = ssb_mod_settings;
+ this->m_ssb_mod_settings_isSet = true;
+}
+
SWGWFMModSettings*
SWGChannelSettings::getWfmModSettings() {
return wfm_mod_settings;
@@ -236,6 +258,7 @@ SWGChannelSettings::isSet(){
if(am_mod_settings != nullptr && am_mod_settings->isSet()){ isObjectUpdated = true; break;}
if(nfm_demod_settings != nullptr && nfm_demod_settings->isSet()){ isObjectUpdated = true; break;}
if(nfm_mod_settings != nullptr && nfm_mod_settings->isSet()){ isObjectUpdated = true; break;}
+ if(ssb_mod_settings != nullptr && ssb_mod_settings->isSet()){ isObjectUpdated = true; break;}
if(wfm_mod_settings != nullptr && wfm_mod_settings->isSet()){ isObjectUpdated = true; break;}
}while(false);
return isObjectUpdated;
diff --git a/swagger/sdrangel/code/qt5/client/SWGChannelSettings.h b/swagger/sdrangel/code/qt5/client/SWGChannelSettings.h
index 153703644..0c0e011e8 100644
--- a/swagger/sdrangel/code/qt5/client/SWGChannelSettings.h
+++ b/swagger/sdrangel/code/qt5/client/SWGChannelSettings.h
@@ -26,6 +26,7 @@
#include "SWGAMModSettings.h"
#include "SWGNFMDemodSettings.h"
#include "SWGNFMModSettings.h"
+#include "SWGSSBModSettings.h"
#include "SWGWFMModSettings.h"
#include
@@ -65,6 +66,9 @@ public:
SWGNFMModSettings* getNfmModSettings();
void setNfmModSettings(SWGNFMModSettings* nfm_mod_settings);
+ SWGSSBModSettings* getSsbModSettings();
+ void setSsbModSettings(SWGSSBModSettings* ssb_mod_settings);
+
SWGWFMModSettings* getWfmModSettings();
void setWfmModSettings(SWGWFMModSettings* wfm_mod_settings);
@@ -90,6 +94,9 @@ private:
SWGNFMModSettings* nfm_mod_settings;
bool m_nfm_mod_settings_isSet;
+ SWGSSBModSettings* ssb_mod_settings;
+ bool m_ssb_mod_settings_isSet;
+
SWGWFMModSettings* wfm_mod_settings;
bool m_wfm_mod_settings_isSet;
diff --git a/swagger/sdrangel/code/qt5/client/SWGModelFactory.h b/swagger/sdrangel/code/qt5/client/SWGModelFactory.h
index 9c19b6295..7b7dffd6d 100644
--- a/swagger/sdrangel/code/qt5/client/SWGModelFactory.h
+++ b/swagger/sdrangel/code/qt5/client/SWGModelFactory.h
@@ -60,6 +60,8 @@
#include "SWGPresetTransfer.h"
#include "SWGPresets.h"
#include "SWGRtlSdrSettings.h"
+#include "SWGSSBModReport.h"
+#include "SWGSSBModSettings.h"
#include "SWGSamplingDevice.h"
#include "SWGSuccessResponse.h"
#include "SWGWFMModReport.h"
@@ -206,6 +208,12 @@ namespace SWGSDRangel {
if(QString("SWGRtlSdrSettings").compare(type) == 0) {
return new SWGRtlSdrSettings();
}
+ if(QString("SWGSSBModReport").compare(type) == 0) {
+ return new SWGSSBModReport();
+ }
+ if(QString("SWGSSBModSettings").compare(type) == 0) {
+ return new SWGSSBModSettings();
+ }
if(QString("SWGSamplingDevice").compare(type) == 0) {
return new SWGSamplingDevice();
}