mirror/SDRPlusPlus
0
0
Fork 0
mirror of https://github.com/AlexandreRouma/SDRPlusPlus.git synced 2024-11-06 18:57:39 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Added CW tone option plus clean up

Browse Source
This commit is contained in:
AlexandreRouma 2022-01-29 16:55:31 +01:00
parent 5e5c575e93
commit 860121dad2
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
decoder_modules/radio/src/demodulators/cw.h
View File

@ -18,10 +18,18 @@ namespace demod {
void init(std::string name, ConfigManager* config, dsp::stream<dsp::complex_t>* input, double bandwidth, EventHandler<dsp::stream<dsp::stereo_t>*> outputChangeHandler, double audioSR) { void init(std::string name, ConfigManager* config, dsp::stream<dsp::complex_t>* input, double bandwidth, EventHandler<dsp::stream<dsp::stereo_t>*> outputChangeHandler, double audioSR) {
this->name = name; this->name = name;
this->_config = config;
this->outputChangeHandler = outputChangeHandler; this->outputChangeHandler = outputChangeHandler;
// Load config
config->acquire();
if (config->conf[name][getName()].contains("tone")) {
tone = config->conf[name][getName()]["tone"];
}
config->release();
// Define structure // Define structure
xlator.init(input, getIFSampleRate(), 1000.0); xlator.init(input, getIFSampleRate(), tone);
c2r.init(&xlator.out); c2r.init(&xlator.out);
agc.init(&c2r.out, 20.0f, getIFSampleRate()); agc.init(&c2r.out, 20.0f, getIFSampleRate());
m2s.init(&agc.out); m2s.init(&agc.out);
@ -41,7 +49,17 @@ namespace demod {
m2s.stop(); m2s.stop();
} }
void showMenu() {} void showMenu() {
ImGui::LeftLabel("Tone Frequency");
ImGui::FillWidth();
if (ImGui::InputInt(("Stereo##_radio_cw_tone_" + name).c_str(), &tone, 10, 100)) {
tone = std::clamp<int>(tone, 250, 1250);
xlator.setFrequency(tone);
_config->acquire();
_config->conf[name][getName()]["tone"] = tone;
_config->release(true);
}
}
void setBandwidth(double bandwidth) {} void setBandwidth(double bandwidth) {}
@ -73,6 +91,7 @@ namespace demod {
dsp::stream<dsp::stereo_t>* getOutput() { return &m2s.out; } dsp::stream<dsp::stereo_t>* getOutput() { return &m2s.out; }
private: private:
ConfigManager* _config = NULL;
dsp::FrequencyXlator<dsp::complex_t> xlator; dsp::FrequencyXlator<dsp::complex_t> xlator;
dsp::ComplexToReal c2r; dsp::ComplexToReal c2r;
dsp::AGC agc; dsp::AGC agc;
@ -80,5 +99,7 @@ namespace demod {
std::string name; std::string name;
EventHandler<dsp::stream<dsp::stereo_t>*> outputChangeHandler; EventHandler<dsp::stream<dsp::stereo_t>*> outputChangeHandler;
int tone = 800;
}; };
} }

4
decoder_modules/radio/src/demodulators/wfm.h
View File

@ -24,10 +24,6 @@ namespace demod {
// Load config // Load config
_config->acquire(); _config->acquire();
bool modified = false; bool modified = false;
if (!config->conf[name].contains(getName())) {
config->conf[name][getName()]["stereo"] = false;
modified = true;
}
if (config->conf[name][getName()].contains("stereo")) { if (config->conf[name][getName()].contains("stereo")) {
stereo = config->conf[name][getName()]["stereo"]; stereo = config->conf[name][getName()]["stereo"];
} }