VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1613 from srcejon/fix_1608 

Update DAB Demod to use latest DAB library
This commit is contained in:
Edouard Griffiths 2023-03-04 13:00:03 +01:00 committed by GitHub
parent e368830ffe 1b99d1a80b
commit 1b2162d88f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/channelrx/demoddab/dabdemodsink.cpp
View File

@ -279,12 +279,10 @@ void motDataHandler(uint8_t *data, int len, const char *filename, int contentsub
sink->motData(data, len, QString::fromUtf8(filename), contentsubType);
}
// Missing ctx for tiiDataHandler - https://github.com/JvanKatwijk/dab-cmdline/issues/89
DABDemodSink *tiiSink;
void tiiDataHandler(int tii)
void tiiDataHandler(int tii, void *ctx)
{
tiiSink->tii(tii);
DABDemodSink *sink = (DABDemodSink *)ctx;
sink->tii(tii);
}
void DABDemodSink::systemData(bool sync, int16_t snr, int32_t freqOffset)
@ -523,7 +521,6 @@ DABDemodSink::DABDemodSink(DABDemod *packetDemod) :
m_api.motdata_Handler = motDataHandler;
m_api.tii_data_Handler = tiiDataHandler;
m_api.timeHandler = nullptr;
tiiSink = this;
m_dab = dabInit(&m_device,
&m_api,
nullptr,

8
plugins/channelrx/demoddab/readme.md
View File

@ -77,6 +77,12 @@ The statistics areas displays statistics generated by the demodulator that may g
If you are hearing dropouts in audio, try adjusting your antenna in order to improve the reported SNR.
<h3>Transmitter</h3>
Displays the TII (Transmitter Identification Information) main and sub IDs in hexidecimal, which can identify which transmitter the DAB signal is being primarily received from.
Pressing the "Find Transmitter on Map" button will attempt to locate the transmitter with the same IDs and Ensemble name on the [Map](../../feature/map/readme.md) feature.
<h2>Attribution</h2>
The DAB demodulator used DAB library by Jvan Katwijk.
The DAB demodulator uses the DAB library by Jvan Katwijk.

2
plugins/feature/map/mapmodel.cpp
View File

@ -586,7 +586,7 @@ ObjectMapItem *ObjectMapModel::findMapItem(const QString& name)
while (i.hasNext())
{
MapItem *item = i.next();
if (item->m_name == name) {
if (!item->m_name.compare(name, Qt::CaseInsensitive)) {
return (ObjectMapItem *)item;
}
}