comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2025-09-09 02:07:52 -04:00
Code Issues Projects Releases Wiki Activity

Patch for updated liquid-dsp firhilbf complex->real adding usb

Browse Source
This commit is contained in:
Charles J. Cliffe 2019-04-16 19:05:05 -04:00
parent 58086c17fb
commit 35ae486d20
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/modules/modem/analog/ModemFMStereo.cpp
View File

@ -239,7 +239,8 @@ void ModemFMStereo::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInp
nco_crcf_mix_down(fmkit->stereoPilot, y, &x); nco_crcf_mix_down(fmkit->stereoPilot, y, &x);
// complex -> real // complex -> real
firhilbf_c2r_execute(fmkit->firStereoC2R, x, &demodStereoData[i]); float usb_discard;
firhilbf_c2r_execute(fmkit->firStereoC2R, x, &demodStereoData[i], &usb_discard);
} }
// std::cout << "[PLL] phase error: " << phase_error; // std::cout << "[PLL] phase error: " << phase_error;

3
src/modules/modem/analog/ModemLSB.cpp
View File

@ -56,7 +56,8 @@ void ModemLSB::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *a
nco_crcf_mix_up(ssbShift, input->data[i], &x); nco_crcf_mix_up(ssbShift, input->data[i], &x);
iirfilt_crcf_execute(ssbFilt, x, &y); iirfilt_crcf_execute(ssbFilt, x, &y);
nco_crcf_mix_down(ssbShift, y, &x); nco_crcf_mix_down(ssbShift, y, &x);
firhilbf_c2r_execute(c2rFilt, x, &demodOutputData[i]); float usb_discard;
firhilbf_c2r_execute(c2rFilt, x, &demodOutputData[i], &usb_discard);
} }
buildAudioOutput(akit, audioOut, true); buildAudioOutput(akit, audioOut, true);

4
src/modules/modem/analog/ModemUSB.cpp
View File

@ -56,7 +56,9 @@ void ModemUSB::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *a
nco_crcf_mix_down(ssbShift, input->data[i], &x); nco_crcf_mix_down(ssbShift, input->data[i], &x);
iirfilt_crcf_execute(ssbFilt, x, &y); iirfilt_crcf_execute(ssbFilt, x, &y);
nco_crcf_mix_up(ssbShift, y, &x); nco_crcf_mix_up(ssbShift, y, &x);
firhilbf_c2r_execute(c2rFilt, x, &demodOutputData[i]); // TODO: use fixed firhilbf_c2r usb param to simplify instead of shifting and discarding
float usb_discard;
firhilbf_c2r_execute(c2rFilt, x, &demodOutputData[i], &usb_discard);
} }
buildAudioOutput(akit, audioOut, true); buildAudioOutput(akit, audioOut, true);