mirror of
https://github.com/f4exb/sdrangel.git
synced 2024-09-28 15:56:33 -04:00
LimeSDR input: GUI fixes
This commit is contained in:
parent
6fa8b4ac87
commit
a24236a300
@ -19,8 +19,8 @@
|
|||||||
const uint64_t DevicePlutoSDR::loLowLimitFreq = 70000000UL; // 70 MHz: take AD9364 specs
|
const uint64_t DevicePlutoSDR::loLowLimitFreq = 70000000UL; // 70 MHz: take AD9364 specs
|
||||||
const uint64_t DevicePlutoSDR::loHighLimitFreq = 6000000000UL; // 6 GHz: 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::srLowLimitFreq = 200000; // 200 kS/s
|
||||||
const uint32_t DevicePlutoSDR::srHighLimitFreq = 2000000; // 20 MS/s: take AD9363 speces
|
const uint32_t DevicePlutoSDR::srHighLimitFreq = 20000000; // 20 MS/s: take AD9363 speces
|
||||||
|
|
||||||
const uint32_t DevicePlutoSDR::bbLPRxLowLimitFreq = 200000; // 200 kHz
|
const uint32_t DevicePlutoSDR::bbLPRxLowLimitFreq = 200000; // 200 kHz
|
||||||
const uint32_t DevicePlutoSDR::bbLPRxHighLimitFreq = 14000000; // 14 MHz
|
const uint32_t DevicePlutoSDR::bbLPRxHighLimitFreq = 14000000; // 14 MHz
|
||||||
|
@ -113,6 +113,23 @@ bool DevicePlutoSDRBox::get_param(DeviceType devType, const std::string ¶m,
|
|||||||
char valuestr[256];
|
char valuestr[256];
|
||||||
int ret;
|
int ret;
|
||||||
ssize_t nchars;
|
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);
|
ret = iio_device_identify_filename(dev, param.c_str(), &chn, &attr);
|
||||||
|
|
||||||
|
@ -29,7 +29,7 @@ DevicePlutoSDRParams::~DevicePlutoSDRParams()
|
|||||||
|
|
||||||
bool DevicePlutoSDRParams::open(const std::string& serial)
|
bool DevicePlutoSDRParams::open(const std::string& serial)
|
||||||
{
|
{
|
||||||
m_box = DevicePlutoSDR::getDeviceFromSerial(serial);
|
m_box = DevicePlutoSDR::instance().getDeviceFromSerial(serial);
|
||||||
return m_box != 0;
|
return m_box != 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -17,6 +17,8 @@
|
|||||||
#ifndef DEVICES_PLUTOSDR_DEVICEPLUTOSDRSHARED_H_
|
#ifndef DEVICES_PLUTOSDR_DEVICEPLUTOSDRSHARED_H_
|
||||||
#define DEVICES_PLUTOSDR_DEVICEPLUTOSDRSHARED_H_
|
#define DEVICES_PLUTOSDR_DEVICEPLUTOSDRSHARED_H_
|
||||||
|
|
||||||
|
class DevicePlutoSDRParams;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Structure shared by a buddy with other buddies
|
* Structure shared by a buddy with other buddies
|
||||||
*/
|
*/
|
||||||
|
@ -36,12 +36,6 @@ PlutoSDRInputGui::PlutoSDRInputGui(DeviceSourceAPI *deviceAPI, QWidget* parent)
|
|||||||
m_sampleSource = new PlutoSDRInput(m_deviceAPI);
|
m_sampleSource = new PlutoSDRInput(m_deviceAPI);
|
||||||
m_deviceAPI->setSource(m_sampleSource);
|
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->setupUi(this);
|
||||||
ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
|
ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
|
||||||
ui->centerFrequency->setValueRange(7, DevicePlutoSDR::loLowLimitFreq/1000, DevicePlutoSDR::loHighLimitFreq/1000);
|
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->setColorMapper(ColorMapper(ColorMapper::GrayYellow));
|
||||||
ui->lpFIR->setValueRange(5, 1U, 56000U); // will be dynamically recalculated
|
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_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);
|
||||||
|
@ -548,7 +548,6 @@
|
|||||||
<property name="toolTip">
|
<property name="toolTip">
|
||||||
<string>Analog lowpass filer bandwidth (kHz)</string>
|
<string>Analog lowpass filer bandwidth (kHz)</string>
|
||||||
</property>
|
</property>
|
||||||
<zorder>lpfUnits</zorder>
|
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
@ -928,6 +927,13 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="Line" name="line_5">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Vertical</enum>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="temperatureText">
|
<widget class="QLabel" name="temperatureText">
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
|
Loading…
Reference in New Issue
Block a user