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

Fix cut and paste errors from PTT feature

Browse Source
This commit is contained in:
Jon Beniston 2021-01-15 11:00:03 +00:00
parent 7f6eee6a10
commit 2c32224977
14 changed files with 18 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/feature/afc/afcworker.h
View File

@ -174,4 +174,4 @@ private slots:
void handleInputMessages(); void handleInputMessages();
}; };
#endif // INCLUDE_FEATURE_SIMPLEPTTWORKER_H_ #endif // INCLUDE_FEATURE_AFCWORKER_H_

4
plugins/feature/aprs/aprswebapiadapter.cpp
View File

@ -31,8 +31,8 @@ int APRSWebAPIAdapter::webapiSettingsGet(
QString& errorMessage) QString& errorMessage)
{ {
(void) errorMessage; (void) errorMessage;
response.setSimplePttSettings(new SWGSDRangel::SWGSimplePTTSettings()); response.setAprsSettings(new SWGSDRangel::SWGAPRSSettings());
response.getSimplePttSettings()->init(); response.getAprsSettings()->init();
APRS::webapiFormatFeatureSettings(response, m_settings); APRS::webapiFormatFeatureSettings(response, m_settings);
return 200; return 200;

4
plugins/feature/gs232controller/gs232controllerwebapiadapter.cpp
View File

@ -31,8 +31,8 @@ int GS232ControllerWebAPIAdapter::webapiSettingsGet(
QString& errorMessage) QString& errorMessage)
{ {
(void) errorMessage; (void) errorMessage;
response.setSimplePttSettings(new SWGSDRangel::SWGSimplePTTSettings()); response.setGs232ControllerSettings(new SWGSDRangel::SWGGS232ControllerSettings());
response.getSimplePttSettings()->init(); response.getGs232ControllerSettings()->init();
GS232Controller::webapiFormatFeatureSettings(response, m_settings); GS232Controller::webapiFormatFeatureSettings(response, m_settings);
return 200; return 200;

4
plugins/feature/map/mapwebapiadapter.cpp
View File

@ -31,8 +31,8 @@ int MapWebAPIAdapter::webapiSettingsGet(
QString& errorMessage) QString& errorMessage)
{ {
(void) errorMessage; (void) errorMessage;
response.setSimplePttSettings(new SWGSDRangel::SWGSimplePTTSettings()); response.setMapSettings(new SWGSDRangel::SWGMapSettings());
response.getSimplePttSettings()->init(); response.getMapSettings()->init();
Map::webapiFormatFeatureSettings(response, m_settings); Map::webapiFormatFeatureSettings(response, m_settings);
return 200; return 200;

4
plugins/feature/rigctlserver/rigctlserver.cpp
View File

@ -24,7 +24,6 @@
#include "SWGFeatureSettings.h" #include "SWGFeatureSettings.h"
#include "SWGFeatureReport.h" #include "SWGFeatureReport.h"
#include "SWGFeatureActions.h" #include "SWGFeatureActions.h"
#include "SWGSimplePTTReport.h"
#include "SWGDeviceState.h" #include "SWGDeviceState.h"
#include "dsp/dspengine.h" #include "dsp/dspengine.h"
@ -39,8 +38,7 @@ const char* const RigCtlServer::m_featureIdURI = "sdrangel.feature.rigctlserver"
const char* const RigCtlServer::m_featureId = "RigCtlServer"; const char* const RigCtlServer::m_featureId = "RigCtlServer";
RigCtlServer::RigCtlServer(WebAPIAdapterInterface *webAPIAdapterInterface) : RigCtlServer::RigCtlServer(WebAPIAdapterInterface *webAPIAdapterInterface) :
Feature(m_featureIdURI, webAPIAdapterInterface), Feature(m_featureIdURI, webAPIAdapterInterface)
m_ptt(false)
{ {
qDebug("RigCtlServer::RigCtlServer: webAPIAdapterInterface: %p", webAPIAdapterInterface); qDebug("RigCtlServer::RigCtlServer: webAPIAdapterInterface: %p", webAPIAdapterInterface);
setObjectName(m_featureId); setObjectName(m_featureId);

1
plugins/feature/rigctlserver/rigctlserver.h
View File

@ -122,7 +122,6 @@ private:
QThread m_thread; QThread m_thread;
RigCtlServerWorker *m_worker; RigCtlServerWorker *m_worker;
RigCtlServerSettings m_settings; RigCtlServerSettings m_settings;
bool m_ptt;
QNetworkAccessManager *m_networkManager; QNetworkAccessManager *m_networkManager;
QNetworkRequest m_networkRequest; QNetworkRequest m_networkRequest;

4
plugins/feature/rigctlserver/rigctlserverwebapiadapter.cpp
View File

@ -31,8 +31,8 @@ int RigCtlServerWebAPIAdapter::webapiSettingsGet(
QString& errorMessage) QString& errorMessage)
{ {
(void) errorMessage; (void) errorMessage;
response.setSimplePttSettings(new SWGSDRangel::SWGSimplePTTSettings()); response.setRigCtlServerSettings(new SWGSDRangel::SWGRigCtlServerSettings());
response.getSimplePttSettings()->init(); response.getRigCtlServerSettings()->init();
RigCtlServer::webapiFormatFeatureSettings(response, m_settings); RigCtlServer::webapiFormatFeatureSettings(response, m_settings);
return 200; return 200;

4
plugins/feature/startracker/startracker.cpp
View File

@ -24,7 +24,6 @@
#include "SWGFeatureSettings.h" #include "SWGFeatureSettings.h"
#include "SWGFeatureReport.h" #include "SWGFeatureReport.h"
#include "SWGFeatureActions.h" #include "SWGFeatureActions.h"
#include "SWGSimplePTTReport.h"
#include "SWGDeviceState.h" #include "SWGDeviceState.h"
#include "dsp/dspengine.h" #include "dsp/dspengine.h"
@ -39,8 +38,7 @@ const char* const StarTracker::m_featureIdURI = "sdrangel.feature.startracker";
const char* const StarTracker::m_featureId = "StarTracker"; const char* const StarTracker::m_featureId = "StarTracker";
StarTracker::StarTracker(WebAPIAdapterInterface *webAPIAdapterInterface) : StarTracker::StarTracker(WebAPIAdapterInterface *webAPIAdapterInterface) :
Feature(m_featureIdURI, webAPIAdapterInterface), Feature(m_featureIdURI, webAPIAdapterInterface)
m_ptt(false)
{ {
qDebug("StarTracker::StarTracker: webAPIAdapterInterface: %p", webAPIAdapterInterface); qDebug("StarTracker::StarTracker: webAPIAdapterInterface: %p", webAPIAdapterInterface);
setObjectName(m_featureId); setObjectName(m_featureId);

1
plugins/feature/startracker/startracker.h
View File

@ -122,7 +122,6 @@ private:
QThread m_thread; QThread m_thread;
StarTrackerWorker *m_worker; StarTrackerWorker *m_worker;
StarTrackerSettings m_settings; StarTrackerSettings m_settings;
bool m_ptt;
QNetworkAccessManager *m_networkManager; QNetworkAccessManager *m_networkManager;
QNetworkRequest m_networkRequest; QNetworkRequest m_networkRequest;

4
plugins/feature/startracker/startrackerwebapiadapter.cpp
View File

@ -31,8 +31,8 @@ int StarTrackerWebAPIAdapter::webapiSettingsGet(
QString& errorMessage) QString& errorMessage)
{ {
(void) errorMessage; (void) errorMessage;
response.setSimplePttSettings(new SWGSDRangel::SWGSimplePTTSettings()); response.setStarTrackerSettings(new SWGSDRangel::SWGStarTrackerSettings());
response.getSimplePttSettings()->init(); response.getStarTrackerSettings()->init();
StarTracker::webapiFormatFeatureSettings(response, m_settings); StarTracker::webapiFormatFeatureSettings(response, m_settings);
return 200; return 200;

2
plugins/feature/startracker/startrackerworker.h
View File

@ -90,8 +90,6 @@ private:
void applySettings(const StarTrackerSettings& settings, bool force = false); void applySettings(const StarTrackerSettings& settings, bool force = false);
void restartServer(bool enabled, uint32_t port); void restartServer(bool enabled, uint32_t port);
MessageQueue *getMessageQueueToGUI() { return m_msgQueueToGUI; } MessageQueue *getMessageQueueToGUI() { return m_msgQueueToGUI; }
void setAzimuth(int azimuth);
void setAzimuthElevation(int azimuth, int elevation);
void updateRaDec(RADec rd, QDateTime dt); void updateRaDec(RADec rd, QDateTime dt);
void writeStellariumTarget(double ra, double dec); void writeStellariumTarget(double ra, double dec);
void removeFromMap(QString id); void removeFromMap(QString id);

5
plugins/feature/vorlocalizer/vorlocalizer.cpp
View File

@ -23,7 +23,6 @@
#include "SWGFeatureSettings.h" #include "SWGFeatureSettings.h"
#include "SWGFeatureReport.h" #include "SWGFeatureReport.h"
#include "SWGFeatureActions.h" #include "SWGFeatureActions.h"
#include "SWGSimplePTTReport.h"
#include "SWGDeviceState.h" #include "SWGDeviceState.h"
#include "SWGChannelReport.h" #include "SWGChannelReport.h"
@ -415,8 +414,8 @@ int VORLocalizer::webapiSettingsGet(
QString& errorMessage) QString& errorMessage)
{ {
(void) errorMessage; (void) errorMessage;
response.setSimplePttSettings(new SWGSDRangel::SWGSimplePTTSettings()); response.setVorLocalizerSettings(new SWGSDRangel::SWGVORLocalizerSettings());
response.getSimplePttSettings()->init(); response.getVorLocalizerSettings()->init();
webapiFormatFeatureSettings(response, m_settings); webapiFormatFeatureSettings(response, m_settings);
return 200; return 200;
} }

1
plugins/feature/vorlocalizer/vorlocalizerplugin.cpp
View File

@ -51,7 +51,6 @@ void VORLocalizerPlugin::initPlugin(PluginAPI* pluginAPI)
{ {
m_pluginAPI = pluginAPI; m_pluginAPI = pluginAPI;
// register Simple PTT feature
m_pluginAPI->registerFeature(VORLocalizer::m_featureIdURI, VORLocalizer::m_featureId, this); m_pluginAPI->registerFeature(VORLocalizer::m_featureIdURI, VORLocalizer::m_featureId, this);
} }

6
plugins/feature/vorlocalizer/vorlocalizerplugin.h
View File

@ -15,8 +15,8 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. // // along with this program. If not, see <http://www.gnu.org/licenses/>. //
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
#ifndef INCLUDE_FEATURE_SIMPLEPTTPLUGIN_H #ifndef INCLUDE_FEATURE_VORLOCALIZERPLUGIN_H
#define INCLUDE_FEATURE_SIMPLEPTTPLUGIN_H #define INCLUDE_FEATURE_VORLOCALIZERPLUGIN_H
#include <QObject> #include <QObject>
#include "plugin/plugininterface.h" #include "plugin/plugininterface.h"
@ -45,4 +45,4 @@ private:
PluginAPI* m_pluginAPI; PluginAPI* m_pluginAPI;
}; };
#endif // INCLUDE_FEATURE_SIMPLEPTTPLUGIN_H #endif // INCLUDE_FEATURE_VORLOCALIZERPLUGIN_H