Commit fd703c9a authored by Don Gagne's avatar Don Gagne

Revert "Don't send button pressed bits to MANUAL_CONTROL"

This reverts commit c01ceadd.
parent c01ceadd
......@@ -507,6 +507,7 @@ 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;
......@@ -524,6 +525,9 @@ void Joystick::run(void)
_buttonAction(buttonAction);
}
}
// Mark the button as pressed as long as its pressed
buttonPressedBits |= buttonBit;
}
}
......@@ -531,7 +535,7 @@ void Joystick::run(void)
qCDebug(JoystickValuesLog) << "name:roll:pitch:yaw:throttle" << name() << roll << -pitch << yaw << throttle;
emit manualControl(roll, -pitch, yaw, throttle, 0, _activeVehicle->joystickMode());
emit manualControl(roll, -pitch, yaw, throttle, buttonPressedBits, _activeVehicle->joystickMode());
}
// Sleep. Update rate of joystick is by default 25 Hz
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment