comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2024-11-26 21:58:37 -05:00
Code Issues Projects Releases Wiki Activity

FSK now appears somewhat functional (outputs symbols to console)

Browse Source
This commit is contained in:
Charles J. Cliffe 2015-11-24 00:20:17 -05:00
parent 6e74662518
commit d14dfed063
3 changed files with 56 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,12 +20,17 @@ class ModemFMStereo : public Modem {
public:
ModemFMStereo();
~ModemFMStereo();
std::string getType();
std::string getName();
Modem *factory();
int checkSampleRate(long long sampleRate, int audioSampleRate);
ModemKit *buildKit(long long sampleRate, int audioSampleRate);
void disposeKit(ModemKit *kit);
void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut);
private:

69
src/modules/modem/digital/ModemFSK.cpp
View File

@ -2,42 +2,61 @@
ModemFSK::ModemFSK() {
// DMR defaults?
bps = 9600;
spacing = 7000;
bps = 1;
sps = 9600;
}
Modem *ModemFSK::factory() {
return new ModemFSK;
}
int ModemFSK::checkSampleRate(long long sampleRate, int audioSampleRate) {
float minSps = pow(2.0,bps);
float nextSps = (float(sampleRate) / float(sps));
if (nextSps < minSps) {
return 2 * bps * sps;
} else {
return sampleRate;
}
}
ModemArgInfoList ModemFSK::getSettings() {
ModemArgInfoList args;
ModemArgInfo bpsArg;
bpsArg.key = "bps";
bpsArg.name = "Bits per-symbol";
bpsArg.name = "Bits/symbol";
bpsArg.value = std::to_string(bps);
bpsArg.description = "FSK modem bits-per-symbol";
bpsArg.description = "Modem bits-per-symbol";
bpsArg.type = ModemArgInfo::STRING;
std::vector<std::string> bpsOpts;
bpsOpts.push_back("9600");
bpsOpts.push_back("1");
bpsOpts.push_back("2");
bpsOpts.push_back("4");
bpsOpts.push_back("8");
bpsArg.options = bpsOpts;
args.push_back(bpsArg);
ModemArgInfo spacingArg;
spacingArg.key = "spacing";
spacingArg.name = "Symbol Spacing?";
spacingArg.description = "Not quite sure yet :-)";
spacingArg.type = ModemArgInfo::STRING;
spacingArg.value = std::to_string(spacing);
ModemArgInfo spsArg;
spsArg.key = "sps";
spsArg.name = "Symbols/second";
spsArg.value = std::to_string(sps);
spsArg.description = "Modem symbols-per-second";
spsArg.type = ModemArgInfo::STRING;
std::vector<std::string> spacingOpts;
spacingOpts.push_back("7000");
spacingArg.options = spacingOpts;
std::vector<std::string> spsOpts;
// some common modem rates ..?
spsOpts.push_back("1200");
spsOpts.push_back("2400");
spsOpts.push_back("4800");
spsOpts.push_back("9600");
spsOpts.push_back("19200");
spsOpts.push_back("38400");
spsArg.options = spsOpts;
args.push_back(spacingArg);
args.push_back(spsArg);
return args;
}
@ -46,8 +65,8 @@ void ModemFSK::writeSetting(std::string setting, std::string value) {
if (setting == "bps") {
bps = std::stoi(value);
rebuildKit();
} else if (setting == "spacing") {
spacing = std::stoi(value);
} else if (setting == "sps") {
sps = std::stoi(value);
rebuildKit();
}
}
@ -55,19 +74,18 @@ void ModemFSK::writeSetting(std::string setting, std::string value) {
std::string ModemFSK::readSetting(std::string setting) {
if (setting == "bps") {
return std::to_string(bps);
} else if (setting == "spacing") {
return std::to_string(spacing);
} else if (setting == "sps") {
return std::to_string(sps);
}
return "";
}
ModemKit *ModemFSK::buildKit(long long sampleRate, int audioSampleRate) {
ModemKitFSK *dkit = new ModemKitFSK;
dkit->m = 1;
dkit->k = sampleRate / bps;
dkit->bandwidth = double(spacing) / sampleRate;
dkit->m = bps;
dkit->k = sampleRate / sps;
dkit->demodFSK = fskdem_create(dkit->m, dkit->k, dkit->bandwidth);
dkit->demodFSK = fskdem_create(dkit->m, dkit->k, 0.45);
dkit->sampleRate = sampleRate;
dkit->audioSampleRate = audioSampleRate;
@ -78,6 +96,8 @@ ModemKit *ModemFSK::buildKit(long long sampleRate, int audioSampleRate) {
void ModemFSK::disposeKit(ModemKit *kit) {
ModemKitFSK *dkit = (ModemKitFSK *)kit;
fskdem_destroy(dkit->demodFSK);
delete dkit;
}
@ -100,7 +120,8 @@ void ModemFSK::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *a
unsigned int sym_out;
sym_out = fskdem_demodulate(dkit->demodFSK, &dkit->inputBuffer[0]);
// std::cout << "ferror: " << fskdem_get_frequency_error(dkit->demodFSK) << std::endl;
// float err = fskdem_get_frequency_error(dkit->demodFSK);
// std::cout << "ferror: " << err << std::endl;
printf("%01X", sym_out);
dkit->inputBuffer.erase(dkit->inputBuffer.begin(),dkit->inputBuffer.begin()+dkit->k);
}

6
src/modules/modem/digital/ModemFSK.h
View File

@ -3,7 +3,6 @@
class ModemKitFSK : public ModemKitDigital {
public:
float sps, spacing, bandwidth;
unsigned int m, k;
fskdem demodFSK;
@ -20,6 +19,8 @@ public:
Modem *factory();
int checkSampleRate(long long sampleRate, int audioSampleRate);
ModemArgInfoList getSettings();
void writeSetting(std::string setting, std::string value);
std::string readSetting(std::string setting);
@ -30,6 +31,7 @@ public:
void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut);
private:
int bps, spacing;
int sps;
int bps;
};