VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-18 21:58:37 -04:00
Code Issues Projects Releases Wiki Activity

Web API: created run state getter. Implemented in RTLSDR

Browse Source
This commit is contained in:
f4exb
2017-12-09 10:49:20 +01:00
parent a27ce7ea89
commit 7d122b6b67
17 changed files with 1300 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesource/rtlsdr/rtlsdrgui.cpp
+16 -4
View File
@@ -34,6 +34,7 @@ RTLSDRGui::RTLSDRGui(DeviceUISet *deviceUISet, QWidget* parent) :
QWidget(parent),
ui(new Ui::RTLSDRGui),
m_deviceUISet(deviceUISet),
m_doApplySettings(true),
m_forceSettings(true),
m_settings(),
m_sampleSource(0),
@@ -142,7 +143,10 @@ bool RTLSDRGui::handleMessage(const Message& message)
{
const RTLSDRInput::MsgConfigureRTLSDR& cfg = (RTLSDRInput::MsgConfigureRTLSDR&) message;
m_settings = cfg.getSettings();
blockApplySettings(true);
displayGains();
displaySettings();
blockApplySettings(false);
return true;
}
else
@@ -355,10 +359,13 @@ void RTLSDRGui::on_transverter_clicked()
void RTLSDRGui::updateHardware()
{
RTLSDRInput::MsgConfigureRTLSDR* message = RTLSDRInput::MsgConfigureRTLSDR::create(m_settings, m_forceSettings);
m_sampleSource->getInputMessageQueue()->push(message);
m_forceSettings = false;
m_updateTimer.stop();
if (m_doApplySettings)
{
RTLSDRInput::MsgConfigureRTLSDR* message = RTLSDRInput::MsgConfigureRTLSDR::create(m_settings, m_forceSettings);
m_sampleSource->getInputMessageQueue()->push(message);
m_forceSettings = false;
m_updateTimer.stop();
}
}
void RTLSDRGui::updateStatus()
@@ -390,6 +397,11 @@ void RTLSDRGui::updateStatus()
}
}
void RTLSDRGui::blockApplySettings(bool block)
{
m_doApplySettings = !block;
}
void RTLSDRGui::on_checkBox_stateChanged(int state)
{
if (state == Qt::Checked)
plugins/samplesource/rtlsdr/rtlsdrgui.h
+2
View File
@@ -55,6 +55,7 @@ private:
Ui::RTLSDRGui* ui;
DeviceUISet* m_deviceUISet;
bool m_doApplySettings;
bool m_forceSettings;
RTLSDRSettings m_settings;
QTimer m_updateTimer;
@@ -71,6 +72,7 @@ private:
void sendSettings();
void updateSampleRateAndFrequency();
void updateFrequencyLimits();
void blockApplySettings(bool block);
private slots:
void handleInputMessages();
plugins/samplesource/rtlsdr/rtlsdrinput.cpp
+17 -7
View File
@@ -314,16 +314,14 @@ bool RTLSDRInput::applySettings(const RTLSDRSettings& settings, bool force)
}
}
if ((m_settings.m_dcBlock != settings.m_dcBlock) || force)
if ((m_settings.m_dcBlock != settings.m_dcBlock) || (m_settings.m_iqImbalance != settings.m_iqImbalance) || force)
{
m_settings.m_dcBlock = settings.m_dcBlock;
m_deviceAPI->configureCorrections(m_settings.m_dcBlock, m_settings.m_iqImbalance);
}
if ((m_settings.m_iqImbalance != settings.m_iqImbalance) || force)
{
m_settings.m_iqImbalance = settings.m_iqImbalance;
m_deviceAPI->configureCorrections(m_settings.m_dcBlock, m_settings.m_iqImbalance);
qDebug("RTLSDRInput::applySettings: corrections: DC block: %s IQ imbalance: %s",
m_settings.m_dcBlock ? "true" : "false",
m_settings.m_iqImbalance ? "true" : "false");
}
if ((m_settings.m_loPpmCorrection != settings.m_loPpmCorrection) || force)
@@ -370,6 +368,8 @@ bool RTLSDRInput::applySettings(const RTLSDRSettings& settings, bool force)
{
m_rtlSDRThread->setLog2Decimation(settings.m_log2Decim);
}
qDebug("RTLSDRInput::applySettings: log2decim set to %d", m_settings.m_log2Decim);
}
if (force || (m_settings.m_centerFrequency != settings.m_centerFrequency)
@@ -430,13 +430,15 @@ bool RTLSDRInput::applySettings(const RTLSDRSettings& settings, bool force)
if (m_rtlSDRThread != 0)
{
m_rtlSDRThread->setFcPos((int) m_settings.m_fcPos);
qDebug() << "RTLSDRInput: set fc pos (enum) to " << (int) m_settings.m_fcPos;
}
qDebug() << "RTLSDRInput: set fc pos (enum) to " << (int) m_settings.m_fcPos;
}
if ((m_settings.m_noModMode != settings.m_noModMode) || force)
{
m_settings.m_noModMode = settings.m_noModMode;
qDebug() << "RTLSDRInput: set noModMode to " << m_settings.m_noModMode;
// Direct Modes: 0: off, 1: I, 2: Q, 3: NoMod.
if (m_settings.m_noModMode) {
@@ -526,6 +528,14 @@ int RTLSDRInput::webapiSettingsPutPatch(
return 200;
}
int RTLSDRInput::webapiRunGet(
SWGSDRangel::SWGDeviceState& response,
QString& errorMessage __attribute__((unused)))
{
m_deviceAPI->getDeviceEngineStateStr(*response.getState());
return 200;
}
int RTLSDRInput::webapiRun(
bool run,
SWGSDRangel::SWGDeviceState& response,
plugins/samplesource/rtlsdr/rtlsdrinput.h
+4
View File
@@ -115,6 +115,10 @@ public:
SWGSDRangel::SWGDeviceSettings& response, // query + response
QString& errorMessage);
virtual int webapiRunGet(
SWGSDRangel::SWGDeviceState& response,
QString& errorMessage);
virtual int webapiRun(
bool run,
SWGSDRangel::SWGDeviceState& response,