VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-03-24 21:28:29 -04:00
Code Issues Projects Releases Wiki Activity

ATV Modulator: PAL-M (525l) effective support

Browse Source
This commit is contained in:
f4exb 2017-03-12 21:41:01 +01:00
parent 99b79e383f
commit 43d40a4ace
11 changed files with 68 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devices/bladerf/devicebladerfvalues.cpp
View File

@ -25,11 +25,13 @@ unsigned int DeviceBladeRFSampleRates::m_rates[] = {
2304,
2400,
3000,
3024,
3072,
3200,
4608,
4800,
6000,
6048,
6144,
7680,
9216,

4
devices/hackrf/devicehackrfvalues.cpp
View File

@ -16,16 +16,18 @@
#include "devicehackrfvalues.h"
const unsigned int HackRFSampleRates::m_nb_rates = 17;
const unsigned int HackRFSampleRates::m_nb_rates = 19;
const unsigned int HackRFSampleRates::m_rates[HackRFSampleRates::m_nb_rates] = {
2400000,
3000000,
3024000, // for PAL-M
3200000,
4000000,
4333333, // for GSM
4800000,
5600000,
6000000,
6048000, // for PAL-M
6400000,
8000000,
9600000,

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

@ -249,6 +249,11 @@ void ATVModGUI::on_rfBW_valueChanged(int value)
applySettings();
}
void ATVModGUI::on_standard_currentIndexChanged(int index)
{
applySettings();
}
void ATVModGUI::on_uniformLevel_valueChanged(int value)
{
ui->uniformLevelText->setText(QString("%1").arg(value));

1
plugins/channeltx/modatv/atvmodgui.h
View File

@ -64,6 +64,7 @@ private slots:
void on_deltaMinus_toggled(bool minus);
void on_modulation_currentIndexChanged(int index);
void on_rfBW_valueChanged(int value);
void on_standard_currentIndexChanged(int index);
void on_uniformLevel_valueChanged(int value);
void on_inputSelect_currentIndexChanged(int index);
void on_channelMute_toggled(bool checked);

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

@ -6,19 +6,19 @@
<rect>
<x>0</x>
<y>0</y>
<width>491</width>
<width>490</width>
<height>364</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<width>490</width>
<height>0</height>
</size>
</property>
@ -37,15 +37,15 @@
<widget class="QWidget" name="settingsContainer" native="true">
<property name="geometry">
<rect>
<x>10</x>
<x>0</x>
<y>10</y>
<width>461</width>
<width>480</width>
<height>341</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>360</width>
<width>480</width>
<height>0</height>
</size>
</property>
@ -316,6 +316,11 @@
<string>PAL625L</string>
</property>
</item>
<item>
<property name="text">
<string>PAL525L</string>
</property>
</item>
</widget>
</item>
<item>

2
plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp
View File

@ -189,7 +189,7 @@ void HackRFOutputGui::displaySampleRates()
for (int i = 0; i < HackRFSampleRates::m_nb_rates; i++)
{
ui->sampleRate->addItem(QString("%1M").arg(QString::number(HackRFSampleRates::m_rates[i] / 1000000.0f, 'f', 1)));
ui->sampleRate->addItem(QString("%1").arg(QString::number(HackRFSampleRates::m_rates[i] / 1000.0f, 'f', 0)));
}
ui->sampleRate->blockSignals(false);

19
plugins/samplesink/hackrfoutput/hackrfoutputgui.ui
View File

@ -327,26 +327,32 @@
</item>
<item row="0" column="1">
<widget class="QComboBox" name="sampleRate">
<property name="maximumSize">
<size>
<width>70</width>
<height>16777215</height>
</size>
</property>
<property name="toolTip">
<string>Device sample rate</string>
</property>
</widget>
</item>
<item row="0" column="3">
<item row="0" column="4">
<widget class="QLabel" name="bbFiltLabel">
<property name="text">
<string>BBF</string>
</property>
</widget>
</item>
<item row="0" column="4">
<item row="0" column="5">
<widget class="QComboBox" name="bbFilter">
<property name="toolTip">
<string>RF bandpas filter</string>
</property>
</widget>
</item>
<item row="0" column="2">
<item row="0" column="3">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@ -359,6 +365,13 @@
</property>
</spacer>
</item>
<item row="0" column="2">
<widget class="QLabel" name="sampleRateUnits">
<property name="text">
<string>kS/s</string>
</property>
</widget>
</item>
</layout>
</item>
<item>

2
plugins/samplesink/hackrfoutput/hackrfoutputplugin.cpp
View File

@ -29,7 +29,7 @@
const PluginDescriptor HackRFOutputPlugin::m_pluginDescriptor = {
QString("HackRF Output"),
QString("3.1.0"),
QString("3.3.0"),
QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"),
true,

2
plugins/samplesource/hackrfinput/hackrfinputgui.cpp
View File

@ -206,7 +206,7 @@ void HackRFInputGui::displaySampleRates()
for (int i = 0; i < HackRFSampleRates::m_nb_rates; i++)
{
ui->sampleRate->addItem(QString("%1M").arg(QString::number(HackRFSampleRates::m_rates[i] / 1000000.0f, 'f', 1)));
ui->sampleRate->addItem(QString("%1").arg(QString::number(HackRFSampleRates::m_rates[i] / 1000.0f, 'f', 0)));
}
ui->sampleRate->blockSignals(false);

30
plugins/samplesource/hackrfinput/hackrfinputgui.ui
View File

@ -35,7 +35,16 @@
<property name="spacing">
<number>3</number>
</property>
<property name="margin">
<property name="leftMargin">
<number>2</number>
</property>
<property name="topMargin">
<number>2</number>
</property>
<property name="rightMargin">
<number>2</number>
</property>
<property name="bottomMargin">
<number>2</number>
</property>
<item>
@ -300,26 +309,32 @@
</item>
<item row="0" column="1">
<widget class="QComboBox" name="sampleRate">
<property name="maximumSize">
<size>
<width>70</width>
<height>16777215</height>
</size>
</property>
<property name="toolTip">
<string>Device sample rate</string>
</property>
</widget>
</item>
<item row="0" column="3">
<item row="0" column="4">
<widget class="QLabel" name="bbFiltLabel">
<property name="text">
<string>BBF</string>
</property>
</widget>
</item>
<item row="0" column="4">
<item row="0" column="5">
<widget class="QComboBox" name="bbFilter">
<property name="toolTip">
<string>RF bandpas filter</string>
</property>
</widget>
</item>
<item row="0" column="2">
<item row="0" column="3">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@ -332,6 +347,13 @@
</property>
</spacer>
</item>
<item row="0" column="2">
<widget class="QLabel" name="sampleRateUnits">
<property name="text">
<string>kS/s</string>
</property>
</widget>
</item>
</layout>
</item>
<item>

2
plugins/samplesource/hackrfinput/hackrfinputplugin.cpp
View File

@ -29,7 +29,7 @@
const PluginDescriptor HackRFInputPlugin::m_pluginDescriptor = {
QString("HackRF Input"),
QString("3.1.0"),
QString("3.3.0"),
QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"),
true,