VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-16 13:21:50 -05:00
Code Issues Projects Releases Wiki Activity

Revert "DSD demod: REST API: DMR private key implementation"

Browse Source 
This reverts commit 662ac6ef6d.
This commit is contained in:
f4exb 2020-07-21 19:59:19 +02:00
parent 625463a428
commit 1d643e27bb
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/channelrx/demoddsd/dsddemod.cpp
View File

@ -365,9 +365,6 @@ void DSDDemod::webapiUpdateChannelSettings(
if (channelSettingsKeys.contains("pllLock")) { if (channelSettingsKeys.contains("pllLock")) {
settings.m_pllLock = response.getDsdDemodSettings()->getPllLock() != 0; settings.m_pllLock = response.getDsdDemodSettings()->getPllLock() != 0;
} }
if (channelSettingsKeys.contains("dmrBPKey")) {
settings.m_dmrBPKey = response.getDsdDemodSettings()->getDmrBpKey();
}
if (channelSettingsKeys.contains("rgbColor")) { if (channelSettingsKeys.contains("rgbColor")) {
settings.m_rgbColor = response.getDsdDemodSettings()->getRgbColor(); settings.m_rgbColor = response.getDsdDemodSettings()->getRgbColor();
} }
@ -437,7 +434,6 @@ void DSDDemod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& resp
response.getDsdDemodSettings()->setSlot2On(settings.m_slot2On ? 1 : 0); response.getDsdDemodSettings()->setSlot2On(settings.m_slot2On ? 1 : 0);
response.getDsdDemodSettings()->setTdmaStereo(settings.m_tdmaStereo ? 1 : 0); response.getDsdDemodSettings()->setTdmaStereo(settings.m_tdmaStereo ? 1 : 0);
response.getDsdDemodSettings()->setPllLock(settings.m_pllLock ? 1 : 0); response.getDsdDemodSettings()->setPllLock(settings.m_pllLock ? 1 : 0);
response.getDsdDemodSettings()->setDmrBpKey(settings.m_dmrBPKey);
response.getDsdDemodSettings()->setRgbColor(settings.m_rgbColor); response.getDsdDemodSettings()->setRgbColor(settings.m_rgbColor);
if (response.getDsdDemodSettings()->getTitle()) { if (response.getDsdDemodSettings()->getTitle()) {
@ -549,9 +545,6 @@ void DSDDemod::webapiReverseSendSettings(QList<QString>& channelSettingsKeys, co
if (channelSettingsKeys.contains("pllLock") || force) { if (channelSettingsKeys.contains("pllLock") || force) {
swgDSDDemodSettings->setPllLock(settings.m_pllLock ? 1 : 0); swgDSDDemodSettings->setPllLock(settings.m_pllLock ? 1 : 0);
} }
if (channelSettingsKeys.contains("dmrBPKey") || force) {
swgDSDDemodSettings->setDmrBpKey(settings.m_dmrBPKey);
}
if (channelSettingsKeys.contains("rgbColor") || force) { if (channelSettingsKeys.contains("rgbColor") || force) {
swgDSDDemodSettings->setRgbColor(settings.m_rgbColor); swgDSDDemodSettings->setRgbColor(settings.m_rgbColor);
} }

1
plugins/channelrx/demoddsd/dsddemodgui.cpp
View File

@ -468,7 +468,6 @@ void DSDDemodGUI::displaySettings()
ui->tdmaStereoSplit->setChecked(m_settings.m_tdmaStereo); ui->tdmaStereoSplit->setChecked(m_settings.m_tdmaStereo);
ui->audioMute->setChecked(m_settings.m_audioMute); ui->audioMute->setChecked(m_settings.m_audioMute);
ui->symbolPLLLock->setChecked(m_settings.m_pllLock); ui->symbolPLLLock->setChecked(m_settings.m_pllLock);
ui->dmrBPKey->setValue(m_settings.m_dmrBPKey % 256);
ui->highPassFilter->setChecked(m_settings.m_highPassFilter); ui->highPassFilter->setChecked(m_settings.m_highPassFilter);
ui->baudRate->setCurrentIndex(DSDDemodBaudRates::getRateIndex(m_settings.m_baudRate)); ui->baudRate->setCurrentIndex(DSDDemodBaudRates::getRateIndex(m_settings.m_baudRate));