Skip to content

Q
qgroundcontrol
Commit 605c285e authored by Gus Grubba's avatar Gus Grubba
Browse files
Options

Replace overly redundant code with macros for settings.

parent fa8172e7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 348 additions and 1125 deletions
src/Airmap/AirMapSettings.cc
View file @ 605c285e
......@@ -13,18 +13,10 @@
#include <QQmlEngine>
#include <QtQml>
DECLARE_SETTINGGROUP(AirMap)
DECLARE_SETTINGGROUP(AirMap, "AirMap")
{
INIT_SETTINGFACT(usePersonalApiKey);
INIT_SETTINGFACT(apiKey);
INIT_SETTINGFACT(clientID);
INIT_SETTINGFACT(userName);
INIT_SETTINGFACT(password);
INIT_SETTINGFACT(enableAirMap);
INIT_SETTINGFACT(enableAirspace);
INIT_SETTINGFACT(enableTelemetry);
QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership);
qmlRegisterUncreatableType<AirMapSettings>("QGroundControl.SettingsManager", 1, 0, "AirMapSettings", "Reference only");
QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership); \
qmlRegisterUncreatableType<AirMapSettings>("QGroundControl.SettingsManager", 1, 0, "AirMapSettings", "Reference only"); \
}
DECLARE_SETTINGSFACT(AirMapSettings, usePersonalApiKey)
......
src/Airmap/AirMapSettings.h
View file @ 605c285e
......@@ -17,7 +17,7 @@ class AirMapSettings : public SettingsGroup
public:
AirMapSettings(QObject* parent = nullptr);
DEFINE_SETTINGGROUP(AirMap)
DEFINE_SETTING_NAME_GROUP()
DEFINE_SETTINGFACT(usePersonalApiKey)
DEFINE_SETTINGFACT(apiKey)
......
src/QGCConfig.h
View file @ 605c285e
......@@ -10,6 +10,6 @@
// If you need to make an incompatible changes to stored settings, bump this version number
// up by 1. This will caused store settings to be cleared on next boot.
#define QGC_SETTINGS_VERSION 7
#define QGC_SETTINGS_VERSION 8
#endif // QGC_CONFIGURATION_H
src/QmlControls/AppMessages.qml
View file @ 605c285e
......@@ -161,7 +161,7 @@ QGCView {
anchors.baseline: gstCombo.baseline
anchors.right: gstCombo.left
anchors.rightMargin: ScreenTools.defaultFontPixelWidth
text: "gstreamer debug level:"
text: qsTr("GStreamer Debug Level:")
}
FactComboBox {
......@@ -171,7 +171,7 @@ QGCView {
anchors.bottom: parent.bottom
width: ScreenTools.defaultFontPixelWidth*20
model: ["disabled", "1", "2", "3", "4", "5", "6", "7", "8"]
fact: QGroundControl.settingsManager.appSettings.gstDebug
fact: QGroundControl.settingsManager.appSettings.gstDebugLevel
}
BusyIndicator {
......
src/Settings/App.SettingsGroup.json
View file @ 605c285e
[
{
"name": "OfflineEditingFirmwareType",
"name": "offlineEditingFirmwareType",
"shortDescription": "Offline editing firmware type",
"type": "uint32",
"enumStrings": "ArduPilot,PX4 Pro,Mavlink Generic",
......@@ -8,7 +8,7 @@
"defaultValue": 12
},
{
"name": "OfflineEditingVehicleType",
"name": "offlineEditingVehicleType",
"shortDescription": "Offline editing vehicle type",
"type": "uint32",
"enumStrings": "Fixed Wing,Multi-Rotor,VTOL,Rover,Sub",
......@@ -16,7 +16,7 @@
"defaultValue": 2
},
{
"name": "OfflineEditingCruiseSpeed",
"name": "offlineEditingCruiseSpeed",
"shortDescription": "Offline editing cruise speed",
"longDescription": "This value defines the default cruising speed for forward flight vehicles for use in calculating mission statistics. It does not modify the flight speed for a specific flight plan.",
"type": "double",
......@@ -26,7 +26,7 @@
"decimalPlaces": 2
},
{
"name": "OfflineEditingHoverSpeed",
"name": "offlineEditingHoverSpeed",
"shortDescription": "Offline editing hover speed",
"longDescription": "This value defines the default cruising speed for multi-rotor vehicles for use in calculating mission statistics. It does not modify the flight speed for a specific flight plan.",
"type": "double",
......@@ -36,7 +36,7 @@
"decimalPlaces": 2
},
{
"name": "OfflineEditingAscentSpeed",
"name": "offlineEditingAscentSpeed",
"shortDescription": "Offline editing ascent speed",
"longDescription": "This value defines the ascent speed for multi-rotor vehicles for use in calculating mission duration.",
"type": "double",
......@@ -46,7 +46,7 @@
"decimalPlaces": 2
},
{
"name": "OfflineEditingDescentSpeed",
"name": "offlineEditingDescentSpeed",
"shortDescription": "Offline editing descent speed",
"longDescription": "This value defines the cruising speed for multi-rotor vehicles for use in calculating mission duration.",
"type": "double",
......@@ -66,7 +66,7 @@
"max": 100
},
{
"name": "DefaultMissionItemAltitude",
"name": "defaultMissionItemAltitude",
"shortDescription": "Default value for altitude",
"longDescription": "This value specifies the default altitude for new items added to a mission.",
"type": "double",
......@@ -76,56 +76,56 @@
"decimalPlaces": 1
},
{
"name": "PromptFLightDataSave",
"name": "telemetrySave",
"shortDescription": "Save telemetry Log after each flight",
"longDescription": "If this option is enabled a telemetry will be saved after each flight completes.",
"type": "bool",
"defaultValue": true
},
{
"name": "PromptFLightDataSaveNotArmed",
"name": "telemetrySaveNotArmed",
"shortDescription": "Save telemetry log even if vehicle was not armed",
"longDescription": "If this option is enabled a telemtry log will be saved even if vehicle was never armed.",
"type": "bool",
"defaultValue": false
},
{
"name": "AudioMuted",
"name": "audioMuted",
"shortDescription": "Mute audio output",
"longDescription": "If this option is enabled all audio output will be muted.",
"type": "bool",
"defaultValue": false
},
{
"name": "VirtualTabletJoystick",
"name": "virtualJoystick",
"shortDescription": "Show virtual joystick",
"longDescription": "If this option is enabled the virtual joystick will be shown on the Fly view.",
"type": "bool",
"defaultValue": false
},
{
"name": "GstreamerDebugLevel",
"name": "gstDebugLevel",
"shortDescription": "Video streaming debug",
"longDescription": "Sets the environment variable GST_DEBUG for all pipeline elements on boot.",
"type": "uint8",
"defaultValue": 0
},
{
"name": "AutoLoadMissions",
"name": "autoLoadMissions",
"shortDescription": "AutoLoad mission on vehicle connect",
"longDescription": "Automatically load a mission file named AutoLoad#.mission when a vehicle with id # connects.",
"type": "bool",
"defaultValue": false
},
{
"name": "UseChecklist",
"name": "useChecklist",
"shortDescription": "Use preflight checklist",
"longDescription": "If this option is enabled the preflight checklist will be used.",
"type": "bool",
"defaultValue": false
},
{
"name": "BaseDeviceFontPointSize",
"name": "appFontPointSize",
"shortDescription": "Application font size",
"longDescription": "The point size for the default font used.",
"type": "uint32",
......@@ -136,7 +136,7 @@
"qgcRebootRequired": true
},
{
"name": "StyleIsDark",
"name": "indoorPalette",
"shortDescription": "Application color scheme",
"longDescription": "The color scheme for the user interface.",
"type": "uint32",
......@@ -145,55 +145,55 @@
"defaultValue": 0
},
{
"name": "ShowLargeCompass",
"name": "showLargeCompass",
"shortDescription": "Show large compass",
"longDescription": "Show large compass on instrument panel",
"type": "bool",
"defaultValue": false
},
{
"name": "SavePath",
"name": "savePath",
"shortDescription": "Application save directory",
"longDescription": "Directory to which all data files are saved/loaded from",
"type": "string",
"defaultValue": ""
},
{
"name": "UserBrandImageIndoor",
"name": "userBrandImageIndoor",
"shortDescription": "User-selected brand image",
"longDescription": "Location in file system of user-selected brand image (indoor)",
"type": "string",
"defaultValue": ""
},
{
"name": "UserBrandImageOutdoor",
"name": "userBrandImageOutdoor",
"shortDescription": "User-selected brand image",
"longDescription": "Location in file system of user-selected brand image (outdoor)",
"type": "string",
"defaultValue": ""
},
{
"name": "MapboxToken",
"name": "mapboxToken",
"shortDescription": "Access token to Mapbox maps",
"longDescription": "Your personal access token for Mapbox maps",
"type": "string",
"defaultValue": ""
},
{
"name": "EsriToken",
"name": "esriToken",
"shortDescription": "Access token to Esri maps",
"longDescription": "Your personal access token for Esri maps",
"type": "string",
"defaultValue": ""
},
{
"name": "DefaultFirmwareType",
"name": "defaultFirmwareType",
"shortDescription": "Default firmware type for flashing",
"type": "uint32",
"defaultValue": 12
},
{
"name": "FollowTarget",
"name": "followTarget",
"shortDescription": "Stream GCS' coordinates to Autopilot",
"type": "uint32",
"enumStrings": "Never,Always,When in Follow Me Flight Mode",
......
src/Settings/AppSettings.cc
View file @ 605c285e
This diff is collapsed.
src/Settings/AppSettings.h
View file @ 605c285e
......@@ -6,9 +6,7 @@
* COPYING.md in the root of the source code directory.
*
****************************************************************************/
#ifndef AppSettings_H
#define AppSettings_H
#pragma once
#include "SettingsGroup.h"
#include "QGCMAVLink.h"
......@@ -20,29 +18,31 @@ class AppSettings : public SettingsGroup
public:
AppSettings(QObject* parent = nullptr);
Q_PROPERTY(Fact* offlineEditingFirmwareType READ offlineEditingFirmwareType CONSTANT)
Q_PROPERTY(Fact* offlineEditingVehicleType READ offlineEditingVehicleType CONSTANT)
Q_PROPERTY(Fact* offlineEditingCruiseSpeed READ offlineEditingCruiseSpeed CONSTANT)
Q_PROPERTY(Fact* offlineEditingHoverSpeed READ offlineEditingHoverSpeed CONSTANT)
Q_PROPERTY(Fact* offlineEditingAscentSpeed READ offlineEditingAscentSpeed CONSTANT)
Q_PROPERTY(Fact* offlineEditingDescentSpeed READ offlineEditingDescentSpeed CONSTANT)
Q_PROPERTY(Fact* batteryPercentRemainingAnnounce READ batteryPercentRemainingAnnounce CONSTANT)
Q_PROPERTY(Fact* defaultMissionItemAltitude READ defaultMissionItemAltitude CONSTANT)
Q_PROPERTY(Fact* telemetrySave READ telemetrySave CONSTANT)
Q_PROPERTY(Fact* telemetrySaveNotArmed READ telemetrySaveNotArmed CONSTANT)
Q_PROPERTY(Fact* audioMuted READ audioMuted CONSTANT)
Q_PROPERTY(Fact* virtualJoystick READ virtualJoystick CONSTANT)
Q_PROPERTY(Fact* appFontPointSize READ appFontPointSize CONSTANT)
Q_PROPERTY(Fact* indoorPalette READ indoorPalette CONSTANT)
Q_PROPERTY(Fact* showLargeCompass READ showLargeCompass CONSTANT)
Q_PROPERTY(Fact* savePath READ savePath CONSTANT)
Q_PROPERTY(Fact* autoLoadMissions READ autoLoadMissions CONSTANT)
Q_PROPERTY(Fact* useChecklist READ useChecklist CONSTANT)
Q_PROPERTY(Fact* mapboxToken READ mapboxToken CONSTANT)
Q_PROPERTY(Fact* esriToken READ esriToken CONSTANT)
Q_PROPERTY(Fact* defaultFirmwareType READ defaultFirmwareType CONSTANT)
Q_PROPERTY(Fact* gstDebug READ gstDebug CONSTANT)
Q_PROPERTY(Fact* followTarget READ followTarget CONSTANT)
DEFINE_SETTING_NAME_GROUP()
DEFINE_SETTINGFACT(offlineEditingFirmwareType)
DEFINE_SETTINGFACT(offlineEditingVehicleType)
DEFINE_SETTINGFACT(offlineEditingCruiseSpeed)
DEFINE_SETTINGFACT(offlineEditingHoverSpeed)
DEFINE_SETTINGFACT(offlineEditingAscentSpeed)
DEFINE_SETTINGFACT(offlineEditingDescentSpeed)
DEFINE_SETTINGFACT(batteryPercentRemainingAnnounce)
DEFINE_SETTINGFACT(defaultMissionItemAltitude)
DEFINE_SETTINGFACT(telemetrySave)
DEFINE_SETTINGFACT(telemetrySaveNotArmed)
DEFINE_SETTINGFACT(audioMuted)
DEFINE_SETTINGFACT(virtualJoystick)
DEFINE_SETTINGFACT(appFontPointSize)
DEFINE_SETTINGFACT(indoorPalette)
DEFINE_SETTINGFACT(showLargeCompass)
DEFINE_SETTINGFACT(savePath)
DEFINE_SETTINGFACT(autoLoadMissions)
DEFINE_SETTINGFACT(useChecklist)
DEFINE_SETTINGFACT(mapboxToken)
DEFINE_SETTINGFACT(esriToken)
DEFINE_SETTINGFACT(defaultFirmwareType)
DEFINE_SETTINGFACT(gstDebugLevel)
DEFINE_SETTINGFACT(followTarget)
Q_PROPERTY(QString missionSavePath READ missionSavePath NOTIFY savePathsChanged)
Q_PROPERTY(QString parameterSavePath READ parameterSavePath NOTIFY savePathsChanged)
......@@ -60,66 +60,15 @@ public:
Q_PROPERTY(QString shpFileExtension MEMBER shpFileExtension CONSTANT)
Q_PROPERTY(QString logFileExtension MEMBER logFileExtension CONSTANT)
Fact* offlineEditingFirmwareType (void);
Fact* offlineEditingVehicleType (void);
Fact* offlineEditingCruiseSpeed (void);
Fact* offlineEditingHoverSpeed (void);
Fact* offlineEditingAscentSpeed (void);
Fact* offlineEditingDescentSpeed (void);
Fact* batteryPercentRemainingAnnounce (void);
Fact* defaultMissionItemAltitude (void);
Fact* telemetrySave (void);
Fact* telemetrySaveNotArmed (void);
Fact* audioMuted (void);
Fact* virtualJoystick (void);
Fact* appFontPointSize (void);
Fact* indoorPalette (void);
Fact* showLargeCompass (void);
Fact* savePath (void);
Fact* autoLoadMissions (void);
Fact* useChecklist (void);
Fact* mapboxToken (void);
Fact* esriToken (void);
Fact* defaultFirmwareType (void);
Fact* gstDebug (void);
Fact* followTarget (void);
QString missionSavePath (void);
QString parameterSavePath (void);
QString telemetrySavePath (void);
QString logSavePath (void);
QString videoSavePath (void);
QString crashSavePath (void);
static MAV_AUTOPILOT offlineEditingFirmwareTypeFromFirmwareType(MAV_AUTOPILOT firmwareType);
static MAV_TYPE offlineEditingVehicleTypeFromVehicleType(MAV_TYPE vehicleType);
QString missionSavePath ();
QString parameterSavePath ();
QString telemetrySavePath ();
QString logSavePath ();
QString videoSavePath ();
QString crashSavePath ();
static const char* name;
static const char* settingsGroup;
static const char* offlineEditingFirmwareTypeSettingsName;
static const char* offlineEditingVehicleTypeSettingsName;
static const char* offlineEditingCruiseSpeedSettingsName;
static const char* offlineEditingHoverSpeedSettingsName;
static const char* offlineEditingAscentSpeedSettingsName;
static const char* offlineEditingDescentSpeedSettingsName;
static const char* batteryPercentRemainingAnnounceSettingsName;
static const char* defaultMissionItemAltitudeSettingsName;
static const char* telemetrySaveName;
static const char* telemetrySaveNotArmedName;
static const char* audioMutedName;
static const char* virtualJoystickName;
static const char* appFontPointSizeName;
static const char* indoorPaletteName;
static const char* showLargeCompassName;
static const char* savePathName;
static const char* autoLoadMissionsName;
static const char* useChecklistName;
static const char* mapboxTokenName;
static const char* esriTokenName;
static const char* defaultFirmwareTypeName;
static const char* gstDebugName;
static const char* followTargetName;
static MAV_AUTOPILOT offlineEditingFirmwareTypeFromFirmwareType (MAV_AUTOPILOT firmwareType);
static MAV_TYPE offlineEditingVehicleTypeFromVehicleType (MAV_TYPE vehicleType);
// Application wide file extensions
static const char* parameterFileExtension;
......@@ -142,36 +91,10 @@ public:
static const char* crashDirectory;
signals:
void savePathsChanged(void);
void savePathsChanged();
private slots:
void _indoorPaletteChanged(void);
void _checkSavePathDirectories(void);
void _indoorPaletteChanged();
void _checkSavePathDirectories();
private:
SettingsFact* _offlineEditingFirmwareTypeFact;
SettingsFact* _offlineEditingVehicleTypeFact;
SettingsFact* _offlineEditingCruiseSpeedFact;
SettingsFact* _offlineEditingHoverSpeedFact;
SettingsFact* _offlineEditingAscentSpeedFact;
SettingsFact* _offlineEditingDescentSpeedFact;
SettingsFact* _batteryPercentRemainingAnnounceFact;
SettingsFact* _defaultMissionItemAltitudeFact;
SettingsFact* _telemetrySaveFact;
SettingsFact* _telemetrySaveNotArmedFact;
SettingsFact* _audioMutedFact;
SettingsFact* _virtualJoystickFact;
SettingsFact* _appFontPointSizeFact;
SettingsFact* _indoorPaletteFact;
SettingsFact* _showLargeCompassFact;
SettingsFact* _savePathFact;
SettingsFact* _autoLoadMissionsFact;
SettingsFact* _useChecklistFact;
SettingsFact* _mapboxTokenFact;
SettingsFact* _esriTokenFact;
SettingsFact* _defaultFirmwareTypeFact;
SettingsFact* _gstDebugFact;
SettingsFact* _followTargetFact;
};
#endif
src/Settings/AutoConnect.SettingsGroup.json
View file @ 605c285e
[
{
"name": "AutoconnectUDP",
"name": "autoConnectUDP",
"shortDescription": "Automatically open a connection over UDP",
"longDescription": "If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a UDP communication link.",
"type": "bool",
"defaultValue": true
},
{
"name": "AutoconnectPixhawk",
"name": "autoConnectPixhawk",
"shortDescription": "Automatically connect to a Pixhawk board",
"longDescription": "If this option is enabled GroundControl will automatically connect to a Pixhawk board which is connected via USB.",
"type": "bool",
"defaultValue": true
},
{
"name": "Autoconnect3DRRadio",
"name": "autoConnectSiKRadio",
"shortDescription": "Automatically connect to a SiK Radio",
"longDescription": "If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a SiK Radio communication link.",
"type": "bool",
"defaultValue": true
},
{
"name": "AutoconnectPX4Flow",
"name": "autoConnectPX4Flow",
"shortDescription": "Automatically connect to a P4 Flow",
"longDescription": "If this option is enabled GroundControl will automatically connect to a PX4 Flow board which is connected via USB.",
"type": "bool",
"defaultValue": true
},
{
"name": "AutoconnectRTKGPS",
"name": "autoConnectRTKGPS",
"shortDescription": "Automatically connect to an RTK GPS",
"longDescription": "If this option is enabled GroundControl will automatically connect to an RTK GPS which is connected via USB.",
"type": "bool",
"defaultValue": true
},
{
"name": "AutoconnectLibrePilot",
"name": "autoConnectLibrePilot",
"shortDescription": "Automatically connect to a LibrePilot",
"longDescription": "If this option is enabled GroundControl will automatically connect to a LibrePilot board which is connected via USB.",
"type": "bool",
"defaultValue": true
},
{
"name": "AutoconnectNmeaPort",
"name": "autoConnectNmeaPort",
"shortDescription": "NMEA GPS device for GCS position",
"longDescription": "NMEA GPS device for GCS position",
"type": "string",
"defaultValue": "disabled"
},
{
"name": "AutoconnectNmeaBaud",
"name": "autoConnectNmeaBaud",
"shortDescription": "NMEA GPS Baudrate",
"longDescription": "NMEA GPS Baudrate",
"type": "uint32",
"defaultValue": 4800
},
{
"name": "AutoconnectUDPListenPort",
"name": "udpListenPort",
"shortDescription": "UDP port for autoconnect",
"type": "uint32",
"defaultValue": 14550
},
{
"name": "AutoconnectUDPTargetHostIP",
"name": "udpTargetHostIP",
"shortDescription": "UDP target host IP for autoconnect",
"type": "string",
"defaultValue": ""
},
{
"name": "AutoconnectUDPTargetHostPort",
"name": "udpTargetHostPort",
"shortDescription": "UDP target host port for autoconnect",
"type": "uint32",
"defaultValue": 14550
},
{
"name": "autoConnectTaisyncUSB",
"shortDescription": "Automatically connect to a Taisync Ground Module",
"longDescription": "If this option is enabled GroundControl will automatically connect to a Taisync Ground Module which is connected via USB.",
"type": "bool",
"defaultValue": false
}
]
src/Settings/AutoConnectSettings.cc
View file @ 605c285e
......@@ -13,110 +13,74 @@
#include <QQmlEngine>
#include <QtQml>
const char* AutoConnectSettings::name = "AutoConnect";
const char* AutoConnectSettings::settingsGroup = "LinkManager";
const char* AutoConnectSettings:: autoConnectUDPSettingsName = "AutoconnectUDP";
const char* AutoConnectSettings:: autoConnectPixhawkSettingsName = "AutoconnectPixhawk";
const char* AutoConnectSettings:: autoConnectSiKRadioSettingsName = "Autoconnect3DRRadio";
const char* AutoConnectSettings:: autoConnectPX4FlowSettingsName = "AutoconnectPX4Flow";
const char* AutoConnectSettings:: autoConnectRTKGPSSettingsName = "AutoconnectRTKGPS";
const char* AutoConnectSettings:: autoConnectLibrePilotSettingsName = "AutoconnectLibrePilot";
const char* AutoConnectSettings:: autoConnectNmeaPortName = "AutoconnectNmeaPort";
const char* AutoConnectSettings:: autoConnectNmeaBaudName = "AutoconnectNmeaBaud";
const char* AutoConnectSettings:: udpListenPortName = "AutoconnectUDPListenPort";
const char* AutoConnectSettings:: udpTargetHostIPName = "AutoconnectUDPTargetHostIP";
const char* AutoConnectSettings:: udpTargetHostPortName = "AutoconnectUDPTargetHostPort";
AutoConnectSettings::AutoConnectSettings(QObject* parent)
: SettingsGroup (name, settingsGroup, parent)
, _autoConnectUDPFact (NULL)
, _autoConnectPixhawkFact (NULL)
, _autoConnectSiKRadioFact (NULL)
, _autoConnectPX4FlowFact (NULL)
, _autoConnectRTKGPSFact (NULL)
, _autoConnectLibrePilotFact(NULL)
, _autoConnectNmeaPortFact (NULL)
, _autoConnectNmeaBaudFact (NULL)
, _udpListenPortFact (NULL)
, _udpTargetHostIPFact (NULL)
, _udpTargetHostPortFact (NULL)
DECLARE_SETTINGGROUP(AutoConnect, "LinkManager")
{
QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership);
qmlRegisterUncreatableType<AutoConnectSettings>("QGroundControl.SettingsManager", 1, 0, "AutoConnectSettings", "Reference only");
QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership); \
qmlRegisterUncreatableType<AutoConnectSettings>("QGroundControl.SettingsManager", 1, 0, "AutoConnectSettings", "Reference only"); \
}
Fact* AutoConnectSettings::autoConnectUDP(void)
{
if (!_autoConnectUDPFact) {
_autoConnectUDPFact = _createSettingsFact(autoConnectUDPSettingsName);
}
return _autoConnectUDPFact;
}
DECLARE_SETTINGSFACT(AutoConnectSettings, autoConnectUDP)
DECLARE_SETTINGSFACT(AutoConnectSettings, udpListenPort)
DECLARE_SETTINGSFACT(AutoConnectSettings, udpTargetHostIP)
DECLARE_SETTINGSFACT(AutoConnectSettings, udpTargetHostPort)
DECLARE_SETTINGSFACT(AutoConnectSettings, autoconnectTaisyncUSB)
Fact* AutoConnectSettings::autoConnectPixhawk(void)
DECLARE_SETTINGSFACT_NO_FUNC(AutoConnectSettings, autoConnectPixhawk)
{
if (!_autoConnectPixhawkFact) {
_autoConnectPixhawkFact = _createSettingsFact(autoConnectPixhawkSettingsName);
_autoConnectPixhawkFact = _createSettingsFact(autoConnectPixhawkName);
#ifdef __ios__
_autoConnectPixhawkFact->setVisible(false);
#endif
}
return _autoConnectPixhawkFact;
}
Fact* AutoConnectSettings::autoConnectSiKRadio(void)
DECLARE_SETTINGSFACT_NO_FUNC(AutoConnectSettings, autoConnectSiKRadio)
{
if (!_autoConnectSiKRadioFact) {
_autoConnectSiKRadioFact = _createSettingsFact(autoConnectSiKRadioSettingsName);
_autoConnectSiKRadioFact = _createSettingsFact(autoConnectSiKRadioName);
#ifdef __ios__
_autoConnectSiKRadioFact->setVisible(false);
#endif
}
return _autoConnectSiKRadioFact;
}
Fact* AutoConnectSettings::autoConnectPX4Flow(void)
DECLARE_SETTINGSFACT_NO_FUNC(AutoConnectSettings, autoConnectPX4Flow)
{
if (!_autoConnectPX4FlowFact) {
_autoConnectPX4FlowFact = _createSettingsFact(autoConnectPX4FlowSettingsName);
_autoConnectPX4FlowFact = _createSettingsFact(autoConnectPX4FlowName);
#ifdef __ios__
_autoConnectPX4FlowFact->setVisible(false);
#endif
}
return _autoConnectPX4FlowFact;
}
Fact* AutoConnectSettings::autoConnectRTKGPS(void)
DECLARE_SETTINGSFACT_NO_FUNC(AutoConnectSettings, autoConnectRTKGPS)
{
if (!_autoConnectRTKGPSFact) {
_autoConnectRTKGPSFact = _createSettingsFact(autoConnectRTKGPSSettingsName);
_autoConnectRTKGPSFact = _createSettingsFact(autoConnectRTKGPSName);
#ifdef __ios__
_autoConnectRTKGPSFact->setVisible(false);
#endif
}
return _autoConnectRTKGPSFact;
}
Fact* AutoConnectSettings::autoConnectLibrePilot(void)
DECLARE_SETTINGSFACT_NO_FUNC(AutoConnectSettings, autoConnectLibrePilot)
{
if (!_autoConnectLibrePilotFact) {
_autoConnectLibrePilotFact = _createSettingsFact(autoConnectLibrePilotSettingsName);
_autoConnectLibrePilotFact = _createSettingsFact(autoConnectLibrePilotName);
#ifdef __ios__
_autoConnectLibrePilotFact->setVisible(false);
#endif
}
return _autoConnectLibrePilotFact;
}
Fact* AutoConnectSettings::autoConnectNmeaPort(void)
DECLARE_SETTINGSFACT_NO_FUNC(AutoConnectSettings, autoConnectNmeaPort)
{
if (!_autoConnectNmeaPortFact) {
_autoConnectNmeaPortFact = _createSettingsFact(autoConnectNmeaPortName);
......@@ -124,11 +88,10 @@ Fact* AutoConnectSettings::autoConnectNmeaPort(void)
_autoConnectNmeaPortFact->setVisible(false);
#endif
}
return _autoConnectNmeaPortFact;
}
Fact* AutoConnectSettings::autoConnectNmeaBaud(void)
DECLARE_SETTINGSFACT_NO_FUNC(AutoConnectSettings, autoConnectNmeaBaud)
{
if (!_autoConnectNmeaBaudFact) {
_autoConnectNmeaBaudFact = _createSettingsFact(autoConnectNmeaBaudName);
......@@ -136,33 +99,5 @@ Fact* AutoConnectSettings::autoConnectNmeaBaud(void)
_autoConnectNmeaBaudFact->setVisible(false);
#endif
}
return _autoConnectNmeaBaudFact;
}
Fact* AutoConnectSettings::udpListenPort(void)
{
if (!_udpListenPortFact) {
_udpListenPortFact = _createSettingsFact(udpListenPortName);
}
return _udpListenPortFact;
}
Fact* AutoConnectSettings::udpTargetHostIP(void)
{
if (!_udpTargetHostIPFact) {
_udpTargetHostIPFact = _createSettingsFact(udpTargetHostIPName);
}
return _udpTargetHostIPFact;
}
Fact* AutoConnectSettings::udpTargetHostPort(void)
{
if (!_udpTargetHostPortFact) {
_udpTargetHostPortFact = _createSettingsFact(udpTargetHostPortName);
}
return _udpTargetHostPortFact;
}
src/Settings/AutoConnectSettings.h
View file @ 605c285e
......@@ -7,8 +7,7 @@
*
****************************************************************************/