From a4dc4498fc80d695bb6e21e524f48c9d32706459 Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Thu, 15 Oct 2015 21:01:07 -0400 Subject: [PATCH] Add support for my experimental firpfbch2_crcf_set_channel_state - Needs my fork of liquid-dsp at: https://github.com/cjcliffe/liquid-dsp/tree/firpfbch_toggle_channels --- src/sdr/SDRPostThread.cpp | 5 +++++ src/sdr/SoapySDRThread.cpp | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/sdr/SDRPostThread.cpp b/src/sdr/SDRPostThread.cpp index 237b7449..d8feb965 100644 --- a/src/sdr/SDRPostThread.cpp +++ b/src/sdr/SDRPostThread.cpp @@ -214,6 +214,11 @@ void SDRPostThread::run() { // Find active demodulators if (nRunDemods) { + + for (int i = 0; i < numChannels; i++) { + firpfbch2_crcf_set_channel_state(channelizer, i, (demodChannelActive[i]>0)?1:0); + } + // channelize data // firpfbch2 output rate is 2 x ( input rate / channels ) for (int i = 0, iMax = dataSize; i < iMax; i+=numChannels/2) { diff --git a/src/sdr/SoapySDRThread.cpp b/src/sdr/SoapySDRThread.cpp index 9104351f..f43030a3 100644 --- a/src/sdr/SoapySDRThread.cpp +++ b/src/sdr/SoapySDRThread.cpp @@ -245,9 +245,9 @@ int SDRThread::getOptimalChannelCount(long long sampleRate) { optimal_count = 4; } - if (optimal_count > 16) { - optimal_count = 16; - } +// if (optimal_count > 16) { +// optimal_count = 16; +// } return optimal_count; }