mirror/SDRPlusPlus
0
0
Fork 0
mirror of https://github.com/AlexandreRouma/SDRPlusPlus.git synced 2024-11-10 12:47:40 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixes to the new radio module

Browse Source
This commit is contained in:
AlexandreRouma 2021-12-04 19:59:30 +01:00
parent 31b2cdd284
commit cdc060aa2a
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
decoder_modules/new_radio/src/main.cpp
View File

@ -17,11 +17,11 @@ MOD_EXPORT void _INIT_() {
} }
MOD_EXPORT ModuleManager::Instance* _CREATE_INSTANCE_(std::string name) { MOD_EXPORT ModuleManager::Instance* _CREATE_INSTANCE_(std::string name) {
return new RadioModule(name); return new NewRadioModule(name);
} }
MOD_EXPORT void _DELETE_INSTANCE_(void* instance) { MOD_EXPORT void _DELETE_INSTANCE_(void* instance) {
delete (RadioModule*)instance; delete (NewRadioModule*)instance;
} }
MOD_EXPORT void _END_() { MOD_EXPORT void _END_() {

33
decoder_modules/new_radio/src/radio_module.h
View File

@ -17,21 +17,23 @@ const double DeemphasisModes[] {
const char* DeemhasisModesTxt = "50µS\00075µS\000None\000"; const char* DeemhasisModesTxt = "50µS\00075µS\000None\000";
class RadioModule; class NewRadioModule;
#include "demod.h" #include "demod.h"
class RadioModule : public ModuleManager::Instance { class NewRadioModule : public ModuleManager::Instance {
public: public:
RadioModule(std::string name) { NewRadioModule(std::string name) {
this->name = name; this->name = name;
// Initialize the config if it doesn't exist // Initialize the config if it doesn't exist
bool created = false;
config.acquire(); config.acquire();
if (!config.conf.contains(name)) { if (!config.conf.contains(name)) {
config.conf[name]["selectedDemodId"] = 1; config.conf[name]["selectedDemodId"] = 1;
created = true;
} }
selectedDemodID = config.conf[name]["selectedDemodId"]; selectedDemodID = config.conf[name]["selectedDemodId"];
config.release(true); config.release(created);
// Create demodulator instances // Create demodulator instances
demods.fill(NULL); demods.fill(NULL);
@ -94,8 +96,17 @@ public:
gui::menu.registerEntry(name, menuHandler, this, this); gui::menu.registerEntry(name, menuHandler, this, this);
} }
~RadioModule() { ~NewRadioModule() {
gui::menu.removeEntry(name); gui::menu.removeEntry(name);
stream.stop();
if (enabled) {
squelch.stop();
if (selectedDemod) { selectedDemod->stop(); }
resamp.stop();
deemp.stop();
if (vfo) { sigpath::vfoManager.deleteVFO(vfo); }
}
sigpath::sinkManager.unregisterStream(name);
} }
void postInit() {} void postInit() {}
@ -138,7 +149,7 @@ public:
private: private:
static void menuHandler(void* ctx) { static void menuHandler(void* ctx) {
RadioModule* _this = (RadioModule*)ctx; NewRadioModule* _this = (NewRadioModule*)ctx;
if (!_this->enabled) { style::beginDisabled(); } if (!_this->enabled) { style::beginDisabled(); }
@ -240,6 +251,10 @@ private:
} }
selectedDemodID = id; selectedDemodID = id;
selectDemod(demod); selectDemod(demod);
// Save config
config.acquire();
config.conf[name]["selectedDemodId"] = id;
config.release(true);
} }
void selectDemod(demod::Demodulator* demod) { void selectDemod(demod::Demodulator* demod) {
@ -401,17 +416,17 @@ private:
} }
static void vfoUserChangedBandwidthHandler(double newBw, void* ctx) { static void vfoUserChangedBandwidthHandler(double newBw, void* ctx) {
RadioModule* _this = (RadioModule*)ctx; NewRadioModule* _this = (NewRadioModule*)ctx;
_this->setBandwidth(newBw); _this->setBandwidth(newBw);
} }
static void sampleRateChangeHandler(float sampleRate, void* ctx) { static void sampleRateChangeHandler(float sampleRate, void* ctx) {
RadioModule* _this = (RadioModule*)ctx; NewRadioModule* _this = (NewRadioModule*)ctx;
_this->setAudioSampleRate(sampleRate); _this->setAudioSampleRate(sampleRate);
} }
static void demodOutputChangeHandler(dsp::stream<dsp::stereo_t>* output, void* ctx) { static void demodOutputChangeHandler(dsp::stream<dsp::stereo_t>* output, void* ctx) {
RadioModule* _this = (RadioModule*)ctx; NewRadioModule* _this = (NewRadioModule*)ctx;
if (_this->postProcEnabled) { if (_this->postProcEnabled) {
_this->resamp.setInput(output); _this->resamp.setInput(output);
} }