VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-08-13 11:12:25 -04:00
Code Issues Projects Releases Wiki Activity

ATV: harmonize FM deviation between modulator and demodulator

Browse Source
This commit is contained in:
f4exb 2017-04-09 07:27:32 +02:00
parent d43f59e93b
commit e8415f7471
4 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/channelrx/demodatv/atvdemodgui.cpp
View File

@ -93,7 +93,7 @@ void ATVDemodGUI::resetToDefaults()
ui->rfBW->setValue(10); ui->rfBW->setValue(10);
ui->rfOppBW->setValue(10); ui->rfOppBW->setValue(10);
ui->bfo->setValue(0); ui->bfo->setValue(0);
ui->fmDeviation->setValue(100); ui->fmDeviation->setValue(250);
blockApplySettings(false); blockApplySettings(false);
lineTimeUpdate(); lineTimeUpdate();
@ -184,7 +184,7 @@ bool ATVDemodGUI::deserialize(const QByteArray& arrData)
ui->invertVideo->setChecked(booltmp); ui->invertVideo->setChecked(booltmp);
d.readS32(16, &tmp, 0); d.readS32(16, &tmp, 0);
ui->nbLines->setCurrentIndex(tmp); ui->nbLines->setCurrentIndex(tmp);
d.readS32(17, &tmp, 100); d.readS32(17, &tmp, 250);
ui->fmDeviation->setValue(tmp); ui->fmDeviation->setValue(tmp);
d.readS32(18, &tmp, 1); d.readS32(18, &tmp, 1);
ui->standard->setCurrentIndex(tmp); ui->standard->setCurrentIndex(tmp);
@ -400,7 +400,7 @@ void ATVDemodGUI::applyRFSettings()
ui->rfFiltering->isChecked(), ui->rfFiltering->isChecked(),
ui->decimatorEnable->isChecked(), ui->decimatorEnable->isChecked(),
ui->bfo->value(), ui->bfo->value(),
ui->fmDeviation->value() / 100.0f); ui->fmDeviation->value() / 500.0f);
} }
} }
@ -633,7 +633,7 @@ void ATVDemodGUI::on_bfo_valueChanged(int value)
void ATVDemodGUI::on_fmDeviation_valueChanged(int value) void ATVDemodGUI::on_fmDeviation_valueChanged(int value)
{ {
ui->fmDeviationText->setText(QString("%1").arg(value)); ui->fmDeviationText->setText(QString("%1").arg(value / 10.0, 0, 'f', 1));
applyRFSettings(); applyRFSettings();
} }

14
plugins/channelrx/demodatv/atvdemodgui.ui
View File

@ -331,17 +331,20 @@
<height>24</height> <height>24</height>
</size> </size>
</property> </property>
<property name="toolTip">
<string>FM deviation as % of full bandwidth</string>
</property>
<property name="minimum"> <property name="minimum">
<number>1</number> <number>1</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>125</number> <number>500</number>
</property> </property>
<property name="pageStep"> <property name="pageStep">
<number>1</number> <number>1</number>
</property> </property>
<property name="value"> <property name="value">
<number>100</number> <number>250</number>
</property> </property>
</widget> </widget>
</item> </item>
@ -349,12 +352,15 @@
<widget class="QLabel" name="fmDeviationText"> <widget class="QLabel" name="fmDeviationText">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>20</width> <width>30</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="toolTip">
<string>FM deviation as % of full bandwidth</string>
</property>
<property name="text"> <property name="text">
<string>100</string> <string>25.0</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>

6
plugins/channeltx/modatv/atvmodgui.cpp
View File

@ -154,7 +154,7 @@ bool ATVModGUI::deserialize(const QByteArray& data)
ui->fps->setCurrentIndex(tmp); ui->fps->setCurrentIndex(tmp);
d.readS32(12, &tmp, 80); d.readS32(12, &tmp, 80);
ui->rfScaling->setValue(tmp); ui->rfScaling->setValue(tmp);
d.readS32(13, &tmp, 50); d.readS32(13, &tmp, 250);
ui->fmExcursion->setValue(tmp); ui->fmExcursion->setValue(tmp);
blockApplySettings(false); blockApplySettings(false);
@ -400,7 +400,7 @@ void ATVModGUI::on_rfScaling_valueChanged(int value)
void ATVModGUI::on_fmExcursion_valueChanged(int value) void ATVModGUI::on_fmExcursion_valueChanged(int value)
{ {
ui->fmExcursionText->setText(tr("%1").arg(value)); ui->fmExcursionText->setText(tr("%1").arg(value / 10.0, 0, 'f', 1));
applySettings(); applySettings();
} }
@ -713,7 +713,7 @@ void ATVModGUI::applySettings()
ui->channelMute->isChecked(), ui->channelMute->isChecked(),
ui->invertVideo->isChecked(), ui->invertVideo->isChecked(),
ui->rfScaling->value() * 327.68f, ui->rfScaling->value() * 327.68f,
ui->fmExcursion->value() / 100.0f, ui->fmExcursion->value() / 1000.0f, // percentage of full bandwidth. Value in pro milli
ui->forceDecimator->isChecked()); ui->forceDecimator->isChecked());
} }
} }

12
plugins/channeltx/modatv/atvmodgui.ui
View File

@ -299,16 +299,16 @@
<string>FM excursion in % of total bandwidth</string> <string>FM excursion in % of total bandwidth</string>
</property> </property>
<property name="minimum"> <property name="minimum">
<number>0</number> <number>1</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>100</number> <number>500</number>
</property> </property>
<property name="pageStep"> <property name="pageStep">
<number>1</number> <number>1</number>
</property> </property>
<property name="value"> <property name="value">
<number>50</number> <number>250</number>
</property> </property>
</widget> </widget>
</item> </item>
@ -316,15 +316,15 @@
<widget class="QLabel" name="fmExcursionText"> <widget class="QLabel" name="fmExcursionText">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>20</width> <width>30</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>FM deviation percentage of total bandwidth</string> <string>FM excursion in % of total bandwidth</string>
</property> </property>
<property name="text"> <property name="text">
<string>50</string> <string>25.0</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>