diff options
| author | Viktor Szépe <viktor@szepe.net> | 2024-01-16 01:09:25 +0100 |
|---|---|---|
| committer | Viktor Szépe <viktor@szepe.net> | 2024-01-16 01:09:25 +0100 |
| commit | 16abda59be449484898fdcc55f8f0682ff1cff7d (patch) | |
| tree | e5552e7f82ccb37b611a3a577f94c91f9c813320 | |
| parent | Merge remote-tracking branch 'origin/master' into typos3 (diff) | |
| download | yuzu-16abda59be449484898fdcc55f8f0682ff1cff7d.tar yuzu-16abda59be449484898fdcc55f8f0682ff1cff7d.tar.gz yuzu-16abda59be449484898fdcc55f8f0682ff1cff7d.tar.bz2 yuzu-16abda59be449484898fdcc55f8f0682ff1cff7d.tar.lz yuzu-16abda59be449484898fdcc55f8f0682ff1cff7d.tar.xz yuzu-16abda59be449484898fdcc55f8f0682ff1cff7d.tar.zst yuzu-16abda59be449484898fdcc55f8f0682ff1cff7d.zip | |
| -rw-r--r-- | src/hid_core/resources/npad/npad_types.h | 2 | ||||
| -rw-r--r-- | src/hid_core/resources/npad/npad_vibration.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/hid_core/resources/npad/npad_types.h b/src/hid_core/resources/npad/npad_types.h index 074dd40cf..fd86c8e40 100644 --- a/src/hid_core/resources/npad/npad_types.h +++ b/src/hid_core/resources/npad/npad_types.h @@ -318,7 +318,7 @@ struct InternalFlags { BitField<1, 1, u32> is_connected; BitField<2, 1, u32> is_battery_low_ovln_required; BitField<3, 1, u32> is_battery_low_ovln_delay_required; - BitField<4, 1, u32> is_sample_recieved; + BitField<4, 1, u32> is_sample_received; BitField<5, 1, u32> is_virtual_input; BitField<6, 1, u32> is_wired; BitField<8, 1, u32> use_center_clamp; diff --git a/src/hid_core/resources/npad/npad_vibration.cpp b/src/hid_core/resources/npad/npad_vibration.cpp index 3bdd55dec..7056e8eab 100644 --- a/src/hid_core/resources/npad/npad_vibration.cpp +++ b/src/hid_core/resources/npad/npad_vibration.cpp @@ -15,7 +15,7 @@ Result NpadVibration::Activate() { const f32 master_volume = 1.0f; // nn::settings::system::GetVibrationMasterVolume(); // if (master_volume < 0.0f || master_volume > 1.0f) { - // return ResultVibrationStrenghtOutOfRange; + // return ResultVibrationStrengthOutOfRange; // } volume = master_volume; @@ -30,7 +30,7 @@ Result NpadVibration::SetVibrationMasterVolume(f32 master_volume) { std::scoped_lock lock{mutex}; if (master_volume < 0.0f && master_volume > 1.0f) { - return ResultVibrationStrenghtOutOfRange; + return ResultVibrationStrengthOutOfRange; } volume = master_volume; @@ -50,7 +50,7 @@ Result NpadVibration::GetVibrationMasterVolume(f32& out_volume) const { const f32 master_volume = 1.0f; // nn::settings::system::GetVibrationMasterVolume(); // if (master_volume < 0.0f || master_volume > 1.0f) { - // return ResultVibrationStrenghtOutOfRange; + // return ResultVibrationStrengthOutOfRange; // } out_volume = master_volume; @@ -69,7 +69,7 @@ Result NpadVibration::EndPermitVibrationSession() { const f32 master_volume = 1.0f; // nn::settings::system::GetVibrationMasterVolume(); // if (master_volume < 0.0f || master_volume > 1.0f) { - // return ResultVibrationStrenghtOutOfRange; + // return ResultVibrationStrengthOutOfRange; // } volume = master_volume; |