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

REST API: config: GET (11). Support of the rest of devices

Browse Source
This commit is contained in:
f4exb
2019-08-04 20:24:44 +02:00
parent 16e9684118
commit a078239685
205 changed files with 3843 additions and 494 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesource/hackrfinput/CMakeLists.txt
+2
View File
@@ -4,6 +4,7 @@ set(hackrfinput_SOURCES
hackrfinput.cpp
hackrfinputplugin.cpp
hackrfinputsettings.cpp
hackrfinputwebapiadapter.cpp
hackrfinputthread.cpp
)
@@ -11,6 +12,7 @@ set(hackrfinput_HEADERS
hackrfinput.h
hackrfinputplugin.h
hackrfinputsettings.h
hackrfinputwebapiadapter.h
hackrfinputthread.h
)
plugins/samplesource/hackrfinput/hackrfinput.cpp
+19 -12
View File
@@ -602,7 +602,26 @@ int HackRFInput::webapiSettingsPutPatch(
{
(void) errorMessage;
HackRFInputSettings settings = m_settings;
webapiUpdateDeviceSettings(settings, deviceSettingsKeys, response);
MsgConfigureHackRF *msg = MsgConfigureHackRF::create(settings, force);
m_inputMessageQueue.push(msg);
if (m_guiMessageQueue) // forward to GUI if any
{
MsgConfigureHackRF *msgToGUI = MsgConfigureHackRF::create(settings, force);
m_guiMessageQueue->push(msgToGUI);
}
webapiFormatDeviceSettings(response, settings);
return 200;
}
void HackRFInput::webapiUpdateDeviceSettings(
HackRFInputSettings& settings,
const QStringList& deviceSettingsKeys,
SWGSDRangel::SWGDeviceSettings& response)
{
if (deviceSettingsKeys.contains("centerFrequency")) {
settings.m_centerFrequency = response.getHackRfInputSettings()->getCenterFrequency();
}
@@ -657,18 +676,6 @@ int HackRFInput::webapiSettingsPutPatch(
if (deviceSettingsKeys.contains("reverseAPIDeviceIndex")) {
settings.m_reverseAPIDeviceIndex = response.getHackRfInputSettings()->getReverseApiDeviceIndex();
}
MsgConfigureHackRF *msg = MsgConfigureHackRF::create(settings, force);
m_inputMessageQueue.push(msg);
if (m_guiMessageQueue) // forward to GUI if any
{
MsgConfigureHackRF *msgToGUI = MsgConfigureHackRF::create(settings, force);
m_guiMessageQueue->push(msgToGUI);
}
webapiFormatDeviceSettings(response, settings);
return 200;
}
void HackRFInput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& response, const HackRFInputSettings& settings)
plugins/samplesource/hackrfinput/hackrfinput.h
+8 -1
View File
@@ -155,6 +155,14 @@ public:
SWGSDRangel::SWGDeviceState& response,
QString& errorMessage);
static void webapiFormatDeviceSettings(
SWGSDRangel::SWGDeviceSettings& response,
const HackRFInputSettings& settings);
static void webapiUpdateDeviceSettings(
HackRFInputSettings& settings,
const QStringList& deviceSettingsKeys,
SWGSDRangel::SWGDeviceSettings& response);
private:
DeviceAPI *m_deviceAPI;
@@ -173,7 +181,6 @@ private:
void closeDevice();
bool applySettings(const HackRFInputSettings& settings, bool force);
void setDeviceCenterFrequency(quint64 freq, qint32 LOppmTenths);
void webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& response, const HackRFInputSettings& settings);
void webapiReverseSendSettings(QList<QString>& deviceSettingsKeys, const HackRFInputSettings& settings, bool force);
void webapiReverseSendStartStop(bool start);
plugins/samplesource/hackrfinput/hackrfinputplugin.cpp
+7 -1
View File
@@ -28,10 +28,11 @@
#include "hackrfinputgui.h"
#endif
#include "hackrfinputplugin.h"
#include "hackrfinputwebapiadapter.h"
const PluginDescriptor HackRFInputPlugin::m_pluginDescriptor = {
QString("HackRF Input"),
QString("4.5.4"),
QString("4.11.6"),
QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"),
true,
@@ -165,3 +166,8 @@ DeviceSampleSource *HackRFInputPlugin::createSampleSourcePluginInstance(const QS
return 0;
}
}
DeviceWebAPIAdapter *HackRFInputPlugin::createDeviceWebAPIAdapter() const
{
return new HackRFInputWebAPIAdapter();
}
plugins/samplesource/hackrfinput/hackrfinputplugin.h
+1
View File
@@ -42,6 +42,7 @@ public:
QWidget **widget,
DeviceUISet *deviceUISet);
virtual DeviceSampleSource* createSampleSourcePluginInstance(const QString& sourceId, DeviceAPI *deviceAPI);
virtual DeviceWebAPIAdapter* createDeviceWebAPIAdapter() const;
static const QString m_hardwareID;
static const QString m_deviceTypeID;
plugins/samplesource/hackrfinput/hackrfinputwebapiadapter.cpp
+51
View File
@@ -0,0 +1,51 @@
///////////////////////////////////////////////////////////////////////////////////
// Copyright (C) 2019 Edouard Griffiths, F4EXB //
// //
// Implementation of static web API adapters used for preset serialization and //
// deserialization //
// //
// This program is free software; you can redistribute it and/or modify //
// it under the terms of the GNU General Public License as published by //
// the Free Software Foundation as version 3 of the License, or //
// (at your option) any later version. //
// //
// This program is distributed in the hope that it will be useful, //
// but WITHOUT ANY WARRANTY; without even the implied warranty of //
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
// GNU General Public License V3 for more details. //
// //
// You should have received a copy of the GNU General Public License //
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
///////////////////////////////////////////////////////////////////////////////////
#include "SWGDeviceSettings.h"
#include "hackrfinput.h"
#include "hackrfinputwebapiadapter.h"
HackRFInputWebAPIAdapter::HackRFInputWebAPIAdapter()
{}
HackRFInputWebAPIAdapter::~HackRFInputWebAPIAdapter()
{}
int HackRFInputWebAPIAdapter::webapiSettingsGet(
SWGSDRangel::SWGDeviceSettings& response,
QString& errorMessage)
{
(void) errorMessage;
response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
response.getAirspyHfSettings()->init();
HackRFInput::webapiFormatDeviceSettings(response, m_settings);
return 200;
}
int HackRFInputWebAPIAdapter::webapiSettingsPutPatch(
bool force,
const QStringList& deviceSettingsKeys,
SWGSDRangel::SWGDeviceSettings& response, // query + response
QString& errorMessage)
{
(void) errorMessage;
HackRFInput::webapiUpdateDeviceSettings(m_settings, deviceSettingsKeys, response);
return 200;
}
plugins/samplesource/hackrfinput/hackrfinputwebapiadapter.h
+44
View File
@@ -0,0 +1,44 @@
///////////////////////////////////////////////////////////////////////////////////
// Copyright (C) 2019 Edouard Griffiths, F4EXB //
// //
// Implementation of static web API adapters used for preset serialization and //
// deserialization //
// //
// This program is free software; you can redistribute it and/or modify //
// it under the terms of the GNU General Public License as published by //
// the Free Software Foundation as version 3 of the License, or //
// (at your option) any later version. //
// //
// This program is distributed in the hope that it will be useful, //
// but WITHOUT ANY WARRANTY; without even the implied warranty of //
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
// GNU General Public License V3 for more details. //
// //
// You should have received a copy of the GNU General Public License //
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
///////////////////////////////////////////////////////////////////////////////////
#include "device/devicewebapiadapter.h"
#include "hackrfinputsettings.h"
class HackRFInputWebAPIAdapter : public DeviceWebAPIAdapter
{
public:
HackRFInputWebAPIAdapter();
virtual ~HackRFInputWebAPIAdapter();
virtual QByteArray serialize() { return m_settings.serialize(); }
virtual bool deserialize(const QByteArray& data) { return m_settings.deserialize(data); }
virtual int webapiSettingsGet(
SWGSDRangel::SWGDeviceSettings& response,
QString& errorMessage);
virtual int webapiSettingsPutPatch(
bool force,
const QStringList& deviceSettingsKeys,
SWGSDRangel::SWGDeviceSettings& response, // query + response
QString& errorMessage);
private:
HackRFInputSettings m_settings;
};