diff options
| author | Morph <39850852+Morph1984@users.noreply.github.com> | 2021-12-18 15:53:15 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-18 15:53:15 -0500 |
| commit | 8e33cf1c2bd1e15e33d94524835ba1d39c138afd (patch) | |
| tree | 9a56f7230c676b5a79d5656df7bdd2e907c1ba59 /src/core/hid/emulated_controller.cpp | |
| parent | 6fb212784eb8eef5f4d1e1c2e9e14b884e1a5889 (diff) | |
| parent | c82e6dc81048352475cd64968f8733040a35d944 (diff) | |
Merge pull request #7593 from german77/brrr_test
core/hid: Cancel any vibration after the test
Diffstat (limited to 'src/core/hid/emulated_controller.cpp')
| -rw-r--r-- | src/core/hid/emulated_controller.cpp | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src/core/hid/emulated_controller.cpp b/src/core/hid/emulated_controller.cpp index 93372445b2..ff9d7a7e36 100644 --- a/src/core/hid/emulated_controller.cpp +++ b/src/core/hid/emulated_controller.cpp @@ -843,23 +843,18 @@ bool EmulatedController::SetVibration(std::size_t device_index, VibrationValue v } bool EmulatedController::TestVibration(std::size_t device_index) { - if (device_index >= output_devices.size()) { - return false; - } - if (!output_devices[device_index]) { - return false; - } - - // Send a slight vibration to test for rumble support - constexpr Common::Input::VibrationStatus status = { + static constexpr VibrationValue test_vibration = { .low_amplitude = 0.001f, .low_frequency = 160.0f, .high_amplitude = 0.001f, .high_frequency = 320.0f, - .type = Common::Input::VibrationAmplificationType::Linear, }; - return output_devices[device_index]->SetVibration(status) == - Common::Input::VibrationError::None; + + // Send a slight vibration to test for rumble support + SetVibration(device_index, test_vibration); + + // Stop any vibration and return the result + return SetVibration(device_index, DEFAULT_VIBRATION_VALUE); } void EmulatedController::SetLedPattern() { |