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

SSB over TCP.

This commit is contained in:
hexameron 2014-12-03 18:41:38 +00:00
parent acdc87ccc5
commit 4ef7857aa5
11 changed files with 54 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/channel/ssb/ssbplugin.cpp
View File

@ -6,11 +6,11 @@
const PluginDescriptor SSBPlugin::m_pluginDescriptor = {
QString("SSB Demodulator"),
QString("---"),
QString("(c) maintech GmbH (rewritten by John Greb)"),
QString("1.0"),
QString("(c) 2014 John Greb"),
QString("http://www.maintech.de"),
true,
QString("http://www.maintech.de")
QString("github.com/hexameron/rtl-sdrangelove")
};
SSBPlugin::SSBPlugin(QObject* parent) :

42
plugins/channel/tcpsrc/tcpsrc.cpp
View File

@ -11,10 +11,10 @@ MESSAGE_CLASS_DEFINITION(TCPSrc::MsgTCPSrcSpectrum, Message)
TCPSrc::TCPSrc(MessageQueue* uiMessageQueue, TCPSrcGUI* tcpSrcGUI, SampleSink* spectrum)
{
m_inputSampleRate = 100000;
m_sampleFormat = FormatS8;
m_inputSampleRate = 96000;
m_sampleFormat = FormatSSB;
m_outputSampleRate = 48000;
m_rfBandwidth = 40000;
m_rfBandwidth = 32000;
m_tcpPort = 9999;
m_nco.setFreq(0, m_inputSampleRate);
m_interpolator.create(16, m_inputSampleRate, m_rfBandwidth / 2.1);
@ -23,7 +23,7 @@ TCPSrc::TCPSrc(MessageQueue* uiMessageQueue, TCPSrcGUI* tcpSrcGUI, SampleSink* s
m_tcpSrcGUI = tcpSrcGUI;
m_spectrum = spectrum;
m_spectrumEnabled = false;
m_nextS8Id = 0;
m_nextSSBId = 0;
m_nextS16leId = 0;
}
@ -51,7 +51,7 @@ void TCPSrc::feed(SampleVector::const_iterator begin, SampleVector::const_iterat
c *= m_nco.nextIQ();
if(m_interpolator.interpolate(&m_sampleDistanceRemain, c, &ci)) {
m_sampleBuffer.push_back(Sample(ci.real() * 32768.0, ci.imag() * 32768.0));
m_sampleBuffer.push_back(Sample(ci.real() * 20000.0, ci.imag() * 20000.0));
m_sampleDistanceRemain += m_inputSampleRate / m_outputSampleRate;
}
}
@ -62,17 +62,17 @@ void TCPSrc::feed(SampleVector::const_iterator begin, SampleVector::const_iterat
for(int i = 0; i < m_s16leSockets.count(); i++)
m_s16leSockets[i].socket->write((const char*)&m_sampleBuffer[0], m_sampleBuffer.size() * 4);
if(m_s8Sockets.count() > 0) {
if(m_ssbSockets.count() > 0) {
for(SampleVector::const_iterator it = m_sampleBuffer.begin(); it != m_sampleBuffer.end(); ++it) {
m_sampleBufferS8.push_back(it->real() >> 8);
m_sampleBufferS8.push_back(it->imag() >> 8);
// TODO: fft filter
m_sampleBufferSSB.push_back(it->real() + it->imag());
}
for(int i = 0; i < m_s8Sockets.count(); i++)
m_s8Sockets[i].socket->write((const char*)&m_sampleBufferS8[0], m_sampleBufferS8.size());
for(int i = 0; i < m_ssbSockets.count(); i++)
m_ssbSockets[i].socket->write((const char*)&m_sampleBufferSSB[0], m_sampleBufferSSB.size());
}
m_sampleBuffer.clear();
m_sampleBufferS8.clear();
m_sampleBufferSSB.clear();
}
void TCPSrc::start()
@ -84,7 +84,7 @@ void TCPSrc::start()
void TCPSrc::stop()
{
closeAllSockets(&m_s8Sockets);
closeAllSockets(&m_ssbSockets);
closeAllSockets(&m_s16leSockets);
if(m_tcpServer->isListening())
@ -146,11 +146,11 @@ void TCPSrc::onNewConnection()
connect(connection, SIGNAL(disconnected()), this, SLOT(onDisconnected()));
switch(m_sampleFormat) {
case FormatS8: {
quint32 id = (FormatS8 << 24) | m_nextS8Id;
case FormatSSB: {
quint32 id = (FormatSSB << 24) | m_nextSSBId;
MsgTCPSrcConnection* msg = MsgTCPSrcConnection::create(true, id, connection->peerAddress(), connection->peerPort());
m_nextS8Id = (m_nextS8Id + 1) & 0xffffff;
m_s8Sockets.push_back(Socket(id, connection));
m_nextSSBId = (m_nextSSBId + 1) & 0xffffff;
m_ssbSockets.push_back(Socket(id, connection));
msg->submit(m_uiMessageQueue, (PluginGUI*)m_tcpSrcGUI);
break;
}
@ -176,11 +176,11 @@ void TCPSrc::onDisconnected()
quint32 id;
QTcpSocket* socket = NULL;
for(int i = 0; i < m_s8Sockets.count(); i++) {
if(m_s8Sockets[i].socket == sender()) {
id = m_s8Sockets[i].id;
socket = m_s8Sockets[i].socket;
m_s8Sockets.removeAt(i);
for(int i = 0; i < m_ssbSockets.count(); i++) {
if(m_ssbSockets[i].socket == sender()) {
id = m_ssbSockets[i].id;
socket = m_ssbSockets[i].socket;
m_ssbSockets.removeAt(i);
break;
}
}

8
plugins/channel/tcpsrc/tcpsrc.h
View File

@ -16,7 +16,7 @@ class TCPSrc : public SampleSink {
public:
enum SampleFormat {
FormatS8,
FormatSSB,
FormatS16LE
};
@ -124,7 +124,7 @@ protected:
Real m_sampleDistanceRemain;
SampleVector m_sampleBuffer;
std::vector<qint8> m_sampleBufferS8;
std::vector<qint16> m_sampleBufferSSB;
SampleSink* m_spectrum;
bool m_spectrumEnabled;
@ -138,9 +138,9 @@ protected:
{ }
};
typedef QList<Socket> Sockets;
Sockets m_s8Sockets;
Sockets m_ssbSockets;
Sockets m_s16leSockets;
quint32 m_nextS8Id;
quint32 m_nextSSBId;
quint32 m_nextS16leId;
void closeAllSockets(Sockets* sockets);

20
plugins/channel/tcpsrc/tcpsrcgui.cpp
View File

@ -28,10 +28,11 @@ void TCPSrcGUI::resetToDefaults()
{
ui->sampleFormat->setCurrentIndex(0);
ui->sampleRate->setText("48000");
ui->rfBandwidth->setText("40000");
ui->rfBandwidth->setText("32000");
ui->tcpPort->setText("9999");
ui->spectrumGUI->resetToDefaults();
applySettings();
}
QByteArray TCPSrcGUI::serialize() const
@ -44,7 +45,6 @@ QByteArray TCPSrcGUI::serialize() const
s.writeReal(5, m_rfBandwidth);
s.writeS32(6, m_tcpPort);
s.writeBlob(7, ui->spectrumGUI->serialize());
s.writeU32(8, m_channelMarker->getColor().rgb());
return s.final();
}
@ -60,15 +60,14 @@ bool TCPSrcGUI::deserialize(const QByteArray& data)
if(d.getVersion() == 1) {
QByteArray bytetmp;
qint32 s32tmp;
quint32 u32tmp;
Real realtmp;
d.readBlob(1, &bytetmp);
restoreState(bytetmp);
d.readS32(2, &s32tmp, 0);
m_channelMarker->setCenterFrequency(s32tmp);
d.readS32(3, &s32tmp, TCPSrc::FormatS8);
d.readS32(3, &s32tmp, TCPSrc::FormatSSB);
switch(s32tmp) {
case TCPSrc::FormatS8:
case TCPSrc::FormatSSB:
ui->sampleFormat->setCurrentIndex(0);
break;
case TCPSrc::FormatS16LE:
@ -80,14 +79,12 @@ bool TCPSrcGUI::deserialize(const QByteArray& data)
}
d.readReal(4, &realtmp, 48000);
ui->sampleRate->setText(QString("%1").arg(realtmp, 0));
d.readReal(5, &realtmp, 40000);
d.readReal(5, &realtmp, 32000);
ui->rfBandwidth->setText(QString("%1").arg(realtmp, 0));
d.readS32(6, &s32tmp, 9999);
ui->tcpPort->setText(QString("%1").arg(s32tmp));
d.readBlob(7, &bytetmp);
ui->spectrumGUI->deserialize(bytetmp);
if(d.readU32(8, &u32tmp))
m_channelMarker->setColor(u32tmp);
applySettings();
return true;
} else {
@ -141,8 +138,9 @@ TCPSrcGUI::TCPSrcGUI(PluginAPI* pluginAPI, QWidget* parent) :
m_spectrumVis->configure(m_threadedSampleSink->getMessageQueue(), 64, 10, FFTWindow::BlackmanHarris);
m_channelMarker = new ChannelMarker(this);
m_channelMarker->setBandwidth(40000);
m_channelMarker->setBandwidth(16000);
m_channelMarker->setCenterFrequency(0);
m_channelMarker->setColor(Qt::green);
m_channelMarker->setVisible(true);
connect(m_channelMarker, SIGNAL(changed()), this, SLOT(channelMarkerChanged()));
m_pluginAPI->addChannelMarker(m_channelMarker);
@ -194,13 +192,13 @@ void TCPSrcGUI::applySettings()
TCPSrc::SampleFormat sampleFormat;
switch(ui->sampleFormat->currentIndex()) {
case 0:
sampleFormat = TCPSrc::FormatS8;
sampleFormat = TCPSrc::FormatSSB;
break;
case 1:
sampleFormat = TCPSrc::FormatS16LE;
break;
default:
sampleFormat = TCPSrc::FormatS8;
sampleFormat = TCPSrc::FormatSSB;
break;
}

4
plugins/channel/tcpsrc/tcpsrcgui.ui
View File

@ -43,7 +43,7 @@
<widget class="QComboBox" name="sampleFormat">
<item>
<property name="text">
<string>S8 I/Q</string>
<string>S16LE SSB</string>
</property>
</item>
<item>
@ -56,7 +56,7 @@
<item row="3" column="1">
<widget class="QLineEdit" name="rfBandwidth">
<property name="text">
<string>40000</string>
<string>32000</string>
</property>
</widget>
</item>

4
plugins/channel/tcpsrc/tcpsrcplugin.cpp
View File

@ -6,11 +6,11 @@
const PluginDescriptor TCPSrcPlugin::m_pluginDescriptor = {
QString("TCP Channel Source"),
QString("---"),
QString("ssb"),
QString("(c) maintech GmbH (written by Christian Daniel)"),
QString("http://www.maintech.de"),
true,
QString("http://www.maintech.de")
QString("github.com/hexameron/rtl-sdrangelove")
};
TCPSrcPlugin::TCPSrcPlugin(QObject* parent) :

6
plugins/channel/usb/usbplugin.cpp
View File

@ -6,11 +6,11 @@
const PluginDescriptor USBPlugin::m_pluginDescriptor = {
QString("USB Demodulator"),
QString("---"),
QString("(c) maintech GmbH (rewritten by John Greb)"),
QString("0.1"),
QString("(c) 2014 John Greb"),
QString("http://www.maintech.de"),
true,
QString("http://www.maintech.de")
QString("github.com/hexameron/rtl-sdrangelove")
};
USBPlugin::USBPlugin(QObject* parent) :

6
plugins/channel/wfm/wfmplugin.cpp
View File

@ -6,11 +6,11 @@
const PluginDescriptor WFMPlugin::m_pluginDescriptor = {
QString("WFM Demodulator"),
QString("---"),
QString("(c) maintech GmbH (written by Christian Daniel)"),
QString("1.0"),
QString("(c) 2014 JohnGreb"),
QString("http://www.maintech.de"),
true,
QString("http://www.maintech.de")
QString("github.com/hexameron/rtl-sdrangelove")
};
WFMPlugin::WFMPlugin(QObject* parent) :

2
plugins/samplesource/fcd/fcdplugin.cpp
View File

@ -11,7 +11,7 @@ const PluginDescriptor FCDPlugin::m_pluginDescriptor = {
QString("(c) John Greb"),
QString("http://funcubedongle.com"),
true,
QString("http://www.oz9aec.net/index.php/funcube-dongle")
QString("github.com/hexameron/rtl-sdrangelove")
};
FCDPlugin::FCDPlugin(QObject* parent) :

4
plugins/samplesource/rtlsdr/rtlsdrplugin.cpp
View File

@ -8,11 +8,11 @@
const PluginDescriptor RTLSDRPlugin::m_pluginDescriptor = {
QString("RTL-SDR Input"),
QString("---"),
QString("1.0"),
QString("(c) librtlsdr Authors (see source URL)"),
QString("http://sdr.osmocom.org/trac/wiki/rtl-sdr"),
true,
QString("http://cgit.osmocom.org/cgit/rtl-sdr")
QString("github.com/hexameron/rtl-sdrangelove")
};
RTLSDRPlugin::RTLSDRPlugin(QObject* parent) :

8
plugins/samplesource/v4l/v4lplugin.cpp
View File

@ -8,11 +8,11 @@
const PluginDescriptor V4LPlugin::m_pluginDescriptor = {
QString("V4L Input"),
QString("---"),
QString("(c) librtlsdr authors"),
QString("http://sdr.osmocom.org/trac/wiki/rtl-sdr"),
QString("3.18"),
QString("(c) 2014 John Greb"),
QString("http://palosaari.fi/linux/"),
true,
QString("http://cgit.osmocom.org/cgit/rtl-sdr")
QString("github.com/hexameron/rtl-sdrangelove")
};
V4LPlugin::V4LPlugin(QObject* parent) :