summaryrefslogtreecommitdiffstats
path: root/src/core/hid/emulated_controller.cpp
diff options
context:
space:
mode:
authorNarr the Reg <juangerman-13@hotmail.com>2021-12-16 03:00:24 +0100
committerNarr the Reg <juangerman-13@hotmail.com>2021-12-16 20:35:15 +0100
commitc82e6dc81048352475cd64968f8733040a35d944 (patch)
tree1fd6749536362bfafc8ff33de7c1b27105ebea61 /src/core/hid/emulated_controller.cpp
parentMerge pull request #7588 from Wunkolo/gibibibi-bytes (diff)
downloadyuzu-c82e6dc81048352475cd64968f8733040a35d944.tar
yuzu-c82e6dc81048352475cd64968f8733040a35d944.tar.gz
yuzu-c82e6dc81048352475cd64968f8733040a35d944.tar.bz2
yuzu-c82e6dc81048352475cd64968f8733040a35d944.tar.lz
yuzu-c82e6dc81048352475cd64968f8733040a35d944.tar.xz
yuzu-c82e6dc81048352475cd64968f8733040a35d944.tar.zst
yuzu-c82e6dc81048352475cd64968f8733040a35d944.zip
Diffstat (limited to 'src/core/hid/emulated_controller.cpp')
-rw-r--r--src/core/hid/emulated_controller.cpp19
1 files changed, 7 insertions, 12 deletions
diff --git a/src/core/hid/emulated_controller.cpp b/src/core/hid/emulated_controller.cpp
index 93372445b..ff9d7a7e3 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() {