From 50d39f856d249809d517242ced27e05f3c58cabc Mon Sep 17 00:00:00 2001 From: f4exb Date: Sun, 21 Apr 2019 01:06:23 +0200 Subject: [PATCH] LimeSDR: change antenna labels for Lime Mini (fixed) --- plugins/samplesink/limesdroutput/limesdroutput.cpp | 9 +++++++++ plugins/samplesink/limesdroutput/limesdroutput.h | 1 + plugins/samplesink/limesdroutput/limesdroutputgui.cpp | 11 +++++++++++ .../samplesink/limesdroutput/limesdroutputplugin.cpp | 2 +- plugins/samplesource/limesdrinput/limesdrinput.cpp | 9 +++++++++ plugins/samplesource/limesdrinput/limesdrinput.h | 1 + plugins/samplesource/limesdrinput/limesdrinputgui.cpp | 11 +++++++++++ plugins/samplesource/limesdrinput/limesdrinputgui.ui | 2 +- 8 files changed, 44 insertions(+), 2 deletions(-) diff --git a/plugins/samplesink/limesdroutput/limesdroutput.cpp b/plugins/samplesink/limesdroutput/limesdroutput.cpp index 6c484c7b1..01a14945f 100644 --- a/plugins/samplesink/limesdroutput/limesdroutput.cpp +++ b/plugins/samplesink/limesdroutput/limesdroutput.cpp @@ -506,6 +506,15 @@ uint32_t LimeSDROutput::getHWLog2Interp() const return m_deviceShared.m_deviceParams->m_log2OvSRTx; } +DeviceLimeSDRParams::LimeType LimeSDROutput::getLimeType() const +{ + if (m_deviceShared.m_deviceParams) { + return m_deviceShared.m_deviceParams->m_type; + } else { + return DeviceLimeSDRParams::LimeUndefined; + } +} + bool LimeSDROutput::handleMessage(const Message& message) { if (MsgConfigureLimeSDR::match(message)) diff --git a/plugins/samplesink/limesdroutput/limesdroutput.h b/plugins/samplesink/limesdroutput/limesdroutput.h index 2277a5a06..64cf2e243 100644 --- a/plugins/samplesink/limesdroutput/limesdroutput.h +++ b/plugins/samplesink/limesdroutput/limesdroutput.h @@ -231,6 +231,7 @@ public: void getSRRange(float& minF, float& maxF) const; void getLPRange(float& minF, float& maxF) const; uint32_t getHWLog2Interp() const; + DeviceLimeSDRParams::LimeType getLimeType() const; private: DeviceSinkAPI *m_deviceAPI; diff --git a/plugins/samplesink/limesdroutput/limesdroutputgui.cpp b/plugins/samplesink/limesdroutput/limesdroutputgui.cpp index 64aa0d091..b219a7c89 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputgui.cpp +++ b/plugins/samplesink/limesdroutput/limesdroutputgui.cpp @@ -67,6 +67,17 @@ LimeSDROutputGUI::LimeSDROutputGUI(DeviceUISet *deviceUISet, QWidget* parent) : ui->channelNumberText->setText(tr("#%1").arg(m_limeSDROutput->getChannelIndex())); + 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"); + } + ui->hwInterpLabel->setText(QString::fromUtf8("H\u2191")); ui->swInterpLabel->setText(QString::fromUtf8("S\u2191")); 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..95fbdaa31 100644 --- a/plugins/samplesource/limesdrinput/limesdrinput.cpp +++ b/plugins/samplesource/limesdrinput/limesdrinput.cpp @@ -538,6 +538,15 @@ uint32_t LimeSDRInput::getHWLog2Decim() const return m_deviceShared.m_deviceParams->m_log2OvSRRx; } +DeviceLimeSDRParams::LimeType LimeSDRInput::getLimeType() const +{ + if (m_deviceShared.m_deviceParams) { + return m_deviceShared.m_deviceParams->m_type; + } else { + return DeviceLimeSDRParams::LimeUndefined; + } +} + bool LimeSDRInput::handleMessage(const Message& message) { if (MsgConfigureLimeSDR::match(message)) diff --git a/plugins/samplesource/limesdrinput/limesdrinput.h b/plugins/samplesource/limesdrinput/limesdrinput.h index 2d478eed5..3bba961d4 100644 --- a/plugins/samplesource/limesdrinput/limesdrinput.h +++ b/plugins/samplesource/limesdrinput/limesdrinput.h @@ -251,6 +251,7 @@ public: void getSRRange(float& minF, float& maxF) const; void getLPRange(float& minF, float& maxF) const; uint32_t getHWLog2Decim() const; + DeviceLimeSDRParams::LimeType getLimeType() const; private: DeviceSourceAPI *m_deviceAPI; diff --git a/plugins/samplesource/limesdrinput/limesdrinputgui.cpp b/plugins/samplesource/limesdrinput/limesdrinputgui.cpp index ad9d875d1..7e12a149d 100644 --- a/plugins/samplesource/limesdrinput/limesdrinputgui.cpp +++ b/plugins/samplesource/limesdrinput/limesdrinputgui.cpp @@ -70,6 +70,17 @@ LimeSDRInputGUI::LimeSDRInputGUI(DeviceUISet *deviceUISet, QWidget* parent) : ui->channelNumberText->setText(tr("#%1").arg(m_limeSDRInput->getChannelIndex())); + 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"); + } + ui->hwDecimLabel->setText(QString::fromUtf8("H\u2193")); ui->swDecimLabel->setText(QString::fromUtf8("S\u2193")); diff --git a/plugins/samplesource/limesdrinput/limesdrinputgui.ui b/plugins/samplesource/limesdrinput/limesdrinputgui.ui index ebb089fdc..43fc94c2c 100644 --- a/plugins/samplesource/limesdrinput/limesdrinputgui.ui +++ b/plugins/samplesource/limesdrinput/limesdrinputgui.ui @@ -924,7 +924,7 @@ - Antenna select: No: none, Lo: 700:900M, Hi: 2:2.6G, Wi: wideband, T1: Tx1 LB, T2: Tx2 LB + Antenna select: No: none, NC: not connected, Lo: 700:900M, Hi: 2:2.6G, Wi: wideband, T1: Tx1 LB, T2: Tx2 LB