VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-26 09:48:45 -05:00
Code Issues Projects Releases Wiki Activity

UDPSink: use neutral denomination for I/Q sample size with sample size format

Browse Source
This commit is contained in:
f4exb 2018-04-19 00:52:01 +02:00
parent f8251ecb50
commit da362823dc
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/channeltx/udpsink/readme.md
View File

@ -42,7 +42,7 @@ Sample rate in samples per second of the signal that is recveived on UDP. The ac
Combo box to specify the type of samples that are received and sent in the channel.
- `S16LE I/Q`: Raw I/Q samples on signed 16 bits integers with Little Endian layout. Use it with software that sends I/Q data as output like GNUradio with the `UDP source` block. The output is interleaved I and Q samples. It can also match the UDP source plugin with the same `S16LE I/Q` format and can be used for linear transposition.
- `SnLE I/Q`: Raw I/Q samples on signed 16 or 24 bits integers with Little Endian layout. Use it with software that sends I/Q data as output like GNUradio with the `UDP source` block. The output is interleaved I and Q samples. It can also match the UDP source plugin with the same `S16LE I/Q` format and compiled for the same sample I/Q size and can be used for linear transposition.
- `S16LE NFM`: receives 16 bits signed integers on 1 (mono) or 2 (stereo) channels with Little Endian layout. It produces a mono signal with narrow bandwidth FM modulation. Stereo input channels are mixed before modulation. There is no DC block so it can be used with modulating signals where the DC component is important like digital signals.
- `S16LE LSB`: Takes a 1 (mono) or 2 (stereo) channels AF signal and produces a LSB modulated signal. Stereo input channels are mixed before modulation.
- `S16LE USB`: Takes a 1 (mono) or 2 (stereo) channels AF signal and produces a USB modulated signal. Stereo input channels are mixed before modulation.

2
plugins/channeltx/udpsink/udpsink.cpp
View File

@ -149,7 +149,7 @@ void UDPSink::pull(Sample& sample)
void UDPSink::modulateSample()
{
if (m_settings.m_sampleFormat == UDPSinkSettings::FormatS16LE) // Linear I/Q transponding
if (m_settings.m_sampleFormat == UDPSinkSettings::FormatSnLE) // Linear I/Q transponding
{
Sample s;

6
plugins/channeltx/udpsink/udpsinkgui.cpp
View File

@ -492,7 +492,7 @@ void UDPSinkGUI::setSampleFormatIndex(const UDPSinkSettings::SampleFormat& sampl
{
switch(sampleFormat)
{
case UDPSinkSettings::FormatS16LE:
case UDPSinkSettings::FormatSnLE:
ui->sampleFormat->setCurrentIndex(0);
ui->fmDeviation->setEnabled(false);
ui->stereoInput->setChecked(true);
@ -532,7 +532,7 @@ void UDPSinkGUI::setSampleFormat(int index)
switch(index)
{
case 0:
m_settings.m_sampleFormat = UDPSinkSettings::FormatS16LE;
m_settings.m_sampleFormat = UDPSinkSettings::FormatSnLE;
ui->fmDeviation->setEnabled(false);
ui->stereoInput->setChecked(true);
ui->stereoInput->setEnabled(false);
@ -558,7 +558,7 @@ void UDPSinkGUI::setSampleFormat(int index)
ui->stereoInput->setEnabled(true);
break;
default:
m_settings.m_sampleFormat = UDPSinkSettings::FormatS16LE;
m_settings.m_sampleFormat = UDPSinkSettings::FormatSnLE;
ui->fmDeviation->setEnabled(false);
ui->stereoInput->setChecked(true);
ui->stereoInput->setEnabled(false);

2
plugins/channeltx/udpsink/udpsinkgui.ui
View File

@ -825,7 +825,7 @@
</property>
<item>
<property name="text">
<string>S16LE I/Q</string>
<string>SnLE I/Q</string>
</property>
</item>
<item>

2
plugins/channeltx/udpsink/udpsinksettings.cpp
View File

@ -30,7 +30,7 @@ UDPSinkSettings::UDPSinkSettings() :
void UDPSinkSettings::resetToDefaults()
{
m_sampleFormat = FormatS16LE;
m_sampleFormat = FormatSnLE;
m_inputSampleRate = 48000;
m_inputFrequencyOffset = 0;
m_rfBandwidth = 12500;

2
plugins/channeltx/udpsink/udpsinksettings.h
View File

@ -26,7 +26,7 @@ class Serializable;
struct UDPSinkSettings
{
enum SampleFormat {
FormatS16LE,
FormatSnLE,
FormatNFM,
FormatLSB,
FormatUSB,