comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2024-11-29 23:28:39 -05:00
Code Issues Projects Releases Wiki Activity

AM/DSB fix

Browse Source
This commit is contained in:
Charles J. Cliffe 2015-02-12 02:14:22 -05:00
parent 4f47fa7375
commit eada5aa01d
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/demod/DemodulatorThread.cpp
View File

@ -180,8 +180,6 @@ void DemodulatorThread::threadMain() {
currentSignalLevel = agc_crcf_get_signal_level(iqAutoGain); currentSignalLevel = agc_crcf_get_signal_level(iqAutoGain);
} }
amOutputCeil = 0;
if (demodulatorType == DEMOD_TYPE_FM) { if (demodulatorType == DEMOD_TYPE_FM) {
freqdem_demodulate_block(demodFM, &agcData[0], bufSize, &demodOutputData[0]); freqdem_demodulate_block(demodFM, &agcData[0], bufSize, &demodOutputData[0]);
} else { } else {
@ -197,10 +195,6 @@ void DemodulatorThread::threadMain() {
nco_crcf_step(ssbShifterDown); nco_crcf_step(ssbShifterDown);
ampmodem_demodulate(demodAM, y, &rz[1]); ampmodem_demodulate(demodAM, y, &rz[1]);
resamp2_rrrf_decim_execute(ssbDecim, rz, &demodOutputData[i]); resamp2_rrrf_decim_execute(ssbDecim, rz, &demodOutputData[i]);
if (demodOutputData[i] > amOutputCeil) {
amOutputCeil = demodOutputData[i];
}
} }
break; break;
case DEMOD_TYPE_USB: case DEMOD_TYPE_USB:
@ -213,14 +207,13 @@ void DemodulatorThread::threadMain() {
nco_crcf_step(ssbShifterUp); nco_crcf_step(ssbShifterUp);
ampmodem_demodulate(demodAM, y, &rz[1]); ampmodem_demodulate(demodAM, y, &rz[1]);
resamp2_rrrf_decim_execute(ssbDecim, rz, &demodOutputData[i]); resamp2_rrrf_decim_execute(ssbDecim, rz, &demodOutputData[i]);
if (demodOutputData[i] > amOutputCeil) {
amOutputCeil = demodOutputData[i];
}
} }
break; break;
case DEMOD_TYPE_AM: case DEMOD_TYPE_AM:
case DEMOD_TYPE_DSB: case DEMOD_TYPE_DSB:
for (int i = 0; i < bufSize; i++) {
ampmodem_demodulate(demodAM, inp->data[i], &demodOutputData[i]);
}
break; break;
} }
@ -228,7 +221,15 @@ void DemodulatorThread::threadMain() {
amOutputCeilMA = amOutputCeilMA + (amOutputCeil - amOutputCeilMA) * 0.05; amOutputCeilMA = amOutputCeilMA + (amOutputCeil - amOutputCeilMA) * 0.05;
amOutputCeilMAA = amOutputCeilMAA + (amOutputCeilMA - amOutputCeilMAA) * 0.05; amOutputCeilMAA = amOutputCeilMAA + (amOutputCeilMA - amOutputCeilMAA) * 0.05;
float gain = 0.95 / amOutputCeilMAA; amOutputCeil = 0;
for (int i = 0; i < bufSize; i++) {
if (demodOutputData[i] > amOutputCeil) {
amOutputCeil = demodOutputData[i];
}
}
float gain = 0.5 / amOutputCeilMAA;
for (int i = 0; i < bufSize; i++) { for (int i = 0; i < bufSize; i++) {
demodOutputData[i] *= gain; demodOutputData[i] *= gain;
@ -328,7 +329,8 @@ void DemodulatorThread::threadMain() {
std::vector<float>::iterator data_i; std::vector<float>::iterator data_i;
ati->peak = 0; ati->peak = 0;
for (data_i = ati->data.begin(); data_i != ati->data.end(); data_i++) { for (data_i = ati->data.begin(); data_i != ati->data.end(); data_i++) {
if (float p = fabs(*data_i) > ati->peak) { float p = fabs(*data_i);
if (p > ati->peak) {
ati->peak = p; ati->peak = p;
} }
} }