VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-01 21:54:55 -04:00
Code Issues Projects Releases Wiki Activity

Put device frequency shift calculation in static methods accessible globally

Browse Source
This commit is contained in:
f4exb
2019-09-18 00:15:04 +02:00
parent ee3313dc82
commit 2d62cc74eb
5 changed files with 379 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sdrbase/dsp/devicesamplesource.cpp
+27 -82
View File
@@ -17,7 +17,9 @@
///////////////////////////////////////////////////////////////////////////////////
#include <QDebug>
#include <dsp/devicesamplesource.h>
#include "dsp/devicesamplestatic.h"
#include "dsp/devicesamplesource.h"
DeviceSampleSource::DeviceSampleSource() :
m_guiMessageQueue(0)
@@ -51,24 +53,15 @@ qint64 DeviceSampleSource::calculateDeviceCenterFrequency(
FrequencyShiftScheme frequencyShiftScheme,
bool transverterMode)
{
qint64 deviceCenterFrequency = centerFrequency;
deviceCenterFrequency -= transverterMode ? transverterDeltaFrequency : 0;
deviceCenterFrequency = deviceCenterFrequency < 0 ? 0 : deviceCenterFrequency;
qint64 f_img = deviceCenterFrequency;
deviceCenterFrequency -= calculateFrequencyShift(log2Decim, fcPos, devSampleRate, frequencyShiftScheme);
f_img -= 2*calculateFrequencyShift(log2Decim, fcPos, devSampleRate, frequencyShiftScheme);
qDebug() << "DeviceSampleSource::calculateDeviceCenterFrequency:"
<< " frequencyShiftScheme: " << frequencyShiftScheme
<< " desired center freq: " << centerFrequency << " Hz"
<< " device center freq: " << deviceCenterFrequency << " Hz"
<< " device sample rate: " << devSampleRate << "S/s"
<< " Actual sample rate: " << devSampleRate/(1<<log2Decim) << "S/s"
<< " center freq position code: " << fcPos
<< " image frequency: " << f_img << "Hz";
return deviceCenterFrequency;
return DeviceSampleStatic::calculateSourceDeviceCenterFrequency(
centerFrequency,
transverterDeltaFrequency,
log2Decim,
(DeviceSampleStatic::fcPos_t) fcPos,
devSampleRate,
(DeviceSampleStatic::FrequencyShiftScheme) frequencyShiftScheme,
transverterMode
);
}
qint64 DeviceSampleSource::calculateCenterFrequency(
@@ -80,20 +73,15 @@ qint64 DeviceSampleSource::calculateCenterFrequency(
FrequencyShiftScheme frequencyShiftScheme,
bool transverterMode)
{
qint64 centerFrequency = deviceCenterFrequency;
centerFrequency += calculateFrequencyShift(log2Decim, fcPos, devSampleRate, frequencyShiftScheme);
centerFrequency += transverterMode ? transverterDeltaFrequency : 0;
centerFrequency = centerFrequency < 0 ? 0 : centerFrequency;
qDebug() << "DeviceSampleSource::calculateCenterFrequency:"
<< " frequencyShiftScheme: " << frequencyShiftScheme
<< " desired center freq: " << centerFrequency << " Hz"
<< " device center freq: " << deviceCenterFrequency << " Hz"
<< " device sample rate: " << devSampleRate << "S/s"
<< " Actual sample rate: " << devSampleRate/(1<<log2Decim) << "S/s"
<< " center freq position code: " << fcPos;
return centerFrequency;
return DeviceSampleStatic::calculateSourceCenterFrequency(
deviceCenterFrequency,
transverterDeltaFrequency,
log2Decim,
(DeviceSampleStatic::fcPos_t) fcPos,
devSampleRate,
(DeviceSampleStatic::FrequencyShiftScheme) frequencyShiftScheme,
transverterMode
);
}
/**
@@ -117,53 +105,10 @@ qint32 DeviceSampleSource::calculateFrequencyShift(
quint32 devSampleRate,
FrequencyShiftScheme frequencyShiftScheme)
{
if (frequencyShiftScheme == FSHIFT_STD)
{
if (log2Decim == 0) { // no shift at all
return 0;
} else if (log2Decim < 3) {
if (fcPos == FC_POS_INFRA) { // shift in the square next to center frequency
return -(devSampleRate / (1<<(log2Decim+1)));
} else if (fcPos == FC_POS_SUPRA) {
return devSampleRate / (1<<(log2Decim+1));
} else {
return 0;
}
} else {
if (fcPos == FC_POS_INFRA) { // shift centered in the square next to center frequency
return -(devSampleRate / (1<<(log2Decim)));
} else if (fcPos == FC_POS_SUPRA) {
return devSampleRate / (1<<(log2Decim));
} else {
return 0;
}
}
}
else // frequencyShiftScheme == FSHIFT_TXSYNC
{
if (fcPos == FC_POS_CENTER) {
return 0;
}
int sign = fcPos == FC_POS_INFRA ? -1 : 1;
int halfSampleRate = devSampleRate / 2; // fractions are relative to sideband thus based on half the sample rate
if (log2Decim == 0) {
return 0;
} else if (log2Decim == 1) {
return sign * (halfSampleRate / 2); // inf or sup: 1/2
} else if (log2Decim == 2) {
return sign * ((halfSampleRate * 3) / 4); // inf, inf or sup, sup: 1/2 + 1/4
} else if (log2Decim == 3) {
return sign * ((halfSampleRate * 5) / 8); // inf, inf, sup or sup, sup, inf: 1/2 + 1/4 - 1/8 = 5/8
} else if (log2Decim == 4) {
return sign * ((halfSampleRate * 11) / 16); // inf, inf, sup, inf or sup, sup, inf, sup: 1/2 + 1/4 - 1/8 + 1/16 = 11/16
} else if (log2Decim == 5) {
return sign * ((halfSampleRate * 21) / 32); // inf, inf, sup, inf, sup or sup, sup, inf, sup, inf: 1/2 + 1/4 - 1/8 + 1/16 - 1/32 = 21/32
} else if (log2Decim == 6) {
return sign * ((halfSampleRate * 21) / 64); // inf, sup, inf, sup, inf, sup or sup, inf, sup, inf, sup, inf: 1/2 - 1/4 + 1/8 -1/16 + 1/32 - 1/64 = 21/64
} else {
return 0;
}
}
return DeviceSampleStatic::calculateSourceFrequencyShift(
log2Decim,
(DeviceSampleStatic::fcPos_t) fcPos,
devSampleRate,
(DeviceSampleStatic::FrequencyShiftScheme) frequencyShiftScheme
);
}