Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Joystick/Joystick.cc
Original file line number Diff line number Diff line change
Expand Up @@ -935,7 +935,7 @@ uint16_t Joystick::_adjustRangeToRcOverridePwm(int value, const AxisCalibration_
void Joystick::_handleAxis()
{
const int axisDelay = static_cast<int>(1000.0 / _joystickSettings.axisFrequencyHz()->rawValue().toDouble());
if (_axisElapsedTimer.elapsed() <= axisDelay) {
if (!_axisUpdateDue(_axisElapsedTimer.elapsed(), axisDelay)) {
return;
}

Expand Down
2 changes: 2 additions & 0 deletions src/Joystick/Joystick.h
Original file line number Diff line number Diff line change
Expand Up @@ -448,6 +448,8 @@ private slots:
void _addAvailableButtonActionIfMissing(const QString &action);
bool _validAxis(int axis) const;
bool _validButton(int button) const;

static constexpr bool _axisUpdateDue(qint64 elapsed, int delay) { return elapsed >= delay; }
void _handleAxis();
void _handleButtons();
void _buildAvailableButtonsActionList(Vehicle *vehicle);
Expand Down
7 changes: 7 additions & 0 deletions test/Joystick/JoystickTest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,13 @@ void JoystickTest::_axisRangeTest()
QVERIFY(js != nullptr);
}

void JoystickTest::_axisUpdateDueTest()
{
QVERIFY(!Joystick::_axisUpdateDue(39, 40));
QVERIFY(Joystick::_axisUpdateDue(40, 40));
QVERIFY(Joystick::_axisUpdateDue(41, 40));
}

//-----------------------------------------------------------------------------
// Button Tests
//-----------------------------------------------------------------------------
Expand Down
1 change: 1 addition & 0 deletions test/Joystick/JoystickTest.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ private slots:
// Axis reading tests
void _readAxisValuesTest();
void _axisRangeTest();
void _axisUpdateDueTest();

// Button reading tests
void _readButtonStatesTest();
Expand Down
Loading