Browse Source

Add virtualJoystickCentralized setting

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
QGC4.4
Patrick José Pereira 6 years ago
parent
commit
c72abd336f
  1. 4
      src/FlightDisplay/FlightDisplayViewWidgets.qml
  2. 7
      src/Settings/App.SettingsGroup.json
  3. 1
      src/Settings/AppSettings.cc
  4. 1
      src/Settings/AppSettings.h
  5. 11
      src/ui/preferences/GeneralSettings.qml

4
src/FlightDisplay/FlightDisplayViewWidgets.qml

@ -86,6 +86,10 @@ Item { @@ -86,6 +86,10 @@ Item {
target: QGroundControl.settingsManager.appSettings.virtualJoystick
onValueChanged: _setInstrumentWidget()
}
Connections {
target: QGroundControl.settingsManager.appSettings.virtualJoystickCentralized
onValueChanged: _setInstrumentWidget()
}
Connections {
target: QGroundControl.settingsManager.appSettings.showLargeCompass

7
src/Settings/App.SettingsGroup.json

@ -104,6 +104,13 @@ @@ -104,6 +104,13 @@
"defaultValue": false
},
{
"name": "virtualJoystickCentralized",
"shortDescription": "Set virtual joystick to be centralize throttle (spring-loaded).",
"longDescription": "If this option is enabled the virtual joystick throttle stick will be centralized.",
"type": "bool",
"defaultValue": false
},
{
"name": "gstDebugLevel",
"shortDescription": "Video streaming debug",
"longDescription": "Sets the environment variable GST_DEBUG for all pipeline elements on boot.",

1
src/Settings/AppSettings.cc

@ -78,6 +78,7 @@ DECLARE_SETTINGSFACT(AppSettings, telemetrySave) @@ -78,6 +78,7 @@ DECLARE_SETTINGSFACT(AppSettings, telemetrySave)
DECLARE_SETTINGSFACT(AppSettings, telemetrySaveNotArmed)
DECLARE_SETTINGSFACT(AppSettings, audioMuted)
DECLARE_SETTINGSFACT(AppSettings, virtualJoystick)
DECLARE_SETTINGSFACT(AppSettings, virtualJoystickCentralized)
DECLARE_SETTINGSFACT(AppSettings, appFontPointSize)
DECLARE_SETTINGSFACT(AppSettings, showLargeCompass)
DECLARE_SETTINGSFACT(AppSettings, savePath)

1
src/Settings/AppSettings.h

@ -33,6 +33,7 @@ public: @@ -33,6 +33,7 @@ public:
DEFINE_SETTINGFACT(telemetrySaveNotArmed)
DEFINE_SETTINGFACT(audioMuted)
DEFINE_SETTINGFACT(virtualJoystick)
DEFINE_SETTINGFACT(virtualJoystickCentralized)
DEFINE_SETTINGFACT(appFontPointSize)
DEFINE_SETTINGFACT(indoorPalette)
DEFINE_SETTINGFACT(showLargeCompass)

11
src/ui/preferences/GeneralSettings.qml

@ -455,6 +455,17 @@ QGCView { @@ -455,6 +455,17 @@ QGCView {
property Fact _virtualJoystick: QGroundControl.settingsManager.appSettings.virtualJoystick
}
FactCheckBox {
text: qsTr("Auto-Center throttle")
visible: _virtualJoystickCentralized.visible && (
QGroundControl.multiVehicleManager.activeVehicle.sub || QGroundControl.multiVehicleManager.activeVehicle.rover
)
fact: _virtualJoystickCentralized
Layout.leftMargin: _margins
property Fact _virtualJoystickCentralized: QGroundControl.settingsManager.appSettings.virtualJoystickCentralized
}
GridLayout {
columns: 2

Loading…
Cancel
Save