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
d4dbe920
Commit
d4dbe920
authored
Feb 25, 2017
by
nanthony21
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Moved deadband indicators to the right column.
parent
61d08723
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
22 deletions
+8
-22
JoystickConfig.qml
src/VehicleSetup/JoystickConfig.qml
+6
-21
JoystickConfigController.cc
src/VehicleSetup/JoystickConfigController.cc
+1
-1
JoystickConfigController.h
src/VehicleSetup/JoystickConfigController.h
+1
-0
No files found.
src/VehicleSetup/JoystickConfig.qml
View file @
d4dbe920
...
...
@@ -202,11 +202,6 @@ SetupPage {
property
bool
reversed
:
controller
.
rollAxisReversed
}
Connections
{
target
:
controller
onRollAxisDeadbandChanged
:
rollLoader
.
item
.
deadbandValue
=
value
}
Connections
{
target
:
_activeJoystick
...
...
@@ -237,12 +232,6 @@ SetupPage {
property
bool
reversed
:
controller
.
pitchAxisReversed
}
Connections
{
target
:
controller
onPitchAxisDeadbandChanged
:
pitchLoader
.
item
.
deadbandValue
=
value
}
Connections
{
target
:
_activeJoystick
...
...
@@ -273,11 +262,6 @@ SetupPage {
property
bool
reversed
:
controller
.
yawAxisReversed
}
Connections
{
target
:
controller
onYawAxisDeadbandChanged
:
yawLoader
.
item
.
deadbandValue
=
value
}
Connections
{
target
:
_activeJoystick
...
...
@@ -308,11 +292,6 @@ SetupPage {
property
bool
reversed
:
controller
.
throttleAxisReversed
}
Connections
{
target
:
controller
onThrottleAxisDeadbandChanged
:
throttleLoader
.
item
.
deadbandValue
=
value
}
Connections
{
target
:
_activeJoystick
...
...
@@ -758,6 +737,12 @@ SetupPage {
axisMonitorRepeater
.
itemAt
(
axis
).
loader
.
item
.
axisValue
=
value
}
}
onAxisDeadbandChanged
:
{
if
(
axisMonitorRepeater
.
itemAt
(
axis
))
{
axisMonitorRepeater
.
itemAt
(
axis
).
loader
.
item
.
deadbandValue
=
value
}
}
}
Repeater
{
...
...
src/VehicleSetup/JoystickConfigController.cc
View file @
d4dbe920
...
...
@@ -247,7 +247,7 @@ void JoystickConfigController::_axisDeadbandChanged(int axis, int value)
value
=
abs
(
value
)
<
_calValidMaxValue
?
abs
(
value
)
:
_calValidMaxValue
;
_rgAxisInfo
[
axis
].
deadband
=
value
;
emit
axisDeadbandChanged
(
axis
,
value
);
qCDebug
(
JoystickConfigControllerLog
)
<<
"Axis:"
<<
axis
<<
"Deadband:"
<<
_rgAxisInfo
[
axis
].
deadband
;
}
...
...
src/VehicleSetup/JoystickConfigController.h
View file @
d4dbe920
...
...
@@ -110,6 +110,7 @@ public:
signals:
void
axisValueChanged
(
int
axis
,
int
value
);
void
axisDeadbandChanged
(
int
axis
,
int
value
);
void
rollAxisMappedChanged
(
bool
mapped
);
void
pitchAxisMappedChanged
(
bool
mapped
);
...
...
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