VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

LimeSDR input: GUI fixes

This commit is contained in:
f4exb 2017-09-05 23:51:03 +02:00
parent 6fa8b4ac87
commit a24236a300
6 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devices/plutosdr/deviceplutosdr.cpp
View File

@ -19,8 +19,8 @@
const uint64_t DevicePlutoSDR::loLowLimitFreq = 70000000UL; // 70 MHz: take AD9364 specs
const uint64_t DevicePlutoSDR::loHighLimitFreq = 6000000000UL; // 6 GHz: take AD9364 specs
const uint32_t DevicePlutoSDR::srLowLimitFreq = 200000; // 200 kS/s
const uint32_t DevicePlutoSDR::srHighLimitFreq = 2000000; // 20 MS/s: take AD9363 speces
const uint32_t DevicePlutoSDR::srLowLimitFreq = 200000; // 200 kS/s
const uint32_t DevicePlutoSDR::srHighLimitFreq = 20000000; // 20 MS/s: take AD9363 speces
const uint32_t DevicePlutoSDR::bbLPRxLowLimitFreq = 200000; // 200 kHz
const uint32_t DevicePlutoSDR::bbLPRxHighLimitFreq = 14000000; // 14 MHz

17
devices/plutosdr/deviceplutosdrbox.cpp
View File

@ -113,6 +113,23 @@ bool DevicePlutoSDRBox::get_param(DeviceType devType, const std::string &param,
char valuestr[256];
int ret;
ssize_t nchars;
iio_device *dev;
switch (devType)
{
case DEVICE_PHY:
dev = m_devPhy;
break;
case DEVICE_RX:
dev = m_devRx;
break;
case DEVICE_TX:
dev = m_devTx;
break;
default:
dev = m_devPhy;
break;
}
ret = iio_device_identify_filename(dev, param.c_str(), &chn, &attr);

2
devices/plutosdr/deviceplutosdrparams.cpp
View File

@ -29,7 +29,7 @@ DevicePlutoSDRParams::~DevicePlutoSDRParams()
bool DevicePlutoSDRParams::open(const std::string& serial)
{
m_box = DevicePlutoSDR::getDeviceFromSerial(serial);
m_box = DevicePlutoSDR::instance().getDeviceFromSerial(serial);
return m_box != 0;
}

2
devices/plutosdr/deviceplutosdrshared.h
View File

@ -17,6 +17,8 @@
#ifndef DEVICES_PLUTOSDR_DEVICEPLUTOSDRSHARED_H_
#define DEVICES_PLUTOSDR_DEVICEPLUTOSDRSHARED_H_
class DevicePlutoSDRParams;
/**
* Structure shared by a buddy with other buddies
*/

9
plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp
View File

@ -36,12 +36,6 @@ PlutoSDRInputGui::PlutoSDRInputGui(DeviceSourceAPI *deviceAPI, QWidget* parent)
m_sampleSource = new PlutoSDRInput(m_deviceAPI);
m_deviceAPI->setSource(m_sampleSource);
float minF, maxF, stepF;
// TODO: call device core to get values
minF = 100000;
maxF = 4000000;
stepF = 1000;
ui->setupUi(this);
ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
ui->centerFrequency->setValueRange(7, DevicePlutoSDR::loLowLimitFreq/1000, DevicePlutoSDR::loHighLimitFreq/1000);
@ -55,6 +49,9 @@ PlutoSDRInputGui::PlutoSDRInputGui(DeviceSourceAPI *deviceAPI, QWidget* parent)
ui->lpFIR->setColorMapper(ColorMapper(ColorMapper::GrayYellow));
ui->lpFIR->setValueRange(5, 1U, 56000U); // will be dynamically recalculated
ui->hwDecimLabel->setText(QString::fromUtf8("H\u2193"));
ui->swDecimLabel->setText(QString::fromUtf8("S\u2193"));
connect(&m_updateTimer, SIGNAL(timeout()), this, SLOT(updateHardware()));
connect(&m_statusTimer, SIGNAL(timeout()), this, SLOT(updateStatus()));
m_statusTimer.start(500);

8
plugins/samplesource/plutosdrinput/plutosdrinputgui.ui
View File

@ -548,7 +548,6 @@
<property name="toolTip">
<string>Analog lowpass filer bandwidth (kHz)</string>
</property>
<zorder>lpfUnits</zorder>
</widget>
</item>
<item>
@ -928,6 +927,13 @@
</property>
</widget>
</item>
<item>
<widget class="Line" name="line_5">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="temperatureText">
<property name="minimumSize">