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

Revert "LimeSDR: change antenna labels for Lime Mini"

Browse Source 
This reverts commit aefb1b7f3f.
This commit is contained in:
f4exb 2019-04-21 00:07:47 +02:00
parent e98d983bff
commit fbd875003a
8 changed files with 4 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/samplesink/limesdroutput/limesdroutput.cpp
View File

@ -59,11 +59,8 @@ LimeSDROutput::LimeSDROutput(DeviceSinkAPI *deviceAPI) :
m_streamId.handle = 0; m_streamId.handle = 0;
suspendRxBuddies(); suspendRxBuddies();
suspendTxBuddies(); suspendTxBuddies();
openDevice();
if (openDevice()) { resumeTxBuddies();
m_limeType = m_deviceShared.m_deviceParams->m_type;
}
resumeTxBuddies();
resumeRxBuddies(); resumeRxBuddies();
m_networkManager = new QNetworkAccessManager(); m_networkManager = new QNetworkAccessManager();
connect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*))); connect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*)));

2
plugins/samplesink/limesdroutput/limesdroutput.h
View File

@ -231,12 +231,10 @@ public:
void getSRRange(float& minF, float& maxF) const; void getSRRange(float& minF, float& maxF) const;
void getLPRange(float& minF, float& maxF) const; void getLPRange(float& minF, float& maxF) const;
uint32_t getHWLog2Interp() const; uint32_t getHWLog2Interp() const;
DeviceLimeSDRParams::LimeType getLimeType() const { return m_limeType; }
private: private:
DeviceSinkAPI *m_deviceAPI; DeviceSinkAPI *m_deviceAPI;
QMutex m_mutex; QMutex m_mutex;
DeviceLimeSDRParams::LimeType m_limeType;
LimeSDROutputSettings m_settings; LimeSDROutputSettings m_settings;
LimeSDROutputThread* m_limeSDROutputThread; LimeSDROutputThread* m_limeSDROutputThread;
QString m_deviceDescription; QString m_deviceDescription;

11
plugins/samplesink/limesdroutput/limesdroutputgui.cpp
View File

@ -70,17 +70,6 @@ LimeSDROutputGUI::LimeSDROutputGUI(DeviceUISet *deviceUISet, QWidget* parent) :
ui->hwInterpLabel->setText(QString::fromUtf8("H\u2191")); ui->hwInterpLabel->setText(QString::fromUtf8("H\u2191"));
ui->swInterpLabel->setText(QString::fromUtf8("S\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_updateTimer, SIGNAL(timeout()), this, SLOT(updateHardware()));
connect(&m_statusTimer, SIGNAL(timeout()), this, SLOT(updateStatus())); connect(&m_statusTimer, SIGNAL(timeout()), this, SLOT(updateStatus()));
m_statusTimer.start(500); m_statusTimer.start(500);

2
plugins/samplesink/limesdroutput/limesdroutputplugin.cpp
View File

@ -35,7 +35,7 @@
const PluginDescriptor LimeSDROutputPlugin::m_pluginDescriptor = { const PluginDescriptor LimeSDROutputPlugin::m_pluginDescriptor = {
QString("LimeSDR Output"), QString("LimeSDR Output"),
QString("4.5.5"), QString("4.5.4"),
QString("(c) Edouard Griffiths, F4EXB"), QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"), QString("https://github.com/f4exb/sdrangel"),
true, true,

6
plugins/samplesource/limesdrinput/limesdrinput.cpp
View File

@ -51,7 +51,6 @@ MESSAGE_CLASS_DEFINITION(LimeSDRInput::MsgStartStop, Message)
LimeSDRInput::LimeSDRInput(DeviceSourceAPI *deviceAPI) : LimeSDRInput::LimeSDRInput(DeviceSourceAPI *deviceAPI) :
m_deviceAPI(deviceAPI), m_deviceAPI(deviceAPI),
m_limeType(DeviceLimeSDRParams::LimeUndefined),
m_settings(), m_settings(),
m_limeSDRInputThread(0), m_limeSDRInputThread(0),
m_deviceDescription("LimeSDRInput"), m_deviceDescription("LimeSDRInput"),
@ -61,11 +60,6 @@ LimeSDRInput::LimeSDRInput(DeviceSourceAPI *deviceAPI) :
m_streamId.handle = 0; m_streamId.handle = 0;
suspendRxBuddies(); suspendRxBuddies();
suspendTxBuddies(); suspendTxBuddies();
if (openDevice()) {
m_limeType = m_deviceShared.m_deviceParams->m_type;
}
openDevice(); openDevice();
resumeTxBuddies(); resumeTxBuddies();
resumeRxBuddies(); resumeRxBuddies();

2
plugins/samplesource/limesdrinput/limesdrinput.h
View File

@ -251,12 +251,10 @@ public:
void getSRRange(float& minF, float& maxF) const; void getSRRange(float& minF, float& maxF) const;
void getLPRange(float& minF, float& maxF) const; void getLPRange(float& minF, float& maxF) const;
uint32_t getHWLog2Decim() const; uint32_t getHWLog2Decim() const;
DeviceLimeSDRParams::LimeType getLimeType() const { return m_limeType; }
private: private:
DeviceSourceAPI *m_deviceAPI; DeviceSourceAPI *m_deviceAPI;
QMutex m_mutex; QMutex m_mutex;
DeviceLimeSDRParams::LimeType m_limeType;
LimeSDRInputSettings m_settings; LimeSDRInputSettings m_settings;
LimeSDRInputThread* m_limeSDRInputThread; LimeSDRInputThread* m_limeSDRInputThread;
QString m_deviceDescription; QString m_deviceDescription;

11
plugins/samplesource/limesdrinput/limesdrinputgui.cpp
View File

@ -73,17 +73,6 @@ LimeSDRInputGUI::LimeSDRInputGUI(DeviceUISet *deviceUISet, QWidget* parent) :
ui->hwDecimLabel->setText(QString::fromUtf8("H\u2193")); ui->hwDecimLabel->setText(QString::fromUtf8("H\u2193"));
ui->swDecimLabel->setText(QString::fromUtf8("S\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_updateTimer, SIGNAL(timeout()), this, SLOT(updateHardware()));
connect(&m_statusTimer, SIGNAL(timeout()), this, SLOT(updateStatus())); connect(&m_statusTimer, SIGNAL(timeout()), this, SLOT(updateStatus()));
m_statusTimer.start(500); m_statusTimer.start(500);

2
plugins/samplesource/limesdrinput/limesdrinputplugin.cpp
View File

@ -34,7 +34,7 @@
const PluginDescriptor LimeSDRInputPlugin::m_pluginDescriptor = { const PluginDescriptor LimeSDRInputPlugin::m_pluginDescriptor = {
QString("LimeSDR Input"), QString("LimeSDR Input"),
QString("4.5.5"), QString("4.5.4"),
QString("(c) Edouard Griffiths, F4EXB"), QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"), QString("https://github.com/f4exb/sdrangel"),
true, true,