diff options
author | liamwhite <liamwhite@users.noreply.github.com> | 2024-01-16 05:26:08 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-16 05:26:08 +0100 |
commit | 2c29c2b8dd280d0aeff432569f324cd85d83b415 (patch) | |
tree | e5552e7f82ccb37b611a3a577f94c91f9c813320 /src/input_common/helpers/joycon_protocol/rumble.cpp | |
parent | Merge pull request #12681 from t895/stick-toggles (diff) | |
parent | Fix typos in master (diff) | |
download | yuzu-2c29c2b8dd280d0aeff432569f324cd85d83b415.tar yuzu-2c29c2b8dd280d0aeff432569f324cd85d83b415.tar.gz yuzu-2c29c2b8dd280d0aeff432569f324cd85d83b415.tar.bz2 yuzu-2c29c2b8dd280d0aeff432569f324cd85d83b415.tar.lz yuzu-2c29c2b8dd280d0aeff432569f324cd85d83b415.tar.xz yuzu-2c29c2b8dd280d0aeff432569f324cd85d83b415.tar.zst yuzu-2c29c2b8dd280d0aeff432569f324cd85d83b415.zip |
Diffstat (limited to '')
-rw-r--r-- | src/input_common/helpers/joycon_protocol/rumble.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/input_common/helpers/joycon_protocol/rumble.cpp b/src/input_common/helpers/joycon_protocol/rumble.cpp index 7647f505e..9fd0b8470 100644 --- a/src/input_common/helpers/joycon_protocol/rumble.cpp +++ b/src/input_common/helpers/joycon_protocol/rumble.cpp @@ -67,7 +67,7 @@ u8 RumbleProtocol::EncodeHighAmplitude(f32 amplitude) const { // More information about these values can be found here: // https://github.com/dekuNukem/Nintendo_Switch_Reverse_Engineering/blob/master/rumble_data_table.md - static constexpr std::array<std::pair<f32, int>, 101> high_fequency_amplitude{ + static constexpr std::array<std::pair<f32, int>, 101> high_frequency_amplitude{ std::pair<f32, int>{0.0f, 0x0}, {0.01f, 0x2}, {0.012f, 0x4}, @@ -171,20 +171,20 @@ u8 RumbleProtocol::EncodeHighAmplitude(f32 amplitude) const { {1.003f, 0xc8}, }; - for (const auto& [amplitude_value, code] : high_fequency_amplitude) { + for (const auto& [amplitude_value, code] : high_frequency_amplitude) { if (amplitude <= amplitude_value) { return static_cast<u8>(code); } } - return static_cast<u8>(high_fequency_amplitude[high_fequency_amplitude.size() - 1].second); + return static_cast<u8>(high_frequency_amplitude[high_frequency_amplitude.size() - 1].second); } u16 RumbleProtocol::EncodeLowAmplitude(f32 amplitude) const { // More information about these values can be found here: // https://github.com/dekuNukem/Nintendo_Switch_Reverse_Engineering/blob/master/rumble_data_table.md - static constexpr std::array<std::pair<f32, int>, 101> high_fequency_amplitude{ + static constexpr std::array<std::pair<f32, int>, 101> high_frequency_amplitude{ std::pair<f32, int>{0.0f, 0x0040}, {0.01f, 0x8040}, {0.012f, 0x0041}, @@ -288,13 +288,13 @@ u16 RumbleProtocol::EncodeLowAmplitude(f32 amplitude) const { {1.003f, 0x0072}, }; - for (const auto& [amplitude_value, code] : high_fequency_amplitude) { + for (const auto& [amplitude_value, code] : high_frequency_amplitude) { if (amplitude <= amplitude_value) { return static_cast<u16>(code); } } - return static_cast<u16>(high_fequency_amplitude[high_fequency_amplitude.size() - 1].second); + return static_cast<u16>(high_frequency_amplitude[high_frequency_amplitude.size() - 1].second); } } // namespace InputCommon::Joycon |