Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix M17 packet type decoding. #1894

Merged
merged 4 commits into from
Nov 17, 2023
Merged

Fix M17 packet type decoding. #1894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4178abe
Fix M17 packet type decoding.
srcejon Nov 17, 2023
66351cf
Fix loss of constellation when device restarted in M17 demod.
srcejon Nov 17, 2023
c7436c9
Fix M17 FM frequency deviation to work at +/-2.4kHz.
srcejon Nov 17, 2023
698cc3c
Prevent demod from crashing when GUI is destroyed.
srcejon Nov 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion plugins/channelrx/demodm17/m17demod.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ M17Demod::M17Demod(DeviceAPI *deviceAPI) :
m_thread(nullptr),
m_basebandSink(nullptr),
m_running(false),
m_basebandSampleRate(0)
m_basebandSampleRate(0),
m_scopeXYSink(nullptr)
{
qDebug("M17Demod::M17Demod");
setObjectName(m_channelId);
Expand Down Expand Up @@ -141,6 +142,7 @@ void M17Demod::start()
if (m_basebandSampleRate != 0) {
m_basebandSink->setBasebandSampleRate(m_basebandSampleRate);
}
m_basebandSink->setScopeXYSink(m_scopeXYSink);

m_basebandSink->reset();
m_thread->start();
Expand Down Expand Up @@ -751,3 +753,11 @@ void M17Demod::handleIndexInDeviceSetChanged(int index)
m_basebandSink->setFifoLabel(fifoLabel);
m_basebandSink->setAudioFifoLabel(fifoLabel);
}

void M17Demod::setScopeXYSink(BasebandSampleSink* sampleSink)
{
m_scopeXYSink = sampleSink;
if (m_running) {
m_basebandSink->setScopeXYSink(sampleSink);
}
}
4 changes: 2 additions & 2 deletions plugins/channelrx/demodm17/m17demod.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ class M17Demod : public BasebandSampleSink, public ChannelAPI {
SWGSDRangel::SWGChannelSettings& response);

