VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-26 01:39:05 -05:00
Code Issues Projects Releases Wiki Activity

LimeSDR: change antenna labels for Lime Mini (fixed)

Browse Source
This commit is contained in:
f4exb 2019-04-21 01:06:23 +02:00
parent fbb29ba9cd
commit 50d39f856d
8 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -506,6 +506,15 @@ uint32_t LimeSDROutput::getHWLog2Interp() const
return m_deviceShared.m_deviceParams->m_log2OvSRTx; 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) bool LimeSDROutput::handleMessage(const Message& message)
{ {
if (MsgConfigureLimeSDR::match(message)) if (MsgConfigureLimeSDR::match(message))

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

@ -231,6 +231,7 @@ 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;
private: private:
DeviceSinkAPI *m_deviceAPI; DeviceSinkAPI *m_deviceAPI;

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

@ -67,6 +67,17 @@ LimeSDROutputGUI::LimeSDROutputGUI(DeviceUISet *deviceUISet, QWidget* parent) :
ui->channelNumberText->setText(tr("#%1").arg(m_limeSDROutput->getChannelIndex())); 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->hwInterpLabel->setText(QString::fromUtf8("H\u2191"));
ui->swInterpLabel->setText(QString::fromUtf8("S\u2191")); ui->swInterpLabel->setText(QString::fromUtf8("S\u2191"));

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.4"), QString("4.5.5"),
QString("(c) Edouard Griffiths, F4EXB"), QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"), QString("https://github.com/f4exb/sdrangel"),
true, true,

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

@ -538,6 +538,15 @@ uint32_t LimeSDRInput::getHWLog2Decim() const
return m_deviceShared.m_deviceParams->m_log2OvSRRx; 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) bool LimeSDRInput::handleMessage(const Message& message)
{ {
if (MsgConfigureLimeSDR::match(message)) if (MsgConfigureLimeSDR::match(message))

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

@ -251,6 +251,7 @@ 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;
private: private:
DeviceSourceAPI *m_deviceAPI; DeviceSourceAPI *m_deviceAPI;

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

@ -70,6 +70,17 @@ LimeSDRInputGUI::LimeSDRInputGUI(DeviceUISet *deviceUISet, QWidget* parent) :
ui->channelNumberText->setText(tr("#%1").arg(m_limeSDRInput->getChannelIndex())); 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->hwDecimLabel->setText(QString::fromUtf8("H\u2193"));
ui->swDecimLabel->setText(QString::fromUtf8("S\u2193")); ui->swDecimLabel->setText(QString::fromUtf8("S\u2193"));

2
plugins/samplesource/limesdrinput/limesdrinputgui.ui
View File

@ -924,7 +924,7 @@
</size> </size>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Antenna select: No: none, Lo: 700:900M, Hi: 2:2.6G, Wi: wideband, T1: Tx1 LB, T2: Tx2 LB</string> <string>Antenna select: No: none, NC: not connected, Lo: 700:900M, Hi: 2:2.6G, Wi: wideband, T1: Tx1 LB, T2: Tx2 LB</string>
</property> </property>
<item> <item>
<property name="text"> <property name="text">