VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-01 21:54:55 -04:00
Code Issues Projects Releases Wiki Activity

Remote output/source: implemented choice of sample size in transmission. Fixes in the size conversion routines

Browse Source
This commit is contained in:
f4exb
2021-12-19 11:30:48 +01:00
parent 6cc1616cb8
commit 9278b12e25
21 changed files with 207 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesink/remoteoutput/remoteoutput.cpp
+22 -2
View File
@@ -279,7 +279,7 @@ void RemoteOutput::applySettings(const RemoteOutputSettings& settings, bool forc
if (force || (m_settings.m_dataAddress != settings.m_dataAddress) || (m_settings.m_dataPort != settings.m_dataPort))
{
if (m_remoteOutputWorker != 0) {
if (m_remoteOutputWorker) {
m_remoteOutputWorker->setDataAddress(settings.m_dataAddress, settings.m_dataPort);
}
}
@@ -288,15 +288,28 @@ void RemoteOutput::applySettings(const RemoteOutputSettings& settings, bool forc
{
reverseAPIKeys.append("nbFECBlocks");
if (m_remoteOutputWorker != 0) {
if (m_remoteOutputWorker) {
m_remoteOutputWorker->setNbBlocksFEC(settings.m_nbFECBlocks);
}
}
if (force || (m_settings.m_nbTxBytes != settings.m_nbTxBytes))
{
reverseAPIKeys.append("nbTxBytes");
if (m_remoteOutputWorker)
{
stopWorker();
m_remoteOutputWorker->setNbTxBytes(settings.m_nbTxBytes);
startWorker();
}
}
mutexLocker.unlock();
qDebug() << "RemoteOutput::applySettings:"
<< " m_nbFECBlocks: " << settings.m_nbFECBlocks
<< " m_nbTxBytes: " << settings.m_nbTxBytes
<< " m_apiAddress: " << settings.m_apiAddress
<< " m_apiPort: " << settings.m_apiPort
<< " m_dataAddress: " << settings.m_dataAddress
@@ -404,6 +417,9 @@ void RemoteOutput::webapiUpdateDeviceSettings(
if (deviceSettingsKeys.contains("nbFECBlocks")) {
settings.m_nbFECBlocks = response.getRemoteOutputSettings()->getNbFecBlocks();
}
if (deviceSettingsKeys.contains("nbTxBytes")) {
settings.m_nbTxBytes = response.getRemoteOutputSettings()->getNbTxBytes();
}
if (deviceSettingsKeys.contains("apiAddress")) {
settings.m_apiAddress = *response.getRemoteOutputSettings()->getApiAddress();
}
@@ -450,6 +466,7 @@ int RemoteOutput::webapiReportGet(
void RemoteOutput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& response, const RemoteOutputSettings& settings)
{
response.getRemoteOutputSettings()->setNbFecBlocks(settings.m_nbFECBlocks);
response.getRemoteOutputSettings()->setNbTxBytes(settings.m_nbTxBytes);
response.getRemoteOutputSettings()->setApiAddress(new QString(settings.m_apiAddress));
response.getRemoteOutputSettings()->setApiPort(settings.m_apiPort);
response.getRemoteOutputSettings()->setDataAddress(new QString(settings.m_dataAddress));
@@ -657,6 +674,9 @@ void RemoteOutput::webapiReverseSendSettings(QList<QString>& deviceSettingsKeys,
if (deviceSettingsKeys.contains("nbFECBlocks") || force) {
swgRemoteOutputSettings->setNbFecBlocks(settings.m_nbFECBlocks);
}
if (deviceSettingsKeys.contains("nbTxBytes") || force) {
swgRemoteOutputSettings->setNbTxBytes(settings.m_nbTxBytes);
}
if (deviceSettingsKeys.contains("apiAddress") || force) {
swgRemoteOutputSettings->setApiAddress(new QString(settings.m_apiAddress));
}