uint32_t getNumberOfDeviceStreams() const;
void setScopeXYSink(BasebandSampleSink* sampleSink) { if (m_running) { m_basebandSink->setScopeXYSink(sampleSink); } }
void setScopeXYSink(BasebandSampleSink* sampleSink);
void configureMyPosition(float myLatitude, float myLongitude) { if (m_running) { m_basebandSink->configureMyPosition(myLatitude, myLongitude); } }
double getMagSq() { return m_running ? m_basebandSink->getMagSq() : 0.0; }
bool getSquelchOpen() const { return m_running && m_basebandSink->getSquelchOpen(); }
Expand Down Expand Up @@ -281,7 +281,7 @@ class M17Demod : public BasebandSampleSink, public ChannelAPI {
bool m_running;
M17DemodSettings m_settings;
int m_basebandSampleRate; //!< stored from device message used when starting baseband sink

BasebandSampleSink *m_scopeXYSink;
QNetworkAccessManager *m_networkManager;
QNetworkRequest m_networkRequest;

Expand Down
1 change: 1 addition & 0 deletions plugins/channelrx/demodm17/m17demodgui.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,6 +520,7 @@ M17DemodGUI::M17DemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban

M17DemodGUI::~M17DemodGUI()
{
m_m17Demod->setScopeXYSink(nullptr);
delete m_scopeVisXY;
ui->screenTV->setParent(nullptr); // Prefer memory leak to core dump... ~TVScreen() is buggy
delete ui;
Expand Down
2 changes: 1 addition & 1 deletion plugins/channelrx/demodm17/m17demodgui.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -921,7 +921,7 @@
</size>
</property>
<property name="toolTip">
<string>Baud rate: 2.4k: NXDN48, dPMR 4.8k: DMR, D-Star, YSF, NXDN96</string>
<string>Baud rate</string>
</property>
<item>
<property name="text">
Expand Down
6 changes: 3 additions & 3 deletions plugins/channelrx/demodm17/m17demodprocessor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,9 @@ bool M17DemodProcessor::decode_lsf(modemm17::M17FrameDecoder::lsf_buffer_t const
m_currentPacket.clear();
m_packetFrameCounter = 0;

if (!lsf[111]) // LSF type bit 0
if (!(lsf[13] & 1)) // LSF type bit 0
{
uint8_t packet_type = (lsf[109] << 1) | lsf[110];
uint8_t packet_type = (lsf[13] >> 1) & 0x3;

switch (packet_type)
{
Expand Down Expand Up @@ -254,7 +254,7 @@ void M17DemodProcessor::decode_type(uint16_t type)
m_typeInfo += "DAT";
break;
case 2:
m_typeInfo += "UNK";
m_typeInfo += "ENC"; // Encapsulated passes LSF up stack along with data
break;
case 3:
m_typeInfo += "UNK";
Expand Down
2 changes: 1 addition & 1 deletion plugins/channelrx/demodm17/m17demodsettings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ void M17DemodSettings::resetToDefaults()
{
m_inputFrequencyOffset = 0;
m_rfBandwidth = 12500.0;
m_fmDeviation = 3500.0;
m_fmDeviation = 2400.0;
m_volume = 2.0;
m_baudRate = 4800;
m_squelchGate = 5; // 10s of ms at 48000 Hz sample rate. Corresponds to 2400 for AGC attack
Expand Down
2 changes: 1 addition & 1 deletion plugins/channelrx/demodm17/m17demodsink.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ void M17DemodSink::applySettings(const M17DemodSettings& settings, const QList<Q
}

if (settingsKeys.contains("fmDeviation") || force) {
m_phaseDiscri.setFMScaling(48000.0f / (2.0f*settings.m_fmDeviation));
m_phaseDiscri.setFMScaling(48000.0f / (2.0f*M_PI*settings.m_fmDeviation));
}

if (settingsKeys.contains("squelchGate") || force)
Expand Down
6 changes: 3 additions & 3 deletions plugins/channeltx/modm17/m17modgui.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ void M17ModGUI::on_rfBW_valueChanged(int value)
void M17ModGUI::on_fmDev_valueChanged(int value)
{
ui->fmDevText->setText(QString("%1%2k").arg(QChar(0xB1, 0x00)).arg(value / 10.0, 0, 'f', 1));
m_settings.m_fmDeviation = value * 200.0;
m_settings.m_fmDeviation = value * 100.0;
applySettings(QList<QString>{"fmDeviation"});
}

Expand Down Expand Up @@ -570,8 +570,8 @@ void M17ModGUI::displaySettings()
ui->rfBWText->setText(QString("%1k").arg(m_settings.m_rfBandwidth / 1000.0, 0, 'f', 1));
ui->rfBW->setValue(m_settings.m_rfBandwidth / 100.0);

ui->fmDevText->setText(QString("%1%2k").arg(QChar(0xB1, 0x00)).arg(m_settings.m_fmDeviation / 2000.0, 0, 'f', 1));
ui->fmDev->setValue(m_settings.m_fmDeviation / 200.0);
ui->fmDevText->setText(QString("%1%2k").arg(QChar(0xB1, 0x00)).arg(m_settings.m_fmDeviation / 1000.0, 0, 'f', 1));
ui->fmDev->setValue(m_settings.m_fmDeviation / 100.0);

ui->volumeText->setText(QString("%1").arg(m_settings.m_volumeFactor, 0, 'f', 1));
ui->volume->setValue(m_settings.m_volumeFactor * 10.0);
Expand Down
4 changes: 2 additions & 2 deletions plugins/channeltx/modm17/m17modsettings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ void M17ModSettings::resetToDefaults()
{
m_inputFrequencyOffset = 0;
m_rfBandwidth = 16000.0f;
m_fmDeviation = 10000.0f; //!< full deviation
m_fmDeviation = 2400.0; //!< peak deviation
m_toneFrequency = 1000.0f;
m_volumeFactor = 1.0f;
m_channelMute = false;
Expand Down Expand Up @@ -146,7 +146,7 @@ bool M17ModSettings::deserialize(const QByteArray& data)
d.readS32(1, &tmp, 0);
m_inputFrequencyOffset = tmp;
d.readReal(2, &m_rfBandwidth, 12500.0);
d.readReal(4, &m_fmDeviation, 10000.0);
d.readReal(4, &m_fmDeviation, 2400.0);
d.readU32(5, &m_rgbColor);
d.readReal(6, &m_toneFrequency, 1000.0);
d.readReal(7, &m_volumeFactor, 1.0);
Expand Down
2 changes: 1 addition & 1 deletion plugins/channeltx/modm17/m17modsource.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ void M17ModSource::modulateSample()
calculateLevel(t);
t1 = m_lowpass.filter(t) * 1.5f;

m_modPhasor += (m_settings.m_fmDeviation / (float) m_audioSampleRate) * t1;
m_modPhasor += ((2.0f * M_PI * m_settings.m_fmDeviation) / (float) m_audioSampleRate) * t1;

// limit phasor range to ]-pi,pi]
if (m_modPhasor > M_PI) {
Expand Down