diff --git a/plugins/samplesink/limesdroutput/limesdroutput.cpp b/plugins/samplesink/limesdroutput/limesdroutput.cpp index 878c04485..6c484c7b1 100644 --- a/plugins/samplesink/limesdroutput/limesdroutput.cpp +++ b/plugins/samplesink/limesdroutput/limesdroutput.cpp @@ -59,11 +59,8 @@ LimeSDROutput::LimeSDROutput(DeviceSinkAPI *deviceAPI) : m_streamId.handle = 0; suspendRxBuddies(); suspendTxBuddies(); - - if (openDevice()) { - m_limeType = m_deviceShared.m_deviceParams->m_type; - } - resumeTxBuddies(); + openDevice(); + 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 2657e2abd..2277a5a06 100644 --- a/plugins/samplesink/limesdroutput/limesdroutput.h +++ b/plugins/samplesink/limesdroutput/limesdroutput.h @@ -231,12 +231,10 @@ 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 ccc285bd4..64aa0d091 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputgui.cpp +++ b/plugins/samplesink/limesdroutput/limesdroutputgui.cpp @@ -70,17 +70,6 @@ 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 b0804d5ec..cbdb526eb 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.5"), + QString("4.5.4"), 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 59ae8adb2..b6290265c 100644 --- a/plugins/samplesource/limesdrinput/limesdrinput.cpp +++ b/plugins/samplesource/limesdrinput/limesdrinput.cpp @@ -51,7 +51,6 @@ 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"), @@ -61,11 +60,6 @@ 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 85ccb4510..2d478eed5 100644 --- a/plugins/samplesource/limesdrinput/limesdrinput.h +++ b/plugins/samplesource/limesdrinput/limesdrinput.h @@ -251,12 +251,10 @@ 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 8a0729d7a..ad9d875d1 100644 --- a/plugins/samplesource/limesdrinput/limesdrinputgui.cpp +++ b/plugins/samplesource/limesdrinput/limesdrinputgui.cpp @@ -73,17 +73,6 @@ 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 9b99899e6..0fce88687 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.5"), + QString("4.5.4"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true,