mirror/SDRPlusPlus
0
0
Fork 0
mirror of https://github.com/AlexandreRouma/SDRPlusPlus.git synced 2025-07-08 18:15:21 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added basic RDS support, no error correction yet

Browse Source
This commit is contained in:
AlexandreRouma
2022-07-06 22:11:49 +02:00
parent 46f17019a7
commit edf22ccfe8
14 changed files with 992 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,15 @@
#pragma once
#include "../demod.h"
#include <dsp/demod/broadcast_fm.h>
#include <dsp/clock_recovery/mm.h>
#include <dsp/clock_recovery/fd.h>
#include <dsp/taps/root_raised_cosine.h>
#include <dsp/digital/binary_slicer.h>
#include <dsp/digital/manchester_decoder.h>
#include <dsp/digital/differential_decoder.h>
#include <gui/widgets/symbol_diagram.h>
#include <fstream>
#include <rds.h>
namespace demod {
class WFM : public Demodulator {
@ -13,12 +22,17 @@ namespace demod {
~WFM() {
stop();
gui::waterfall.onFFTRedraw.unbindHandler(&fftRedrawHandler);
}
void init(std::string name, ConfigManager* config, dsp::stream<dsp::complex_t>* input, double bandwidth, double audioSR) {
this->name = name;
_config = config;
fftRedrawHandler.handler = fftRedraw;
fftRedrawHandler.ctx = this;
gui::waterfall.onFFTRedraw.bindHandler(&fftRedrawHandler);
// Load config
_config->acquire();
bool modified = false;
@ -28,18 +42,36 @@ namespace demod {
if (config->conf[name][getName()].contains("lowPass")) {
_lowPass = config->conf[name][getName()]["lowPass"];
}
if (config->conf[name][getName()].contains("rds")) {
_rds = config->conf[name][getName()]["rds"];
}
_config->release(modified);
// Define structure
demod.init(input, bandwidth / 2.0f, getIFSampleRate(), _stereo, _lowPass);
demod.init(input, bandwidth / 2.0f, getIFSampleRate(), _stereo, _lowPass, _rds);
recov.init(&demod.rdsOut, 5000.0 / 2375, omegaGain, muGain, 0.01);
slice.init(&recov.out);
manch.init(&slice.out);
diff.init(&manch.out, 2);
hs.init(&diff.out, rdsHandler, this);
}
void start() {
demod.start();
recov.start();
slice.start();
manch.start();
diff.start();
hs.start();
}
void stop() {
demod.stop();
recov.stop();
slice.stop();
manch.stop();
diff.stop();
hs.stop();
}
void showMenu() {
@ -55,6 +87,21 @@ namespace demod {
_config->conf[name][getName()]["lowPass"] = _lowPass;
_config->release(true);
}
if (ImGui::Checkbox(("Decode RDS##_radio_wfm_rds_" + name).c_str(), &_rds)) {
demod.setRDSOut(_rds);
_config->acquire();
_config->conf[name][getName()]["rds"] = _rds;
_config->release(true);
}
// if (_rds) {
// if (rdsDecode.countryCodeValid()) { ImGui::Text("Country code: %d", rdsDecode.getCountryCode()); }
// if (rdsDecode.programCoverageValid()) { ImGui::Text("Program coverage: %d", rdsDecode.getProgramCoverage()); }
// if (rdsDecode.programRefNumberValid()) { ImGui::Text("Reference number: %d", rdsDecode.getProgramRefNumber()); }
// if (rdsDecode.programTypeValid()) { ImGui::Text("Program type: %d", rdsDecode.getProgramType()); }
// if (rdsDecode.PSNameValid()) { ImGui::Text("Program name: [%s]", rdsDecode.getPSName().c_str()); }
// if (rdsDecode.radioTextValid()) { ImGui::Text("Radiotext: [%s]", rdsDecode.getRadioText().c_str()); }
// }
}
void setBandwidth(double bandwidth) {
@ -93,12 +140,68 @@ namespace demod {
}
private:
static void rdsHandler(uint8_t* data, int count, void* ctx) {
WFM* _this = (WFM*)ctx;
_this->rdsDecode.process(data, count);
}
static void fftRedraw(ImGui::WaterFall::FFTRedrawArgs args, void* ctx) {
WFM* _this = (WFM*)ctx;
if (!_this->_rds) { return; }
// Generate string depending on RDS mode
char buf[256];
if (_this->rdsDecode.PSNameValid() && _this->rdsDecode.radioTextValid()) {
sprintf(buf, "RDS: %s - %s", _this->rdsDecode.getPSName().c_str(), _this->rdsDecode.getRadioText().c_str());
}
else if (_this->rdsDecode.PSNameValid()) {
sprintf(buf, "RDS: %s", _this->rdsDecode.getPSName().c_str());
}
else if (_this->rdsDecode.radioTextValid()) {
sprintf(buf, "RDS: %s", _this->rdsDecode.getRadioText().c_str());
}
else {
return;
}
// Calculate paddings
ImVec2 min = args.min;
min.x += 5.0f * style::uiScale;
min.y += 5.0f * style::uiScale;
ImVec2 tmin = min;
tmin.x += 5.0f * style::uiScale;
tmin.y += 5.0f * style::uiScale;
ImVec2 tmax = ImGui::CalcTextSize(buf);
tmax.x += tmin.x;
tmax.y += tmin.y;
ImVec2 max = tmax;
max.x += 5.0f * style::uiScale;
max.y += 5.0f * style::uiScale;
// Draw back drop
args.window->DrawList->AddRectFilled(min, max, IM_COL32(0, 0, 0, 128));
// Draw text
args.window->DrawList->AddText(tmin, IM_COL32(255, 255, 0, 255), buf);
}
dsp::demod::BroadcastFM demod;
dsp::clock_recovery::FD recov;
dsp::digital::BinarySlicer slice;
dsp::digital::ManchesterDecoder manch;
dsp::digital::DifferentialDecoder diff;
dsp::sink::Handler<uint8_t> hs;
EventHandler<ImGui::WaterFall::FFTRedrawArgs> fftRedrawHandler;
rds::RDSDecoder rdsDecode;
ConfigManager* _config = NULL;
bool _stereo = false;
bool _lowPass = true;
bool _rds = false;
float muGain = 0.01;
float omegaGain = (0.01*0.01)/4.0;
std::string name;
};