Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
c01ceadd
Commit
c01ceadd
authored
Jan 04, 2019
by
Don Gagne
Browse files
Don't send button pressed bits to MANUAL_CONTROL
parent
84ee0779
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/Joystick/Joystick.cc
View file @
c01ceadd
...
...
@@ -507,7 +507,6 @@ void Joystick::run(void)
// Set up button pressed information
quint16
newButtonBits
=
0
;
// New set of button which are down
quint16
buttonPressedBits
=
0
;
// Buttons pressed for manualControl signal
for
(
int
buttonIndex
=
0
;
buttonIndex
<
_totalButtonCount
;
buttonIndex
++
)
{
quint16
buttonBit
=
1
<<
buttonIndex
;
...
...
@@ -525,9 +524,6 @@ void Joystick::run(void)
_buttonAction
(
buttonAction
);
}
}
// Mark the button as pressed as long as its pressed
buttonPressedBits
|=
buttonBit
;
}
}
...
...
@@ -535,7 +531,7 @@ void Joystick::run(void)
qCDebug
(
JoystickValuesLog
)
<<
"name:roll:pitch:yaw:throttle"
<<
name
()
<<
roll
<<
-
pitch
<<
yaw
<<
throttle
;
emit
manualControl
(
roll
,
-
pitch
,
yaw
,
throttle
,
buttonPressedBits
,
_activeVehicle
->
joystickMode
());
emit
manualControl
(
roll
,
-
pitch
,
yaw
,
throttle
,
0
,
_activeVehicle
->
joystickMode
());
}
// Sleep. Update rate of joystick is by default 25 Hz
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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