Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
c72abd33
Commit
c72abd33
authored
Apr 25, 2019
by
Patrick José Pereira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add virtualJoystickCentralized setting
Signed-off-by:
Patrick José Pereira
<
patrickelectric@gmail.com
>
parent
59a5d0a6
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
24 additions
and
0 deletions
+24
-0
FlightDisplayViewWidgets.qml
src/FlightDisplay/FlightDisplayViewWidgets.qml
+4
-0
App.SettingsGroup.json
src/Settings/App.SettingsGroup.json
+7
-0
AppSettings.cc
src/Settings/AppSettings.cc
+1
-0
AppSettings.h
src/Settings/AppSettings.h
+1
-0
GeneralSettings.qml
src/ui/preferences/GeneralSettings.qml
+11
-0
No files found.
src/FlightDisplay/FlightDisplayViewWidgets.qml
View file @
c72abd33
...
@@ -86,6 +86,10 @@ Item {
...
@@ -86,6 +86,10 @@ Item {
target
:
QGroundControl
.
settingsManager
.
appSettings
.
virtualJoystick
target
:
QGroundControl
.
settingsManager
.
appSettings
.
virtualJoystick
onValueChanged
:
_setInstrumentWidget
()
onValueChanged
:
_setInstrumentWidget
()
}
}
Connections
{
target
:
QGroundControl
.
settingsManager
.
appSettings
.
virtualJoystickCentralized
onValueChanged
:
_setInstrumentWidget
()
}
Connections
{
Connections
{
target
:
QGroundControl
.
settingsManager
.
appSettings
.
showLargeCompass
target
:
QGroundControl
.
settingsManager
.
appSettings
.
showLargeCompass
...
...
src/Settings/App.SettingsGroup.json
View file @
c72abd33
...
@@ -103,6 +103,13 @@
...
@@ -103,6 +103,13 @@
"type"
:
"bool"
,
"type"
:
"bool"
,
"defaultValue"
:
false
"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"
,
"name"
:
"gstDebugLevel"
,
"shortDescription"
:
"Video streaming debug"
,
"shortDescription"
:
"Video streaming debug"
,
...
...
src/Settings/AppSettings.cc
View file @
c72abd33
...
@@ -78,6 +78,7 @@ DECLARE_SETTINGSFACT(AppSettings, telemetrySave)
...
@@ -78,6 +78,7 @@ DECLARE_SETTINGSFACT(AppSettings, telemetrySave)
DECLARE_SETTINGSFACT
(
AppSettings
,
telemetrySaveNotArmed
)
DECLARE_SETTINGSFACT
(
AppSettings
,
telemetrySaveNotArmed
)
DECLARE_SETTINGSFACT
(
AppSettings
,
audioMuted
)
DECLARE_SETTINGSFACT
(
AppSettings
,
audioMuted
)
DECLARE_SETTINGSFACT
(
AppSettings
,
virtualJoystick
)
DECLARE_SETTINGSFACT
(
AppSettings
,
virtualJoystick
)
DECLARE_SETTINGSFACT
(
AppSettings
,
virtualJoystickCentralized
)
DECLARE_SETTINGSFACT
(
AppSettings
,
appFontPointSize
)
DECLARE_SETTINGSFACT
(
AppSettings
,
appFontPointSize
)
DECLARE_SETTINGSFACT
(
AppSettings
,
showLargeCompass
)
DECLARE_SETTINGSFACT
(
AppSettings
,
showLargeCompass
)
DECLARE_SETTINGSFACT
(
AppSettings
,
savePath
)
DECLARE_SETTINGSFACT
(
AppSettings
,
savePath
)
...
...
src/Settings/AppSettings.h
View file @
c72abd33
...
@@ -33,6 +33,7 @@ public:
...
@@ -33,6 +33,7 @@ public:
DEFINE_SETTINGFACT
(
telemetrySaveNotArmed
)
DEFINE_SETTINGFACT
(
telemetrySaveNotArmed
)
DEFINE_SETTINGFACT
(
audioMuted
)
DEFINE_SETTINGFACT
(
audioMuted
)
DEFINE_SETTINGFACT
(
virtualJoystick
)
DEFINE_SETTINGFACT
(
virtualJoystick
)
DEFINE_SETTINGFACT
(
virtualJoystickCentralized
)
DEFINE_SETTINGFACT
(
appFontPointSize
)
DEFINE_SETTINGFACT
(
appFontPointSize
)
DEFINE_SETTINGFACT
(
indoorPalette
)
DEFINE_SETTINGFACT
(
indoorPalette
)
DEFINE_SETTINGFACT
(
showLargeCompass
)
DEFINE_SETTINGFACT
(
showLargeCompass
)
...
...
src/ui/preferences/GeneralSettings.qml
View file @
c72abd33
...
@@ -455,6 +455,17 @@ QGCView {
...
@@ -455,6 +455,17 @@ QGCView {
property
Fact
_virtualJoystick
:
QGroundControl
.
settingsManager
.
appSettings
.
virtualJoystick
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
{
GridLayout
{
columns
:
2
columns
:
2
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment