From c07bb0cd4d86b81826239a37671cb2d9256fc0c1 Mon Sep 17 00:00:00 2001 From: f4exb Date: Tue, 29 May 2018 01:04:23 +0200 Subject: [PATCH] DSDdemod: debug message fix --- plugins/channelrx/demoddsd/dsddemod.cpp | 32 ++++++++++++------------- swagger/sdrangel/examples/rx_test.py | 6 +++-- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/plugins/channelrx/demoddsd/dsddemod.cpp b/plugins/channelrx/demoddsd/dsddemod.cpp index d6601cffb..806d5c4ee 100644 --- a/plugins/channelrx/demoddsd/dsddemod.cpp +++ b/plugins/channelrx/demoddsd/dsddemod.cpp @@ -460,22 +460,22 @@ void DSDDemod::applyChannelSettings(int inputSampleRate, int inputFrequencyOffse void DSDDemod::applySettings(const DSDDemodSettings& settings, bool force) { qDebug() << "DSDDemod::applySettings: " - << " m_inputFrequencyOffset: " << m_settings.m_inputFrequencyOffset - << " m_rfBandwidth: " << m_settings.m_rfBandwidth - << " m_fmDeviation: " << m_settings.m_fmDeviation - << " m_demodGain: " << m_settings.m_demodGain - << " m_volume: " << m_settings.m_volume - << " m_baudRate: " << m_settings.m_baudRate - << " m_squelchGate" << m_settings.m_squelchGate - << " m_squelch: " << m_settings.m_squelch - << " m_audioMute: " << m_settings.m_audioMute - << " m_enableCosineFiltering: " << m_settings.m_enableCosineFiltering - << " m_syncOrConstellation: " << m_settings.m_syncOrConstellation - << " m_slot1On: " << m_settings.m_slot1On - << " m_slot2On: " << m_settings.m_slot2On - << " m_tdmaStereo: " << m_settings.m_tdmaStereo - << " m_pllLock: " << m_settings.m_pllLock - << " m_highPassFilter: "<< m_settings.m_highPassFilter + << " m_inputFrequencyOffset: " << settings.m_inputFrequencyOffset + << " m_rfBandwidth: " << settings.m_rfBandwidth + << " m_fmDeviation: " << settings.m_fmDeviation + << " m_demodGain: " << settings.m_demodGain + << " m_volume: " << settings.m_volume + << " m_baudRate: " << settings.m_baudRate + << " m_squelchGate" << settings.m_squelchGate + << " m_squelch: " << settings.m_squelch + << " m_audioMute: " << settings.m_audioMute + << " m_enableCosineFiltering: " << settings.m_enableCosineFiltering + << " m_syncOrConstellation: " << settings.m_syncOrConstellation + << " m_slot1On: " << settings.m_slot1On + << " m_slot2On: " << settings.m_slot2On + << " m_tdmaStereo: " << settings.m_tdmaStereo + << " m_pllLock: " << settings.m_pllLock + << " m_highPassFilter: "<< settings.m_highPassFilter << " m_audioDeviceName: " << settings.m_audioDeviceName << " force: " << force; diff --git a/swagger/sdrangel/examples/rx_test.py b/swagger/sdrangel/examples/rx_test.py index e22365064..80033bbd6 100755 --- a/swagger/sdrangel/examples/rx_test.py +++ b/swagger/sdrangel/examples/rx_test.py @@ -44,7 +44,9 @@ def getInputOptions(): parser.add_option("--audio-address", dest="audio_address", help="Audio: UDP destination address", metavar="IP_ADDRESS", type="string") parser.add_option("--audio-port", dest="audio_port", help="Audio: UDP destination port", metavar="IP_PORT", type="int") parser.add_option("--audio-channels", dest="audio_channels", help="Audio: UDP mode (0: L only 1: R only 2: L+R mono 3: LR stereo)", metavar="ENUM_INT", type="int") - + parser.add_option("--baud-rate", dest="baud_rate", help="DSD: baud rate in Baud", metavar="BAUD", type="int", default=4800) + parser.add_option("--fm-dev", dest="fm_deviation", help="DSD: expected FM deviation", metavar="FREQ", type="int", default=5400) + (options, args) = parser.parse_args() if options.address == None: @@ -285,7 +287,7 @@ def setupChannel(deviceset_url, options): settings["DSDDemodSettings"]["volume"] = options.volume settings["DSDDemodSettings"]["squelch"] = options.squelch_db settings["DSDDemodSettings"]["baudRate"] = options.baud_rate - settings["DSDDemodSettings"]["fmDeviation"] = options.fm_dev + settings["DSDDemodSettings"]["fmDeviation"] = options.fm_deviation settings["DSDDemodSettings"]["enableCosineFiltering"] = 1 settings["DSDDemodSettings"]["pllLock"] = 1 settings["DSDDemodSettings"]["title"] = "Channel %d" % i