comicsansg/CubicSDR
comicsansg
/
CubicSDR
mirror of https://github.com/cjcliffe/CubicSDR.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Note: hit save before committing :)

This commit is contained in:
Charles J. Cliffe 2016-02-02 21:29:01 -05:00
parent 1523d55b6c
commit c6c62d7334
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,7 @@ std::string ModemUSB::getName() {
} }
ModemUSB::~ModemUSB() { ModemUSB::~ModemUSB() {
firfilt_crcf_destroy(ssbFilt); iirfilt_crcf_destroy(ssbFilt);
nco_crcf_destroy(ssbShift); nco_crcf_destroy(ssbShift);
ampmodem_destroy(demodAM_USB); ampmodem_destroy(demodAM_USB);
} }
@ -46,13 +46,12 @@ void ModemUSB::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *a
return; return;
} }
liquid_float_complex x; liquid_float_complex x,y;
for (int i = 0; i < bufSize; i++) { // Reject lower band for (int i = 0; i < bufSize; i++) { // Reject lower band
nco_crcf_step(ssbShift); nco_crcf_step(ssbShift);
nco_crcf_mix_down(ssbShift, input->data[i], &x); nco_crcf_mix_down(ssbShift, input->data[i], &x);
firfilt_crcf_push(ssbFilt, x); iirfilt_crcf_execute(ssbFilt, x, &y);
firfilt_crcf_execute(ssbFilt, &x); ampmodem_demodulate(demodAM_USB, y, &demodOutputData[i]);
ampmodem_demodulate(demodAM_USB, x, &demodOutputData[i]);
} }
buildAudioOutput(akit, audioOut, true); buildAudioOutput(akit, audioOut, true);