From aefb1b7f3f3016eafc1f12499eeff045374d857f Mon Sep 17 00:00:00 2001 From: f4exb Date: Tue, 16 Apr 2019 22:58:38 +0200 Subject: [PATCH] LimeSDR: change antenna labels for Lime Mini --- plugins/samplesink/limesdroutput/limesdroutput.cpp | 7 +++++-- plugins/samplesink/limesdroutput/limesdroutput.h | 2 ++ plugins/samplesink/limesdroutput/limesdroutputgui.cpp | 11 +++++++++++ .../samplesink/limesdroutput/limesdroutputplugin.cpp | 2 +- plugins/samplesource/limesdrinput/limesdrinput.cpp | 6 ++++++ plugins/samplesource/limesdrinput/limesdrinput.h | 2 ++ plugins/samplesource/limesdrinput/limesdrinputgui.cpp | 11 +++++++++++ .../samplesource/limesdrinput/limesdrinputplugin.cpp | 2 +- 8 files changed, 39 insertions(+), 4 deletions(-) diff --git a/plugins/samplesink/limesdroutput/limesdroutput.cpp b/plugins/samplesink/limesdroutput/limesdroutput.cpp index 6c484c7b1..878c04485 100644 --- a/plugins/samplesink/limesdroutput/limesdroutput.cpp +++ b/plugins/samplesink/limesdroutput/limesdroutput.cpp @@ -59,8 +59,11 @@ LimeSDROutput::LimeSDROutput(DeviceSinkAPI *deviceAPI) : m_streamId.handle = 0; suspendRxBuddies(); suspendTxBuddies(); - openDevice(); - resumeTxBuddies(); + + if (openDevice()) { + m_limeType = m_deviceShared.m_deviceParams->m_type; + } + resumeTxBuddies(); resumeRxBuddies(); m_networkManager = new QNetworkAccessManager(); connect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*))); diff --git a/plugins/samplesink/limesdroutput/limesdroutput.h b/plugins/samplesink/limesdroutput/limesdroutput.h index 2277a5a06..2657e2abd 100644 --- a/plugins/samplesink/limesdroutput/limesdroutput.h +++ b/plugins/samplesink/limesdroutput/limesdroutput.h @@ -231,10 +231,12 @@ public: void getSRRange(float& minF, float& maxF) const; void getLPRange(float& minF, float& maxF) const; uint32_t getHWLog2Interp() const; + DeviceLimeSDRParams::LimeType getLimeType() const { return m_limeType; } private: DeviceSinkAPI *m_deviceAPI; QMutex m_mutex; + DeviceLimeSDRParams::LimeType m_limeType; LimeSDROutputSettings m_settings; LimeSDROutputThread* m_limeSDROutputThread; QString m_deviceDescription; diff --git a/plugins/samplesink/limesdroutput/limesdroutputgui.cpp b/plugins/samplesink/limesdroutput/limesdroutputgui.cpp index 64aa0d091..ccc285bd4 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputgui.cpp +++ b/plugins/samplesink/limesdroutput/limesdroutputgui.cpp @@ -70,6 +70,17 @@ LimeSDROutputGUI::LimeSDROutputGUI(DeviceUISet *deviceUISet, QWidget* parent) : ui->hwInterpLabel->setText(QString::fromUtf8("H\u2191")); ui->swInterpLabel->setText(QString::fromUtf8("S\u2191")); + if (m_limeSDROutput->getLimeType() == DeviceLimeSDRParams::LimeMini) + { + ui->antenna->setItemText(1, "Hi"); + ui->antenna->setItemText(2, "Lo"); + } + else + { + ui->antenna->setItemText(1, "Lo"); + ui->antenna->setItemText(2, "Hi"); + } + connect(&m_updateTimer, SIGNAL(timeout()), this, SLOT(updateHardware())); connect(&m_statusTimer, SIGNAL(timeout()), this, SLOT(updateStatus())); m_statusTimer.start(500); diff --git a/plugins/samplesink/limesdroutput/limesdroutputplugin.cpp b/plugins/samplesink/limesdroutput/limesdroutputplugin.cpp index cbdb526eb..b0804d5ec 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputplugin.cpp +++ b/plugins/samplesink/limesdroutput/limesdroutputplugin.cpp @@ -35,7 +35,7 @@ const PluginDescriptor LimeSDROutputPlugin::m_pluginDescriptor = { QString("LimeSDR Output"), - QString("4.5.4"), + QString("4.5.5"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/samplesource/limesdrinput/limesdrinput.cpp b/plugins/samplesource/limesdrinput/limesdrinput.cpp index b6290265c..59ae8adb2 100644 --- a/plugins/samplesource/limesdrinput/limesdrinput.cpp +++ b/plugins/samplesource/limesdrinput/limesdrinput.cpp @@ -51,6 +51,7 @@ MESSAGE_CLASS_DEFINITION(LimeSDRInput::MsgStartStop, Message) LimeSDRInput::LimeSDRInput(DeviceSourceAPI *deviceAPI) : m_deviceAPI(deviceAPI), + m_limeType(DeviceLimeSDRParams::LimeUndefined), m_settings(), m_limeSDRInputThread(0), m_deviceDescription("LimeSDRInput"), @@ -60,6 +61,11 @@ LimeSDRInput::LimeSDRInput(DeviceSourceAPI *deviceAPI) : m_streamId.handle = 0; suspendRxBuddies(); suspendTxBuddies(); + + if (openDevice()) { + m_limeType = m_deviceShared.m_deviceParams->m_type; + } + openDevice(); resumeTxBuddies(); resumeRxBuddies(); diff --git a/plugins/samplesource/limesdrinput/limesdrinput.h b/plugins/samplesource/limesdrinput/limesdrinput.h index 2d478eed5..85ccb4510 100644 --- a/plugins/samplesource/limesdrinput/limesdrinput.h +++ b/plugins/samplesource/limesdrinput/limesdrinput.h @@ -251,10 +251,12 @@ public: void getSRRange(float& minF, float& maxF) const; void getLPRange(float& minF, float& maxF) const; uint32_t getHWLog2Decim() const; + DeviceLimeSDRParams::LimeType getLimeType() const { return m_limeType; } private: DeviceSourceAPI *m_deviceAPI; QMutex m_mutex; + DeviceLimeSDRParams::LimeType m_limeType; LimeSDRInputSettings m_settings; LimeSDRInputThread* m_limeSDRInputThread; QString m_deviceDescription; diff --git a/plugins/samplesource/limesdrinput/limesdrinputgui.cpp b/plugins/samplesource/limesdrinput/limesdrinputgui.cpp index ad9d875d1..8a0729d7a 100644 --- a/plugins/samplesource/limesdrinput/limesdrinputgui.cpp +++ b/plugins/samplesource/limesdrinput/limesdrinputgui.cpp @@ -73,6 +73,17 @@ LimeSDRInputGUI::LimeSDRInputGUI(DeviceUISet *deviceUISet, QWidget* parent) : ui->hwDecimLabel->setText(QString::fromUtf8("H\u2193")); ui->swDecimLabel->setText(QString::fromUtf8("S\u2193")); + if (m_limeSDRInput->getLimeType() == DeviceLimeSDRParams::LimeMini) + { + ui->antenna->setItemText(2, "NC"); + ui->antenna->setItemText(3, "Lo"); + } + else + { + ui->antenna->setItemText(2, "Lo"); + ui->antenna->setItemText(3, "Wi"); + } + connect(&m_updateTimer, SIGNAL(timeout()), this, SLOT(updateHardware())); connect(&m_statusTimer, SIGNAL(timeout()), this, SLOT(updateStatus())); m_statusTimer.start(500); diff --git a/plugins/samplesource/limesdrinput/limesdrinputplugin.cpp b/plugins/samplesource/limesdrinput/limesdrinputplugin.cpp index 0fce88687..9b99899e6 100644 --- a/plugins/samplesource/limesdrinput/limesdrinputplugin.cpp +++ b/plugins/samplesource/limesdrinput/limesdrinputplugin.cpp @@ -34,7 +34,7 @@ const PluginDescriptor LimeSDRInputPlugin::m_pluginDescriptor = { QString("LimeSDR Input"), - QString("4.5.4"), + QString("4.5.5"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true,