comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2025-08-01 13:12:30 -04:00
Code Issues Projects Releases Wiki Activity

Cleanup: analog modems

Browse Source
This commit is contained in:
Charles J. Cliffe 2021-04-04 22:16:44 -04:00
parent 02fdcb2aa3
commit 74f63d0e84
18 changed files with 70 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/modem/analog/ModemAM.cpp
View File

@ -27,7 +27,7 @@ int ModemAM::getDefaultSampleRate() {
} }
void ModemAM::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput* audioOut) { void ModemAM::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput* audioOut) {
ModemKitAnalog *amkit = (ModemKitAnalog *)kit; auto *amkit = (ModemKitAnalog *)kit;
initOutputBuffers(amkit,input); initOutputBuffers(amkit,input);

8
src/modules/modem/analog/ModemAM.h
View File

@ -8,15 +8,15 @@
class ModemAM : public ModemAnalog { class ModemAM : public ModemAnalog {
public: public:
ModemAM(); ModemAM();
~ModemAM(); ~ModemAM() override;
std::string getName(); std::string getName() override;
static ModemBase *factory(); static ModemBase *factory();
int getDefaultSampleRate(); int getDefaultSampleRate() override;
void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut); void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) override;
private: private:
firfilt_rrrf mDCBlock; firfilt_rrrf mDCBlock;

6
src/modules/modem/analog/ModemCW.cpp
View File

@ -116,7 +116,7 @@ int ModemCW::getDefaultSampleRate() {
// the input IQ to audioOut, frequency shift, then pass the real part. // the input IQ to audioOut, frequency shift, then pass the real part.
// Simple solution is just interpolate the IQ data to the audio sample rate. // Simple solution is just interpolate the IQ data to the audio sample rate.
ModemKit *ModemCW::buildKit(long long sampleRate, int audioSampleRate) { ModemKit *ModemCW::buildKit(long long sampleRate, int audioSampleRate) {
ModemKitCW *kit = new ModemKitCW(); auto *kit = new ModemKitCW();
float As = 60.0f; float As = 60.0f;
double ratio = double(audioSampleRate) / double(sampleRate); double ratio = double(audioSampleRate) / double(sampleRate);
kit->sampleRate = sampleRate; kit->sampleRate = sampleRate;
@ -127,7 +127,7 @@ ModemKit *ModemCW::buildKit(long long sampleRate, int audioSampleRate) {
} }
void ModemCW::disposeKit(ModemKit *kit) { void ModemCW::disposeKit(ModemKit *kit) {
ModemKitCW *cwkit = (ModemKitCW *) kit; auto *cwkit = (ModemKitCW *) kit;
msresamp_cccf_destroy(cwkit->mInputResampler); msresamp_cccf_destroy(cwkit->mInputResampler);
delete kit; delete kit;
} }
@ -156,7 +156,7 @@ void ModemCW::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *au
unsigned int outSize; unsigned int outSize;
float lsb; float lsb;
liquid_float_complex sig; liquid_float_complex sig;
ModemKitCW *cwkit = (ModemKitCW *) kit; auto *cwkit = (ModemKitCW *) kit;
initOutputBuffers(cwkit, input); initOutputBuffers(cwkit, input);

24
src/modules/modem/analog/ModemCW.h
View File

@ -17,32 +17,32 @@ class ModemCW : public ModemAnalog {
public: public:
ModemCW(); ModemCW();
~ModemCW(); ~ModemCW() override;
std::string getName(); std::string getName() override;
static ModemBase *factory(); static ModemBase *factory();
int checkSampleRate(long long srate, int arate); int checkSampleRate(long long srate, int arate) override;
ModemKit *buildKit(long long srate, int arate); ModemKit *buildKit(long long srate, int arate) override;
void disposeKit(ModemKit *kit); void disposeKit(ModemKit *kit) override;
void initOutputBuffers(ModemKitAnalog *akit, ModemIQData *input); void initOutputBuffers(ModemKitAnalog *akit, ModemIQData *input) override;
int getDefaultSampleRate(); int getDefaultSampleRate() override;
void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut); void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) override;
ModemArgInfoList getSettings(); ModemArgInfoList getSettings() override;
void writeSetting(std::string setting, std::string value); void writeSetting(std::string setting, std::string value) override;
std::string readSetting(std::string setting); std::string readSetting(std::string setting) override;
// No resampling required. // No resampling required.
std::vector<float> *getResampledOutputData() { return &demodOutputData; } std::vector<float> *getResampledOutputData() override { return &demodOutputData; }
private: private:
float mBeepFrequency; float mBeepFrequency;

2
src/modules/modem/analog/ModemDSB.cpp
View File

@ -25,7 +25,7 @@ int ModemDSB::getDefaultSampleRate() {
} }
void ModemDSB::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) { void ModemDSB::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) {
ModemKitAnalog *amkit = (ModemKitAnalog *)kit; auto *amkit = (ModemKitAnalog *)kit;
initOutputBuffers(amkit, input); initOutputBuffers(amkit, input);

8
src/modules/modem/analog/ModemDSB.h
View File

@ -8,15 +8,15 @@
class ModemDSB : public ModemAnalog { class ModemDSB : public ModemAnalog {
public: public:
ModemDSB(); ModemDSB();
~ModemDSB(); ~ModemDSB() override;
std::string getName(); std::string getName() override;
static ModemBase *factory(); static ModemBase *factory();
int getDefaultSampleRate(); int getDefaultSampleRate() override;
void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut); void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) override;
private: private:
ampmodem demodAM_DSB; ampmodem demodAM_DSB;

2
src/modules/modem/analog/ModemFM.cpp
View File

@ -24,7 +24,7 @@ int ModemFM::getDefaultSampleRate() {
} }
void ModemFM::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) { void ModemFM::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) {
ModemKitAnalog *fmkit = (ModemKitAnalog *)kit; auto *fmkit = (ModemKitAnalog *)kit;
initOutputBuffers(fmkit, input); initOutputBuffers(fmkit, input);

8
src/modules/modem/analog/ModemFM.h
View File

@ -8,15 +8,15 @@
class ModemFM : public ModemAnalog { class ModemFM : public ModemAnalog {
public: public:
ModemFM(); ModemFM();
~ModemFM(); ~ModemFM() override;
std::string getName(); std::string getName() override;
static ModemBase *factory(); static ModemBase *factory();
int getDefaultSampleRate(); int getDefaultSampleRate() override;
void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut); void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) override;
private: private:
freqdem demodFM; freqdem demodFM;

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

@ -87,7 +87,7 @@ std::string ModemFMStereo::readSetting(std::string setting) {
} }
ModemKit *ModemFMStereo::buildKit(long long sampleRate, int audioSampleRate) { ModemKit *ModemFMStereo::buildKit(long long sampleRate, int audioSampleRate) {
ModemKitFMStereo *kit = new ModemKitFMStereo; auto *kit = new ModemKitFMStereo;
kit->audioResampleRatio = double(audioSampleRate) / double(sampleRate); kit->audioResampleRatio = double(audioSampleRate) / double(sampleRate);
kit->sampleRate = sampleRate; kit->sampleRate = sampleRate;
@ -161,7 +161,7 @@ ModemKit *ModemFMStereo::buildKit(long long sampleRate, int audioSampleRate) {
} }
void ModemFMStereo::disposeKit(ModemKit *kit) { void ModemFMStereo::disposeKit(ModemKit *kit) {
ModemKitFMStereo *fmkit = (ModemKitFMStereo *)kit; auto *fmkit = (ModemKitFMStereo *)kit;
msresamp_rrrf_destroy(fmkit->audioResampler); msresamp_rrrf_destroy(fmkit->audioResampler);
msresamp_rrrf_destroy(fmkit->stereoResampler); msresamp_rrrf_destroy(fmkit->stereoResampler);
@ -176,7 +176,7 @@ void ModemFMStereo::disposeKit(ModemKit *kit) {
void ModemFMStereo::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) { void ModemFMStereo::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) {
ModemKitFMStereo *fmkit = (ModemKitFMStereo *)kit; auto *fmkit = (ModemKitFMStereo *)kit;
size_t bufSize = input->data.size(); size_t bufSize = input->data.size();
liquid_float_complex u, v, w, x, y; liquid_float_complex u, v, w, x, y;

22
src/modules/modem/analog/ModemFMStereo.h
View File

@ -31,24 +31,24 @@ public:
class ModemFMStereo : public Modem { class ModemFMStereo : public Modem {
public: public:
ModemFMStereo(); ModemFMStereo();
~ModemFMStereo(); ~ModemFMStereo() override;
std::string getType(); std::string getType() override;
std::string getName(); std::string getName() override;
static ModemBase *factory(); static ModemBase *factory();
int checkSampleRate(long long sampleRate, int audioSampleRate); int checkSampleRate(long long sampleRate, int audioSampleRate) override;
int getDefaultSampleRate(); int getDefaultSampleRate() override;
ModemArgInfoList getSettings(); ModemArgInfoList getSettings() override;
void writeSetting(std::string setting, std::string value); void writeSetting(std::string setting, std::string value) override;
std::string readSetting(std::string setting); std::string readSetting(std::string setting) override;
ModemKit *buildKit(long long sampleRate, int audioSampleRate); ModemKit *buildKit(long long sampleRate, int audioSampleRate) override;
void disposeKit(ModemKit *kit); void disposeKit(ModemKit *kit) override;
void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut); void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) override;
private: private:
std::vector<float> demodOutputData; std::vector<float> demodOutputData;

6
src/modules/modem/analog/ModemIQ.cpp
View File

@ -3,9 +3,7 @@
#include "ModemIQ.h" #include "ModemIQ.h"
ModemIQ::ModemIQ() { ModemIQ::ModemIQ() = default;
}
std::string ModemIQ::getType() { std::string ModemIQ::getType() {
return "analog"; return "analog";
@ -20,7 +18,7 @@ ModemBase *ModemIQ::factory() {
} }
ModemKit *ModemIQ::buildKit(long long sampleRate, int audioSampleRate) { ModemKit *ModemIQ::buildKit(long long sampleRate, int audioSampleRate) {
ModemKit *kit = new ModemKit; auto *kit = new ModemKit;
kit->sampleRate = sampleRate; kit->sampleRate = sampleRate;
kit->audioSampleRate = audioSampleRate; kit->audioSampleRate = audioSampleRate;
return kit; return kit;

14
src/modules/modem/analog/ModemIQ.h
View File

@ -8,19 +8,19 @@ class ModemIQ : public Modem {
public: public:
ModemIQ(); ModemIQ();
std::string getType(); std::string getType() override;
std::string getName(); std::string getName() override;
static ModemBase *factory(); static ModemBase *factory();
int checkSampleRate(long long sampleRate, int audioSampleRate); int checkSampleRate(long long sampleRate, int audioSampleRate) override;
int getDefaultSampleRate(); int getDefaultSampleRate() override;
ModemKit *buildKit(long long sampleRate, int audioSampleRate); ModemKit *buildKit(long long sampleRate, int audioSampleRate) override;
void disposeKit(ModemKit *kit); void disposeKit(ModemKit *kit) override;
void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut); void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) override;
private: private:

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

@ -41,7 +41,7 @@ int ModemLSB::getDefaultSampleRate() {
} }
void ModemLSB::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) { void ModemLSB::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) {
ModemKitAnalog *akit = (ModemKitAnalog *)kit; auto *akit = (ModemKitAnalog *)kit;
initOutputBuffers(akit,input); initOutputBuffers(akit,input);

10
src/modules/modem/analog/ModemLSB.h
View File

@ -7,16 +7,16 @@
class ModemLSB : public ModemAnalog { class ModemLSB : public ModemAnalog {
public: public:
ModemLSB(); ModemLSB();
~ModemLSB(); ~ModemLSB() override;
std::string getName(); std::string getName() override;
static ModemBase *factory(); static ModemBase *factory();
int checkSampleRate(long long sampleRate, int audioSampleRate); int checkSampleRate(long long sampleRate, int audioSampleRate) override;
int getDefaultSampleRate(); int getDefaultSampleRate() override;
void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut); void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) override;
private: private:
iirfilt_crcf ssbFilt; iirfilt_crcf ssbFilt;

2
src/modules/modem/analog/ModemNBFM.cpp
View File

@ -24,7 +24,7 @@ int ModemNBFM::getDefaultSampleRate() {
} }
void ModemNBFM::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) { void ModemNBFM::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) {
ModemKitAnalog *fmkit = (ModemKitAnalog *)kit; auto *fmkit = (ModemKitAnalog *)kit;
initOutputBuffers(fmkit, input); initOutputBuffers(fmkit, input);

8
src/modules/modem/analog/ModemNBFM.h
View File

@ -8,15 +8,15 @@
class ModemNBFM : public ModemAnalog { class ModemNBFM : public ModemAnalog {
public: public:
ModemNBFM(); ModemNBFM();
~ModemNBFM(); ~ModemNBFM() override;
std::string getName(); std::string getName() override;
static ModemBase *factory(); static ModemBase *factory();
int getDefaultSampleRate(); int getDefaultSampleRate() override;
void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut); void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) override;
private: private:
freqdem demodFM; freqdem demodFM;

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

@ -41,7 +41,7 @@ int ModemUSB::getDefaultSampleRate() {
} }
void ModemUSB::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) { void ModemUSB::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) {
ModemKitAnalog *akit = (ModemKitAnalog *)kit; auto *akit = (ModemKitAnalog *)kit;
initOutputBuffers(akit,input); initOutputBuffers(akit,input);

10
src/modules/modem/analog/ModemUSB.h
View File

@ -7,16 +7,16 @@
class ModemUSB : public ModemAnalog { class ModemUSB : public ModemAnalog {
public: public:
ModemUSB(); ModemUSB();
~ModemUSB(); ~ModemUSB() override;
std::string getName(); std::string getName() override;
static ModemBase *factory(); static ModemBase *factory();
int checkSampleRate(long long sampleRate, int audioSampleRate); int checkSampleRate(long long sampleRate, int audioSampleRate) override;
int getDefaultSampleRate(); int getDefaultSampleRate() override;
void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut); void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) override;
private: private:
iirfilt_crcf ssbFilt; iirfilt_crcf ssbFilt;